Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF79B17BCB for ; Mon, 9 Mar 2015 09:25:08 +0000 (UTC) Received: (qmail 48831 invoked by uid 500); 9 Mar 2015 09:25:08 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 48683 invoked by uid 500); 9 Mar 2015 09:25:08 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 48649 invoked by uid 99); 9 Mar 2015 09:25:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Mar 2015 09:25:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E1F5E17EA; Mon, 9 Mar 2015 09:25:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Mon, 09 Mar 2015 09:25:08 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] activemq-6 git commit: Fixing ServiceLocator on the testsuite Repository: activemq-6 Updated Branches: refs/heads/master 3c9956235 -> 10bb4568c Fixing ServiceLocator on the testsuite My previous commit broke the location of the ServiceUtil / TransactionManagerLocator This commit is setting a new DummyTM on the integration-tests-suite and the proper TM Locator on the extra-tests Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d101bcbf Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d101bcbf Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d101bcbf Branch: refs/heads/master Commit: d101bcbf59bdbd1ad587b65c39903bcd70092fb4 Parents: 3c99562 Author: Clebert Suconic Authored: Fri Mar 6 22:17:14 2015 -0500 Committer: Clebert Suconic Committed: Fri Mar 6 22:57:04 2015 -0500 ---------------------------------------------------------------------- ...sions.transactions.TransactionManagerLocator | 1 + .../largemessage/LargeMessageTestBase.java | 705 ------------------- .../DummyTransactionManagerLocator.java | 94 +++ .../TransactionManagerLocatorTest.java | 35 + ...sions.transactions.TransactionManagerLocator | 2 +- 5 files changed, 131 insertions(+), 706 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d101bcbf/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator new file mode 100644 index 0000000..e9ef6bf --- /dev/null +++ b/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator @@ -0,0 +1 @@ +org.apache.activemq.tests.extras.jms.bridge.TransactionManagerLocatorImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d101bcbf/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java deleted file mode 100644 index 89cb696..0000000 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java +++ /dev/null @@ -1,705 +0,0 @@ -/** - * 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.activemq.tests.largemessage; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; -import java.io.IOException; -import java.io.OutputStream; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.tests.integration.IntegrationTestLogger; -import org.apache.activemq.tests.util.ServiceTestBase; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.DataConstants; -import org.junit.After; -import org.junit.Assert; - -/** - * A LargeMessageTestBase - * - * @author Clebert Suconic - *

- * Created Oct 29, 2008 11:43:52 AM - */ -public abstract class LargeMessageTestBase extends ServiceTestBase -{ - - // Constants ----------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - - protected final SimpleString ADDRESS = new SimpleString("SimpleAddress"); - - protected ActiveMQServer server; - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - @After - public void tearDown() throws Exception - { - if (server != null && server.isStarted()) - { - try - { - server.stop(); - } - catch (Exception e) - { - LargeMessageTestBase.log.warn(e.getMessage(), e); - } - } - - server = null; - - super.tearDown(); - } - - protected void testChunks(final boolean isXA, - final boolean restartOnXA, - final boolean rollbackFirstSend, - final boolean useStreamOnConsume, - final boolean realFiles, - final boolean preAck, - final boolean sendingBlocking, - final boolean testBrowser, - final boolean useMessageConsumer, - final int numberOfMessages, - final long numberOfBytes, - final int waitOnConsumer, - final long delayDelivery) throws Exception - { - testChunks(isXA, - restartOnXA, - rollbackFirstSend, - useStreamOnConsume, - realFiles, - preAck, - sendingBlocking, - testBrowser, - useMessageConsumer, - numberOfMessages, - numberOfBytes, - waitOnConsumer, - delayDelivery, - -1, - 10 * 1024); - } - - protected void testChunks(final boolean isXA, - final boolean restartOnXA, - final boolean rollbackFirstSend, - final boolean useStreamOnConsume, - final boolean realFiles, - final boolean preAck, - final boolean sendingBlocking, - final boolean testBrowser, - final boolean useMessageConsumer, - final int numberOfMessages, - final long numberOfBytes, - final int waitOnConsumer, - final long delayDelivery, - final int producerWindow, - final int minSize) throws Exception - { - clearDataRecreateServerDirs(); - - server = createServer(realFiles); - server.start(); - - ServerLocator locator = createInVMNonHALocator(); - try - { - - if (sendingBlocking) - { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - } - - if (producerWindow > 0) - { - locator.setConfirmationWindowSize(producerWindow); - } - - locator.setMinLargeMessageSize(minSize); - - ClientSessionFactory sf = locator.createSessionFactory(); - - ClientSession session; - - Xid xid = null; - session = sf.createSession(null, null, isXA, false, false, preAck, 0); - - if (isXA) - { - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - - session.createQueue(ADDRESS, ADDRESS, null, true); - - ClientProducer producer = session.createProducer(ADDRESS); - - if (rollbackFirstSend) - { - sendMessages(numberOfMessages, numberOfBytes, delayDelivery, session, producer); - - if (isXA) - { - session.end(xid, XAResource.TMSUCCESS); - session.prepare(xid); - - session.close(); - - if (realFiles && restartOnXA) - { - server.stop(); - server.start(); - sf = locator.createSessionFactory(); - } - - session = sf.createSession(null, null, isXA, false, false, preAck, 0); - - Xid[] xids = session.recover(XAResource.TMSTARTRSCAN); - Assert.assertEquals(1, xids.length); - Assert.assertEquals(xid, xids[0]); - - session.rollback(xid); - producer = session.createProducer(ADDRESS); - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - else - { - session.rollback(); - } - - validateNoFilesOnLargeDir(); - } - - sendMessages(numberOfMessages, numberOfBytes, delayDelivery, session, producer); - - if (isXA) - { - session.end(xid, XAResource.TMSUCCESS); - session.prepare(xid); - - session.close(); - - if (realFiles && restartOnXA) - { - server.stop(); - server.start(); - //we need to recreate sf's - sf = locator.createSessionFactory(); - } - - session = sf.createSession(null, null, isXA, false, false, preAck, 0); - - Xid[] xids = session.recover(XAResource.TMSTARTRSCAN); - Assert.assertEquals(1, xids.length); - Assert.assertEquals(xid, xids[0]); - - producer = session.createProducer(ADDRESS); - - session.commit(xid, false); - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - else - { - session.commit(); - } - - session.close(); - - if (realFiles) - { - server.stop(); - - server = createServer(realFiles); - server.start(); - - sf = locator.createSessionFactory(); - } - - session = sf.createSession(null, null, isXA, false, false, preAck, 0); - - if (isXA) - { - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - - ClientConsumer consumer = null; - - for (int iteration = testBrowser ? 0 : 1; iteration < 2; iteration++) - { - session.stop(); - - // first time with a browser - consumer = session.createConsumer(ADDRESS, null, iteration == 0); - - if (useMessageConsumer) - { - final CountDownLatch latchDone = new CountDownLatch(numberOfMessages); - final AtomicInteger errors = new AtomicInteger(0); - - MessageHandler handler = new MessageHandler() - { - int msgCounter; - - public void onMessage(final ClientMessage message) - { - try - { - if (delayDelivery > 0) - { - long originalTime = (Long) message.getObjectProperty(new SimpleString("original-time")); - Assert.assertTrue(System.currentTimeMillis() - originalTime + "<" + delayDelivery, - System.currentTimeMillis() - originalTime >= delayDelivery); - } - - if (!preAck) - { - message.acknowledge(); - } - - Assert.assertNotNull(message); - - if (delayDelivery <= 0) - { - // right now there is no guarantee of ordered delivered on multiple scheduledMessages with - // the same - // scheduled delivery time - Assert.assertEquals(msgCounter, - ((Integer) message.getObjectProperty(new SimpleString("counter-message"))).intValue()); - } - - if (useStreamOnConsume) - { - final AtomicLong bytesRead = new AtomicLong(0); - message.saveToOutputStream(new OutputStream() - { - - @Override - public void write(final byte[] b) throws IOException - { - if (b[0] == UnitTestCase.getSamplebyte(bytesRead.get())) - { - bytesRead.addAndGet(b.length); - LargeMessageTestBase.log.debug("Read position " + bytesRead.get() + " on consumer"); - } - else - { - LargeMessageTestBase.log.warn("Received invalid packet at position " + bytesRead.get()); - } - } - - @Override - public void write(final int b) throws IOException - { - if (b == UnitTestCase.getSamplebyte(bytesRead.get())) - { - bytesRead.incrementAndGet(); - } - else - { - LargeMessageTestBase.log.warn("byte not as expected!"); - } - } - }); - - Assert.assertEquals(numberOfBytes, bytesRead.get()); - } - else - { - - ActiveMQBuffer buffer = message.getBodyBuffer(); - buffer.resetReaderIndex(); - for (long b = 0; b < numberOfBytes; b++) - { - if (b % (1024L * 1024L) == 0) - { - LargeMessageTestBase.log.debug("Read " + b + " bytes"); - } - - Assert.assertEquals(UnitTestCase.getSamplebyte(b), buffer.readByte()); - } - - try - { - buffer.readByte(); - Assert.fail("Supposed to throw an exception"); - } - catch (Exception e) - { - } - } - } - catch (Throwable e) - { - e.printStackTrace(); - LargeMessageTestBase.log.warn("Got an error", e); - errors.incrementAndGet(); - } - finally - { - latchDone.countDown(); - msgCounter++; - } - } - }; - - session.start(); - - consumer.setMessageHandler(handler); - - Assert.assertTrue(latchDone.await(waitOnConsumer, TimeUnit.SECONDS)); - Assert.assertEquals(0, errors.get()); - } - else - { - - session.start(); - - for (int i = 0; i < numberOfMessages; i++) - { - System.currentTimeMillis(); - - ClientMessage message = consumer.receive(waitOnConsumer + delayDelivery); - - Assert.assertNotNull(message); - - System.currentTimeMillis(); - - if (delayDelivery > 0) - { - long originalTime = (Long) message.getObjectProperty(new SimpleString("original-time")); - Assert.assertTrue(System.currentTimeMillis() - originalTime + "<" + delayDelivery, - System.currentTimeMillis() - originalTime >= delayDelivery); - } - - if (!preAck) - { - message.acknowledge(); - } - - Assert.assertNotNull(message); - - if (delayDelivery <= 0) - { - // right now there is no guarantee of ordered delivered on multiple scheduledMessages with the same - // scheduled delivery time - Assert.assertEquals(i, - ((Integer) message.getObjectProperty(new SimpleString("counter-message"))).intValue()); - } - - if (useStreamOnConsume) - { - final AtomicLong bytesRead = new AtomicLong(0); - message.saveToOutputStream(new OutputStream() - { - - @Override - public void write(final byte[] b) throws IOException - { - if (b[0] == UnitTestCase.getSamplebyte(bytesRead.get())) - { - bytesRead.addAndGet(b.length); - } - else - { - LargeMessageTestBase.log.warn("Received invalid packet at position " + bytesRead.get()); - } - - } - - @Override - public void write(final int b) throws IOException - { - if (bytesRead.get() % (1024L * 1024L) == 0) - { - LargeMessageTestBase.log.debug("Read " + bytesRead.get() + " bytes"); - } - if (b == (byte) 'a') - { - bytesRead.incrementAndGet(); - } - else - { - LargeMessageTestBase.log.warn("byte not as expected!"); - } - } - }); - - Assert.assertEquals(numberOfBytes, bytesRead.get()); - } - else - { - ActiveMQBuffer buffer = message.getBodyBuffer(); - buffer.resetReaderIndex(); - - for (long b = 0; b < numberOfBytes; b++) - { - if (b % (1024L * 1024L) == 0L) - { - LargeMessageTestBase.log.debug("Read " + b + " bytes"); - } - Assert.assertEquals(UnitTestCase.getSamplebyte(b), buffer.readByte()); - } - } - - } - - } - consumer.close(); - - if (iteration == 0) - { - if (isXA) - { - session.end(xid, XAResource.TMSUCCESS); - session.rollback(xid); - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - else - { - session.rollback(); - } - } - else - { - if (isXA) - { - session.end(xid, XAResource.TMSUCCESS); - session.commit(xid, true); - xid = newXID(); - session.start(xid, XAResource.TMNOFLAGS); - } - else - { - session.commit(); - } - } - } - - session.close(); - - Assert.assertEquals(0, ((Queue) server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount()); - Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(ADDRESS).getBindable())); - - validateNoFilesOnLargeDir(); - - } - finally - { - locator.close(); - try - { - server.stop(); - } - catch (Throwable ignored) - { - } - } - } - - /** - * @param numberOfMessages - * @param numberOfBytes - * @param delayDelivery - * @param session - * @param producer - * @throws FileNotFoundException - * @throws IOException - * @throws org.apache.activemq.api.core.ActiveMQException - */ - private void sendMessages(final int numberOfMessages, - final long numberOfBytes, - final long delayDelivery, - final ClientSession session, - final ClientProducer producer) throws Exception - { - LargeMessageTestBase.log.debug("NumberOfBytes = " + numberOfBytes); - for (int i = 0; i < numberOfMessages; i++) - { - ClientMessage message = session.createMessage(true); - - // If the test is using more than 1M, we will only use the Streaming, as it require too much memory from the - // test - if (numberOfBytes > 1024 * 1024 || i % 2 == 0) - { - LargeMessageTestBase.log.debug("Sending message (stream)" + i); - message.setBodyInputStream(UnitTestCase.createFakeLargeStream(numberOfBytes)); - } - else - { - LargeMessageTestBase.log.debug("Sending message (array)" + i); - byte[] bytes = new byte[(int) numberOfBytes]; - for (int j = 0; j < bytes.length; j++) - { - bytes[j] = UnitTestCase.getSamplebyte(j); - } - message.getBodyBuffer().writeBytes(bytes); - } - message.putIntProperty(new SimpleString("counter-message"), i); - if (delayDelivery > 0) - { - long time = System.currentTimeMillis(); - message.putLongProperty(new SimpleString("original-time"), time); - message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time + delayDelivery); - - producer.send(message); - } - else - { - producer.send(message); - } - } - } - - protected ActiveMQBuffer createLargeBuffer(final int numberOfIntegers) - { - ActiveMQBuffer body = ActiveMQBuffers.fixedBuffer(DataConstants.SIZE_INT * numberOfIntegers); - - for (int i = 0; i < numberOfIntegers; i++) - { - body.writeInt(i); - } - - return body; - - } - - protected ClientMessage createLargeClientMessage(final ClientSession session, final int numberOfBytes) throws Exception - { - return createLargeClientMessage(session, numberOfBytes, true); - } - - protected ClientMessage createLargeClientMessage(final ClientSession session, final byte[] buffer, final boolean durable) throws Exception - { - ClientMessage msgs = session.createMessage(durable); - msgs.getBodyBuffer().writeBytes(buffer); - return msgs; - } - - protected ClientMessage createLargeClientMessage(final ClientSession session, - final long numberOfBytes, - final boolean persistent) throws Exception - { - - ClientMessage clientMessage = session.createMessage(persistent); - - clientMessage.setBodyInputStream(UnitTestCase.createFakeLargeStream(numberOfBytes)); - - return clientMessage; - } - - /** - * @param session - * @param queueToRead - * @param numberOfBytes - * @throws org.apache.activemq.api.core.ActiveMQException - * @throws FileNotFoundException - * @throws IOException - */ - protected void readMessage(final ClientSession session, final SimpleString queueToRead, final int numberOfBytes) throws ActiveMQException, - IOException - { - session.start(); - - ClientConsumer consumer = session.createConsumer(queueToRead); - - ClientMessage clientMessage = consumer.receive(5000); - - Assert.assertNotNull(clientMessage); - - clientMessage.acknowledge(); - - session.commit(); - - consumer.close(); - } - - protected OutputStream createFakeOutputStream() throws Exception - { - - return new OutputStream() - { - private boolean closed = false; - - private int count; - - @Override - public void close() throws IOException - { - super.close(); - closed = true; - } - - @Override - public void write(final int b) throws IOException - { - if (count++ % 1024 * 1024 == 0) - { - LargeMessageTestBase.log.debug("OutputStream received " + count + " bytes"); - } - if (closed) - { - throw new IOException("Stream was closed"); - } - } - - }; - - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d101bcbf/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java new file mode 100644 index 0000000..1841cf8 --- /dev/null +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java @@ -0,0 +1,94 @@ +/** + * 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.activemq.tests.util.transactions; + +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.InvalidTransactionException; +import javax.transaction.NotSupportedException; +import javax.transaction.RollbackException; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; + +import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator; + +/** + * @author Andy Taylor + */ +public class DummyTransactionManagerLocator implements TransactionManagerLocator,TransactionManager +{ + @Override + public void begin() throws NotSupportedException, SystemException + { + + } + + @Override + public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException + { + + } + + @Override + public int getStatus() throws SystemException + { + return 0; + } + + @Override + public Transaction getTransaction() throws SystemException + { + return null; + } + + @Override + public void resume(Transaction transaction) throws IllegalStateException, InvalidTransactionException, SystemException + { + + } + + @Override + public void rollback() throws IllegalStateException, SecurityException, SystemException + { + + } + + @Override + public void setRollbackOnly() throws IllegalStateException, SystemException + { + + } + + @Override + public void setTransactionTimeout(int i) throws SystemException + { + + } + + @Override + public Transaction suspend() throws SystemException + { + return null; + } + + @Override + public TransactionManager getTransactionManager() + { + return this; + } +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d101bcbf/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java new file mode 100644 index 0000000..9e91b1a --- /dev/null +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java @@ -0,0 +1,35 @@ +/** + * 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.activemq.tests.util.transactions; + +import org.apache.activemq.service.extensions.ServiceUtils; +import org.junit.Assert; +import org.junit.Test; + +/** + * * + * @author Andy Taylor + */ +public class TransactionManagerLocatorTest extends Assert +{ + @Test + public void getTM() + { + assertNotNull(ServiceUtils.getTransactionManager()); + assertEquals(ServiceUtils.getTransactionManager().getClass(), DummyTransactionManagerLocator.class); + } +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d101bcbf/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator index e9ef6bf..209f66f 100644 --- a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator +++ b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator @@ -1 +1 @@ -org.apache.activemq.tests.extras.jms.bridge.TransactionManagerLocatorImpl +org.apache.activemq.tests.util.transactions.DummyTransactionManagerLocator