This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a570fcf6e1173bfcd18dfd299013ef465f26806d 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 | 12 ++++-------- .../openejb/arquillian/tests/jms/JMSSenderBean.java | 4 ++-- .../openejb/arquillian/tests/jms/MessageCounter.java | 4 ++-- .../src/test/resources/arquillian.xml | 17 +++++++---------- 4 files changed, 15 insertions(+), 22 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 3d49c49..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 @@ -5,9 +5,9 @@ * 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 - * + * <p/> * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p/> * 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. @@ -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/JMSSenderBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSSenderBean.java index 77118d7..0411112 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSSenderBean.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSSenderBean.java @@ -5,9 +5,9 @@ * 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 - * + * <p/> * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p/> * 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. diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MessageCounter.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MessageCounter.java index df47ef1..577dda3 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MessageCounter.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MessageCounter.java @@ -5,9 +5,9 @@ * 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 - * + * <p/> * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p/> * 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. 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..34966f2 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,9 +53,8 @@ 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 AMQMessageContainer = new://Container?type=MESSAGE AMQMessageContainer.ResourceAdapter = AMQResourceAdapter @@ -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
