Make a test the ignores the variable
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ab26c044 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ab26c044 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ab26c044 Branch: refs/heads/tomee-1.7.x Commit: ab26c0445f11bb5ab0e762f97a7e1c206ea5205f Parents: e6de7fc Author: Otavio Santana <[email protected]> Authored: Wed Jul 5 17:44:19 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Wed Jul 5 17:44:19 2017 -0300 ---------------------------------------------------------------------- .../META-INF/org.apache.openejb/service-jar.xml | 2 +- .../openejb/core/mdb/MdbContainerTest.java | 146 +++++++++++++++++++ .../META-INF/org.apache.openejb/service-jar.xml | 53 +++++++ 3 files changed, 200 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ab26c044/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml index fa51c64..a1c7938 100644 --- a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml +++ b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml @@ -483,7 +483,7 @@ # log a warning if true or throw an exception if false is an activation spec can't be respected - FailOnUnknowActivationSpec = true + FailOnUnknowActivationSpec = false </ServiceProvider> http://git-wip-us.apache.org/repos/asf/tomee/blob/ab26c044/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerTest.java new file mode 100644 index 0000000..6dcb202 --- /dev/null +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerTest.java @@ -0,0 +1,146 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.core.mdb; + +import org.apache.activemq.ActiveMQXAConnectionFactory; +import org.apache.openejb.activemq.AMQXASupportTest; +import org.apache.openejb.jee.MessageDrivenBean; +import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; +import org.apache.openejb.testng.PropertiesBuilder; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.annotation.Resource; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.XAConnectionFactory; +import java.util.Properties; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + + +@RunWith(ApplicationComposer.class) +public class MdbContainerTest { + + private static final String TEXT = "foo"; + + @Configuration + public Properties config() { + return new PropertiesBuilder() + + .p("amq", "new://Resource?type=ActiveMQResourceAdapter") + .p("amq.DataSource", "") + .p("amq.BrokerXmlConfig", "broker:(vm://localhost)") + + .p("target", "new://Resource?type=Queue") + + .p("mdbs", "new://Container?type=MESSAGE") + .p("mdbs.ResourceAdapter", "amq") + + .p("cf", "new://Resource?type=" + ConnectionFactory.class.getName()) + .p("cf.ResourceAdapter", "amq") + + .p("xaCf", "new://Resource?class-name=" + ActiveMQXAConnectionFactory.class.getName()) + .p("xaCf.BrokerURL", "vm://localhost") + .p("mdb.activation.ignore", "testString") + .p("mdb.activation.ignore2", "testString") + .build(); + } + + @Module + public MessageDrivenBean jar() { + return new MessageDrivenBean(AMQXASupportTest.Listener.class); + } + + @Resource(name = "target") + private Queue destination; + + @Resource(name = "xaCf") + private XAConnectionFactory xacf; + + @Resource(name = "cf") + private ConnectionFactory cf; + + @Before + public void resetLatch() { + AMQXASupportTest.Listener.reset(); + } + + @Test + public void standardCode() throws Exception { + assertNotNull(cf); + + + final Connection connection = cf.createConnection(); + try { + final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + final MessageProducer producer = session.createProducer(destination); + producer.send(session.createTextMessage(TEXT)); + assertTrue(AMQXASupportTest.Listener.sync()); + } finally { + connection.close(); + } + } + + @MessageDriven(activationConfig = { + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destination", propertyValue = "target") + }) + public static class Listener implements MessageListener { + public static CountDownLatch latch; + public static boolean ok = false; + + @Override + public void onMessage(final Message message) { + try { + try { + ok = TextMessage.class.isInstance(message) && TEXT.equals(TextMessage.class.cast(message).getText()); + } catch (final JMSException e) { + // no-op + } + } finally { + latch.countDown(); + } + } + + public static void reset() { + latch = new CountDownLatch(1); + ok = false; + } + + public static boolean sync() throws InterruptedException { + latch.await(1, TimeUnit.MINUTES); + return ok; + } + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/ab26c044/container/openejb-core/src/test/resources/META-INF/org.apache.openejb/service-jar.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb/service-jar.xml b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb/service-jar.xml new file mode 100644 index 0000000..f391584 --- /dev/null +++ b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb/service-jar.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- $Rev$ $Date$ --> + +<ServiceJar> + + + <ServiceProvider + id="Default MDB Container" + service="Container" + types="MESSAGE" + constructor="id, securityService, ResourceAdapter, MessageListenerInterface, ActivationSpecClass, InstanceLimit, FailOnUnknowActivationSpec" + class-name="org.apache.openejb.core.mdb.MdbContainer"> + + # The resource adapter delivers messages to the container + + ResourceAdapter Default JMS Resource Adapter + + # Specifies the message listener interface handled by this container + + MessageListenerInterface javax.jms.MessageListener + + # Specifies the activation spec class + + ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec + + # Specifies the maximum number of bean instances that are + # allowed to exist for each MDB deployment. + + InstanceLimit 10 + + # log a warning if true or throw an exception if false is an activation spec can't be respected + + FailOnUnknowActivationSpec = false + + </ServiceProvider> +</ServiceJar>
