From d36a1d74afa8dc59dab129cf65114f141d7cd04f Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Wed, 11 Mar 2015 19:21:00 -0400 Subject: [PATCH] Fixing test dependencies - removing unused methods - moving JMSXdeliveryCountTest to /extra-tests - A few transactions methods that were not being used and creating issues to the release due to an old dependency to the TM This closes #173 --- .../extras/jms/xa}/JMSXDeliveryCountTest.java | 235 ++++++++++-------- .../openwire/SimpleOpenWireTest.java | 4 +- .../jms/tests/ActiveMQServerTestCase.java | 17 -- tests/soak-tests/pom.xml | 7 - 4 files changed, 132 insertions(+), 131 deletions(-) rename tests/{jms-tests/src/test/java/org/apache/activemq/jms/tests/message => extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa}/JMSXDeliveryCountTest.java (67%) diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java similarity index 67% rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java rename to tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java index 0ba8a0c308..02ac3542e6 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java @@ -14,16 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.tests.message; +package org.apache.activemq.tests.extras.jms.xa; import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; +import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; +import javax.jms.Topic; import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; import javax.jms.XASession; import javax.transaction.Transaction; import javax.transaction.TransactionManager; @@ -31,27 +34,53 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import com.arjuna.ats.arjuna.coordinator.TransactionReaper; +import com.arjuna.ats.arjuna.coordinator.TxControl; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.apache.activemq.jms.tests.ActiveMQServerTestCase; -import org.apache.activemq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq.api.jms.ActiveMQJMSClient; +import org.apache.activemq.tests.util.JMSTestBase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; /** * * A JMSXDeliveryCountTest */ -public class JMSXDeliveryCountTest extends ActiveMQServerTestCase +public class JMSXDeliveryCountTest extends JMSTestBase { - // Constants ------------------------------------------------------------------------------------ + Queue queue1; + Topic topic1; - // Static --------------------------------------------------------------------------------------- + protected XAConnectionFactory xacf; - // Attributes ----------------------------------------------------------------------------------- + @Override + @Before + public void setUp() throws Exception + { + super.setUp(); - // Constructors --------------------------------------------------------------------------------- + xacf = ActiveMQJMSClient.createConnectionFactory("tcp://localhost:61616", "test"); - // Public --------------------------------------------------------------------------------------- + queue1 = createQueue("queue1"); + topic1 = createTopic("topic1"); + + TxControl.enable(); + } + + @Override + @After + public void tearDown() throws Exception + { + TxControl.disable(true); + + TransactionReaper.terminate(false); + + super.tearDown(); + + } @Test public void testSimpleJMSXDeliveryCount() throws Exception @@ -60,7 +89,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer p = s.createProducer(queue1); p.setDeliveryMode(DeliveryMode.NON_PERSISTENT); @@ -76,19 +105,19 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase TextMessage tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("xoxo", tm.getText()); - ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property", + Assert.assertEquals("xoxo", tm.getText()); + Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property", tm.propertyExists("JMSXDeliveryCount")); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); s.recover(); tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("xoxo", tm.getText()); - ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property", + Assert.assertEquals("xoxo", tm.getText()); + Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property", tm.propertyExists("JMSXDeliveryCount")); - ProxyAssertSupport.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount")); tm.acknowledge(); @@ -110,7 +139,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); Session s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); @@ -128,9 +157,9 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase TextMessage tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message1", tm.getText()); - ProxyAssertSupport.assertFalse(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message1", tm.getText()); + Assert.assertFalse(tm.getJMSRedelivered()); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); s.close(); @@ -140,33 +169,33 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message1", tm.getText()); - ProxyAssertSupport.assertTrue(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message1", tm.getText()); + Assert.assertTrue(tm.getJMSRedelivered()); + Assert.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount")); tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message2", tm.getText()); - ProxyAssertSupport.assertFalse(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message2", tm.getText()); + Assert.assertFalse(tm.getJMSRedelivered()); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message3", tm.getText()); - ProxyAssertSupport.assertFalse(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message3", tm.getText()); + Assert.assertFalse(tm.getJMSRedelivered()); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message4", tm.getText()); - ProxyAssertSupport.assertFalse(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message4", tm.getText()); + Assert.assertFalse(tm.getJMSRedelivered()); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); tm = (TextMessage)c.receive(1000); - ProxyAssertSupport.assertEquals("message5", tm.getText()); - ProxyAssertSupport.assertFalse(tm.getJMSRedelivered()); - ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals("message5", tm.getText()); + Assert.assertFalse(tm.getJMSRedelivered()); + Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount")); tm.acknowledge(); } @@ -186,7 +215,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); Session sess1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -218,11 +247,11 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase for (int i = 0; i < NUM_MESSAGES; i++) { tm = (TextMessage)cons.receive(3000); - ProxyAssertSupport.assertNotNull(tm); - ProxyAssertSupport.assertEquals("testing" + i, tm.getText()); - ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property", + Assert.assertNotNull(tm); + Assert.assertEquals("testing" + i, tm.getText()); + Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property", tm.propertyExists("JMSXDeliveryCount")); - ProxyAssertSupport.assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount")); } if (j != NUM_RECOVERIES - 1) { @@ -248,7 +277,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); conn.setClientID("myclientid"); @@ -256,9 +285,9 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); Session sess3 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - MessageConsumer cons1 = sess1.createConsumer(ActiveMQServerTestCase.topic1); - MessageConsumer cons2 = sess2.createConsumer(ActiveMQServerTestCase.topic1); - MessageConsumer cons3 = sess3.createDurableSubscriber(ActiveMQServerTestCase.topic1, "subxyz"); + MessageConsumer cons1 = sess1.createConsumer(topic1); + MessageConsumer cons2 = sess2.createConsumer(topic1); + MessageConsumer cons3 = sess3.createDurableSubscriber(topic1, "subxyz"); conn.start(); @@ -278,7 +307,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase t3.start(); Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = sessSend.createProducer(ActiveMQServerTestCase.topic1); + MessageProducer prod = sessSend.createProducer(topic1); prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT); for (int i = 0; i < NUM_MESSAGES; i++) @@ -291,9 +320,9 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase t2.join(); t3.join(); - ProxyAssertSupport.assertFalse(r1.failed); - ProxyAssertSupport.assertFalse(r2.failed); - ProxyAssertSupport.assertFalse(r3.failed); + Assert.assertFalse(r1.failed); + Assert.assertFalse(r2.failed); + Assert.assertFalse(r3.failed); cons3.close(); @@ -315,7 +344,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = producerSess.createProducer(queue1); @@ -330,39 +359,39 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase TextMessage rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property", + Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property", tm.propertyExists("JMSXDeliveryCount")); - ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertFalse(rm.getJMSRedelivered()); + Assert.assertFalse(rm.getJMSRedelivered()); consumerSess.rollback(); rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); consumerSess.rollback(); rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); // Now close the session without committing @@ -374,13 +403,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); consumerSess.commit(); } @@ -400,7 +429,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase try { - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = producerSess.createProducer(queue1); @@ -415,37 +444,37 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase TextMessage rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertFalse(rm.getJMSRedelivered()); + Assert.assertFalse(rm.getJMSRedelivered()); consumerSess.recover(); rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); consumerSess.recover(); rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); // Now close the session without committing @@ -457,13 +486,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); rm.acknowledge(); } @@ -492,7 +521,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase { toResume = mgr.suspend(); - conn = getConnectionFactory().createConnection(); + conn = cf.createConnection(); // Send a message @@ -503,7 +532,7 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase producer.send(tm); - xaConn = getXAConnectionFactory().createXAConnection(); + xaConn = xacf.createXAConnection(); XASession consumerSess = xaConn.createXASession(); MessageConsumer consumer = consumerSess.createConsumer(queue1); @@ -521,13 +550,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase TextMessage rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertFalse(rm.getJMSRedelivered()); + Assert.assertFalse(rm.getJMSRedelivered()); tx.delistResource(res, XAResource.TMSUCCESS); @@ -545,13 +574,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); tx.delistResource(res, XAResource.TMSUCCESS); @@ -569,13 +598,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); tx.delistResource(res, XAResource.TMSUCCESS); @@ -603,13 +632,13 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase rm = (TextMessage)consumer.receive(1000); - ProxyAssertSupport.assertNotNull(rm); + Assert.assertNotNull(rm); - ProxyAssertSupport.assertEquals(tm.getText(), rm.getText()); + Assert.assertEquals(tm.getText(), rm.getText()); - ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); + Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount")); - ProxyAssertSupport.assertTrue(rm.getJMSRedelivered()); + Assert.assertTrue(rm.getJMSRedelivered()); tx.delistResource(res, XAResource.TMSUCCESS); @@ -697,15 +726,11 @@ public class JMSXDeliveryCountTest extends ActiveMQServerTestCase if (!tm.getText().equals("testing" + i)) { - log.error("Out of order!!"); failed = true; } if (tm.getIntProperty("JMSXDeliveryCount") != j + 1) { - log.error("DeliveryImpl count not expected value:" + (j + 1) + - " actual:" + - tm.getIntProperty("JMSXDeliveryCount")); failed = true; } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java index 87b962c792..2adc74ba3e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java @@ -27,7 +27,6 @@ import javax.jms.Session; import javax.jms.TemporaryQueue; import javax.jms.TemporaryTopic; import javax.jms.TextMessage; -import javax.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; @@ -40,7 +39,7 @@ import org.junit.rules.ExpectedException; public class SimpleOpenWireTest extends BasicOpenWireTest { @Rule - public ExpectedException thrown= ExpectedException.none(); + public ExpectedException thrown = ExpectedException.none(); @Override @Before @@ -255,6 +254,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest /** * This is the example shipped with the distribution + * * @throws Exception */ @Test diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java index 939380fcb6..823d346cb6 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java @@ -29,7 +29,6 @@ import javax.jms.Topic; import javax.jms.TopicConnectionFactory; import javax.jms.XAConnectionFactory; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashMap; @@ -37,7 +36,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.jms.JMSFactoryType; import org.apache.activemq.core.postoffice.Binding; @@ -362,21 +360,6 @@ public abstract class ActiveMQServerTestCase return (XAConnectionFactory) getInitialContext().lookup("/CF_XA_TRUE"); } - public InitialContext getInitialContext(final int serverid) throws Exception - { - return new InitialContext(ServerManagement.getJNDIEnvironment(serverid)); - } - - protected TransactionManager getTransactionManager() - { - return new TransactionManagerImple(); - } - - public void configureSecurityForDestination(final String destName, final boolean isQueue, final HashSet roles) throws Exception - { - ActiveMQServerTestCase.servers.get(0).configureSecurityForDestination(destName, isQueue, roles); - } - public void createQueue(final String name) throws Exception { ActiveMQServerTestCase.servers.get(0).createQueue(name, null); diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml index 91be57a3cb..67e41db2ed 100644 --- a/tests/soak-tests/pom.xml +++ b/tests/soak-tests/pom.xml @@ -60,13 +60,6 @@ test test-jar - - org.apache.activemq.tests - jms-tests - ${project.version} - test - test-jar - org.apache.activemq activemq-jms-client