This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-7.1.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit cacfc843032a60fc34c1f4184b3273d6b0af5609 Author: Jonathan S. Fisher <[email protected]> AuthorDate: Tue Sep 3 09:33:01 2019 -0500 Add @jgallimore 's JMX Context Tests --- .../arquillian/tests/jms/JMSContextInjectionTest.java | 8 ++------ .../openejb/arquillian/tests/jms/JMSReceiverBean.java | 3 +++ .../src/test/resources/arquillian.xml | 19 ++++++++----------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSContextInjectionTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSContextInjectionTest.java index e71f8f1..b6a4d2c 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSContextInjectionTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSContextInjectionTest.java @@ -21,7 +21,6 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,7 +31,6 @@ import java.net.URL; import static org.junit.Assert.assertEquals; -@Ignore // we know these are failing @RunWith(Arquillian.class) public class JMSContextInjectionTest { @@ -62,7 +60,7 @@ public class JMSContextInjectionTest { for (int i = 0; i < 200; i++) { senderBean.sendToQueue("test", "Hello world"); } - + Thread.sleep(100L); assertEquals(200, messageCounter.getValue()); } @@ -75,9 +73,7 @@ public class JMSContextInjectionTest { } catch (Exception e) { e.printStackTrace(); } - + Thread.sleep(100L); assertEquals(0, messageCounter.getValue()); } - - } diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java index 0047f69..76beebf 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java @@ -18,6 +18,8 @@ package org.apache.openejb.arquillian.tests.jms; import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; import javax.inject.Inject; import javax.jms.Message; import javax.jms.MessageListener; @@ -26,6 +28,7 @@ import javax.jms.MessageListener; @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "test") }) +@TransactionAttribute(TransactionAttributeType.REQUIRED) public class JMSReceiverBean implements MessageListener { @Inject diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml index a73adfe..9790cfd 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml @@ -31,10 +31,9 @@ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms openejb.descriptors.output=true - + AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter - AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&persistent=false - AMQResourceAdapter.ServerUrl = vm://jvm_broker + AMQResourceAdapter.BrokerXmlConfig = broker:(vm://localhost)?useJmx=false&persistent=false&deleteAllMessagesOnStartup=true AMQMessageContainer = new://Container?type=MESSAGE AMQMessageContainer.ResourceAdapter = AMQResourceAdapter AMQConnectionFactory = new://Resource?type=javax.jms.ConnectionFactory @@ -54,10 +53,9 @@ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms - + AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter - AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&persistent=false - AMQResourceAdapter.ServerUrl = vm://jvm_broker + AMQResourceAdapter.BrokerXmlConfig = broker:(vm://localhost)?useJmx=false&persistent=false&deleteAllMessagesOnStartup=true AMQMessageContainer = new://Container?type=MESSAGE AMQMessageContainer.ResourceAdapter = AMQResourceAdapter AMQConnectionFactory = new://Resource?type=javax.jms.ConnectionFactory @@ -79,12 +77,12 @@ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter - AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&persistent=false - AMQResourceAdapter.ServerUrl = vm://jvm_broker + AMQResourceAdapter.BrokerXmlConfig = broker:(vm://localhost)?useJmx=false&persistent=false&deleteAllMessagesOnStartup=true AMQMessageContainer = new://Container?type=MESSAGE AMQMessageContainer.ResourceAdapter = AMQResourceAdapter AMQConnectionFactory = new://Resource?type=javax.jms.ConnectionFactory AMQConnectionFactory.ResourceAdapter = AMQResourceAdapter + javax.security.jacc.policy.provider=sun.security.provider.PolicyFile </property> </configuration> @@ -101,10 +99,9 @@ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms - + AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter - AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&persistent=false - AMQResourceAdapter.ServerUrl = vm://jvm_broker + AMQResourceAdapter.BrokerXmlConfig = broker:(vm://localhost)?useJmx=false&persistent=false&deleteAllMessagesOnStartup=true AMQMessageContainer = new://Container?type=MESSAGE AMQMessageContainer.ResourceAdapter = AMQResourceAdapter AMQConnectionFactory = new://Resource?type=javax.jms.ConnectionFactory
