Allow tests to set TM in TMLocatorImpl Some tests require a proper TM to be returned by the TMLocator implementation whilst others require a DummyTM to be returned. This patch makes allows TM returned by the locator class to be changed by the test.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/739c0f36 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/739c0f36 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/739c0f36 Branch: refs/heads/master Commit: 739c0f368b5d9ad79ee3d8f68d55134cfc5c3f69 Parents: 39c6101 Author: Martyn Taylor <[email protected]> Authored: Mon Dec 15 13:50:45 2014 +0000 Committer: Martyn Taylor <[email protected]> Committed: Tue Dec 16 16:33:58 2014 +0000 ---------------------------------------------------------------------- .../integration/jms/bridge/TransactionManagerLocatorImpl.java | 4 +++- .../org/apache/activemq/tests/integration/ra/JMSContextTest.java | 2 ++ .../activemq/tests/integration/ra/OutgoingConnectionTest.java | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/739c0f36/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java index 5ab404f..7d6ff74 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java @@ -28,9 +28,11 @@ import org.apache.activemq.service.extensions.transactions.TransactionManagerLoc public class TransactionManagerLocatorImpl implements TransactionManagerLocator { + public static TransactionManager tm = new TransactionManagerImple(); + @Override public TransactionManager getTransactionManager() { - return new TransactionManagerImple(); + return tm; } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/739c0f36/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java index aeed55c..92c350c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java @@ -29,6 +29,7 @@ import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl; import org.apache.activemq.ra.ActiveMQRAConnectionManager; import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory; import org.apache.activemq.ra.ActiveMQResourceAdapter; +import org.apache.activemq.tests.integration.jms.bridge.TransactionManagerLocatorImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -63,6 +64,7 @@ public class JMSContextTest extends ActiveMQRATestBase resourceAdapter.setConnectorClassName(InVMConnectorFactory.class.getName()); MyBootstrapContext ctx = new MyBootstrapContext(); + TransactionManagerLocatorImpl.tm = DummyTransactionManager.tm; resourceAdapter.start(ctx); ActiveMQRAManagedConnectionFactory mcf = new ActiveMQRAManagedConnectionFactory(); mcf.setResourceAdapter(resourceAdapter); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/739c0f36/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java index 4dbf1af..f906885 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java @@ -286,7 +286,6 @@ public class OutgoingConnectionTest extends ActiveMQRATestBase { setupDLQ(10); resourceAdapter = newResourceAdapter(); - DummyTransactionManager.tm.tx = new DummyTransaction(); MyBootstrapContext ctx = new MyBootstrapContext(); resourceAdapter.start(ctx); ActiveMQRAManagedConnectionFactory mcf = new ActiveMQRAManagedConnectionFactory();
