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 C9A0B18FC3 for ; Wed, 20 May 2015 09:47:06 +0000 (UTC) Received: (qmail 5332 invoked by uid 500); 20 May 2015 09:47:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 5293 invoked by uid 500); 20 May 2015 09:47:06 -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 5283 invoked by uid 99); 20 May 2015 09:47:06 -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; Wed, 20 May 2015 09:47:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74E46DFCE2; Wed, 20 May 2015 09:47:06 +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: Wed, 20 May 2015 09:47:07 -0000 Message-Id: In-Reply-To: <83bb319ca011485babcec33fa701f9c6@git.apache.org> References: <83bb319ca011485babcec33fa701f9c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/13] activemq-artemis git commit: Refactor base test classes http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java index bcdd00c..01e1886 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.journal.impl; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.journal.impl.JournalFile; import org.apache.activemq.artemis.core.journal.impl.JournalImpl; import org.apache.activemq.artemis.core.journal.impl.Reclaimer; -public class ReclaimerTest extends UnitTestCase +public class ReclaimerTest extends ServiceTestBase { private JournalFile[] files; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java index 5c5914b..146a8f9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.journal.impl; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.After; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.journal.SequentialFile; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; -public abstract class SequentialFileFactoryTestBase extends UnitTestCase +public abstract class SequentialFileFactoryTestBase extends ServiceTestBase { @Override @Before @@ -58,7 +58,7 @@ public abstract class SequentialFileFactoryTestBase extends UnitTestCase factory = null; - UnitTestCase.forceGC(); + ServiceTestBase.forceGC(); super.tearDown(); } @@ -337,14 +337,14 @@ public abstract class SequentialFileFactoryTestBase extends UnitTestCase Assert.assertEquals(rb3.limit(), bytesRead); rb3.rewind(); rb3.get(rbytes3); - UnitTestCase.assertEqualsByteArrays(bytes3, rbytes3); + ServiceTestBase.assertEqualsByteArrays(bytes3, rbytes3); sf.position(rb1.limit()); bytesRead = sf.read(rb2); Assert.assertEquals(rb2.limit(), bytesRead); rb2.get(rbytes2); - UnitTestCase.assertEqualsByteArrays(bytes2, rbytes2); + ServiceTestBase.assertEqualsByteArrays(bytes2, rbytes2); sf.position(0); @@ -352,7 +352,7 @@ public abstract class SequentialFileFactoryTestBase extends UnitTestCase Assert.assertEquals(rb1.limit(), bytesRead); rb1.get(rbytes1); - UnitTestCase.assertEqualsByteArrays(bytes1, rbytes1); + ServiceTestBase.assertEqualsByteArrays(bytes1, rbytes1); } finally http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java index 42258ea..2a2caea 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.unit.core.journal.impl; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.nio.ByteBuffer; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.core.journal.IOAsyncTask; import org.apache.activemq.artemis.core.journal.impl.TimedBuffer; import org.apache.activemq.artemis.core.journal.impl.TimedBufferObserver; -public class TimedBufferTest extends UnitTestCase +public class TimedBufferTest extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -104,7 +104,7 @@ public class TimedBufferTest extends UnitTestCase byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = UnitTestCase.getSamplebyte(x++); + bytes[j] = ServiceTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -127,7 +127,7 @@ public class TimedBufferTest extends UnitTestCase for (int i = 0; i < 100; i++) { - Assert.assertEquals(UnitTestCase.getSamplebyte(i), flushedBuffer.get()); + Assert.assertEquals(ServiceTestBase.getSamplebyte(i), flushedBuffer.get()); } } finally @@ -178,7 +178,7 @@ public class TimedBufferTest extends UnitTestCase byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = UnitTestCase.getSamplebyte(x++); + bytes[j] = ServiceTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -193,7 +193,7 @@ public class TimedBufferTest extends UnitTestCase bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = UnitTestCase.getSamplebyte(x++); + bytes[j] = ServiceTestBase.getSamplebyte(x++); } buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -215,7 +215,7 @@ public class TimedBufferTest extends UnitTestCase for (int i = 0; i < 20; i++) { - Assert.assertEquals(UnitTestCase.getSamplebyte(i), flushedBuffer.get()); + Assert.assertEquals(ServiceTestBase.getSamplebyte(i), flushedBuffer.get()); } } finally @@ -291,7 +291,7 @@ public class TimedBufferTest extends UnitTestCase byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = UnitTestCase.getSamplebyte(x++); + bytes[j] = ServiceTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -378,7 +378,7 @@ public class TimedBufferTest extends UnitTestCase byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = UnitTestCase.getSamplebyte(x++); + bytes[j] = ServiceTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java index 49cdf32..d51b598 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.tests.util.RandomUtil; import org.junit.Assert; import org.junit.Test; -public class MessageImplTest extends UnitTestCase +public class MessageImplTest extends ServiceTestBase { @Test public void getSetAttributes() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java index dc8c884..1b41cef 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.artemis.tests.unit.core.paging.impl; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; -public class PagePositionTest extends UnitTestCase +public class PagePositionTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java index d4dd295..3e56780 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.journal.SequentialFile; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -36,7 +36,7 @@ import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.junit.Assert; import org.junit.Test; -public class PageTest extends UnitTestCase +public class PageTest extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -114,7 +114,7 @@ public class PageTest extends UnitTestCase { Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - UnitTestCase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) + ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) .getMessage() .getBodyBuffer() .toByteBuffer() @@ -186,7 +186,7 @@ public class PageTest extends UnitTestCase { Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - UnitTestCase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) + ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) .getMessage() .getBodyBuffer() .toByteBuffer() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java index 47a9e98..0ae40d9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java @@ -38,12 +38,12 @@ import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class PagingManagerImplTest extends UnitTestCase +public class PagingManagerImplTest extends ServiceTestBase { private final ReadLock lock = new ReentrantReadWriteLock().readLock(); @@ -86,7 +86,7 @@ public class PagingManagerImplTest extends UnitTestCase Assert.assertEquals(1, msgs.size()); - UnitTestCase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0) + ServiceTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0) .getMessage() .getBodyBuffer() .toByteBuffer() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java index 5a80874..1d468ba 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java @@ -55,14 +55,14 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.util.FakePagingManager; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class PagingStoreImplTest extends UnitTestCase +public class PagingStoreImplTest extends ServiceTestBase { private static final SimpleString destinationTestName = new SimpleString("test"); @@ -130,7 +130,7 @@ public class PagingStoreImplTest extends UnitTestCase @Test public void testPageWithNIO() throws Exception { - UnitTestCase.recreateDirectory(getTestDir()); + ServiceTestBase.recreateDirectory(getTestDir()); testConcurrentPaging(new NIOSequentialFileFactory(getTestDir()), 1); } @@ -327,7 +327,7 @@ public class PagingStoreImplTest extends UnitTestCase for (int i = 0; i < 5; i++) { Assert.assertEquals(sequence++, msg.get(i).getMessage().getMessageID()); - UnitTestCase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + i), msg.get(i).getMessage().getBodyBuffer()); + ServiceTestBase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + i), msg.get(i).getMessage().getBodyBuffer()); } } @@ -378,7 +378,7 @@ public class PagingStoreImplTest extends UnitTestCase Assert.assertEquals(1L, msgs.get(0).getMessage().getMessageID()); - UnitTestCase.assertEqualsBuffers(18, buffers.get(0), msgs.get(0).getMessage().getBodyBuffer()); + ServiceTestBase.assertEqualsBuffers(18, buffers.get(0), msgs.get(0).getMessage().getBodyBuffer()); Assert.assertEquals(1, store.getNumberOfPages()); @@ -496,7 +496,7 @@ public class PagingStoreImplTest extends UnitTestCase try { // Wait every producer to produce at least one message - UnitTestCase.waitForLatch(latchStart); + ServiceTestBase.waitForLatch(latchStart); while (aliveProducers.get() > 0) { @@ -559,7 +559,7 @@ public class PagingStoreImplTest extends UnitTestCase buffers2.put(id, msg.getMessage()); Assert.assertNotNull(msgWritten); Assert.assertEquals(msg.getMessage().getAddress(), msgWritten.getAddress()); - UnitTestCase.assertEqualsBuffers(10, msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer()); + ServiceTestBase.assertEqualsBuffers(10, msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer()); } } @@ -627,7 +627,7 @@ public class PagingStoreImplTest extends UnitTestCase ServerMessage msgWritten = buffers2.remove(id); Assert.assertNotNull(msgWritten); Assert.assertEquals(msg.getMessage().getAddress(), msgWritten.getAddress()); - UnitTestCase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(), msgWritten.getBodyBuffer() + ServiceTestBase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(), msgWritten.getBodyBuffer() .toByteBuffer() .array(), msg.getMessage().getBodyBuffer().toByteBuffer().array()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java index 37fabd5..b68f3ef 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.journal.Journal; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; import org.apache.activemq.artemis.core.journal.RecordInfo; @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManag import org.junit.Assert; import org.junit.Test; -public class BatchIDGeneratorUnitTest extends UnitTestCase +public class BatchIDGeneratorUnitTest extends ServiceTestBase { @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java index 7faf089..5400855 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.journal.IOAsyncTask; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; import org.junit.Assert; import org.junit.Test; -public class OperationContextUnitTest extends UnitTestCase +public class OperationContextUnitTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java index e541a45..2dbc354 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.core.postoffice.impl; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import org.junit.Assert; @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.postoffice.Address; import org.apache.activemq.artemis.core.postoffice.impl.AddressImpl; -public class AddressImplTest extends UnitTestCase +public class AddressImplTest extends ServiceTestBase { @Test public void testNoDots() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java index 330ee61..905f5ca 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.postoffice.impl; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.server.impl.RefsOperation; import org.junit.Test; @@ -42,7 +42,7 @@ import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.transaction.Transaction; import org.apache.activemq.artemis.core.transaction.TransactionOperation; -public class BindingsImplTest extends UnitTestCase +public class BindingsImplTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java index f6360c2..4b3f51c 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.BindingType; @@ -37,7 +37,7 @@ import org.junit.Test; /** * This test is replicating the behaviour from https://issues.jboss.org/browse/HORNETQ-988. */ -public class WildcardAddressManagerUnitTest extends UnitTestCase +public class WildcardAddressManagerUnitTest extends ServiceTestBase { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java index c93a3bb..9268bf6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.core.remoting; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.util.RandomUtil; -public abstract class ActiveMQBufferTestBase extends UnitTestCase +public abstract class ActiveMQBufferTestBase extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -100,7 +100,7 @@ public abstract class ActiveMQBufferTestBase extends UnitTestCase SimpleString result = putAndGetNullableSimpleString(emptySimpleString); Assert.assertNotNull(result); - UnitTestCase.assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); + ServiceTestBase.assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); } @Test @@ -110,7 +110,7 @@ public abstract class ActiveMQBufferTestBase extends UnitTestCase SimpleString result = putAndGetNullableSimpleString(junk); Assert.assertNotNull(result); - UnitTestCase.assertEqualsByteArrays(junk.getData(), result.getData()); + ServiceTestBase.assertEqualsByteArrays(junk.getData(), result.getData()); } @Test @@ -144,7 +144,7 @@ public abstract class ActiveMQBufferTestBase extends UnitTestCase byte[] b = new byte[bytes.length]; wrapper.readBytes(b); - UnitTestCase.assertEqualsByteArrays(bytes, b); + ServiceTestBase.assertEqualsByteArrays(bytes, b); } @Test @@ -156,7 +156,7 @@ public abstract class ActiveMQBufferTestBase extends UnitTestCase byte[] b = new byte[bytes.length / 2]; wrapper.readBytes(b, 0, b.length); - UnitTestCase.assertEqualsByteArrays(b.length, bytes, b); + ServiceTestBase.assertEqualsByteArrays(b.length, bytes, b); } @Test @@ -289,7 +289,7 @@ public abstract class ActiveMQBufferTestBase extends UnitTestCase byte[] array = wrapper.toByteBuffer().array(); Assert.assertEquals(wrapper.capacity(), array.length); - UnitTestCase.assertEqualsByteArrays(128, bytes, wrapper.toByteBuffer().array()); + ServiceTestBase.assertEqualsByteArrays(128, bytes, wrapper.toByteBuffer().array()); } @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java index ef018ca..e74a414 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java @@ -30,11 +30,11 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor; import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; -public class NettyAcceptorFactoryTest extends UnitTestCase +public class NettyAcceptorFactoryTest extends ServiceTestBase { @Test public void testCreateAcceptor() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java index 8ac99f7..a662696 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQComponent; @@ -37,7 +37,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class NettyAcceptorTest extends UnitTestCase +public class NettyAcceptorTest extends ServiceTestBase { private ScheduledExecutorService pool2; @@ -47,7 +47,7 @@ public class NettyAcceptorTest extends UnitTestCase { super.setUp(); - UnitTestCase.checkFreePort(TransportConstants.DEFAULT_PORT); + ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); } @Override @@ -56,7 +56,7 @@ public class NettyAcceptorTest extends UnitTestCase { try { - UnitTestCase.checkFreePort(TransportConstants.DEFAULT_PORT); + ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); } finally { @@ -111,13 +111,13 @@ public class NettyAcceptorTest extends UnitTestCase Assert.assertTrue(acceptor.isStarted()); acceptor.stop(); Assert.assertFalse(acceptor.isStarted()); - UnitTestCase.checkFreePort(TransportConstants.DEFAULT_PORT); + ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); acceptor.start(); Assert.assertTrue(acceptor.isStarted()); acceptor.stop(); Assert.assertFalse(acceptor.isStarted()); - UnitTestCase.checkFreePort(TransportConstants.DEFAULT_PORT); + ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); pool2.shutdown(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java index 39dd7af..f63064a 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java @@ -26,7 +26,7 @@ import io.netty.channel.embedded.EmbeddedChannel; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection; import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.spi.core.remoting.Connection; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener import org.junit.Assert; import org.junit.Test; -public class NettyConnectionTest extends UnitTestCase +public class NettyConnectionTest extends ServiceTestBase { private static final Map emptyMap = Collections.emptyMap(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java index b32a810..ea341ef 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.util.HashMap; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; -public class NettyConnectorTest extends UnitTestCase +public class NettyConnectorTest extends ServiceTestBase { @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java index eb0d199..99789cf 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java @@ -21,7 +21,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; import org.junit.Assert; import org.junit.Before; @@ -30,7 +30,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class SSLSupportTest extends UnitTestCase +public class SSLSupportTest extends ServiceTestBase { @Parameterized.Parameters(name = "storeType={0}") public static Collection getParameters() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java index 5bf1338..51fa4b5 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.security.impl; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.After; @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl /** * tests ActiveMQSecurityManagerImpl */ -public class ActiveMQSecurityManagerImplTest extends UnitTestCase +public class ActiveMQSecurityManagerImplTest extends ServiceTestBase { private ActiveMQSecurityManagerImpl securityManager; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java index fd763fa..48f6653 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java @@ -17,11 +17,11 @@ package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl; import org.apache.activemq.artemis.api.core.management.ManagementHelper; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge; import org.junit.Test; -public class ClusterConnectionBridgeTest extends UnitTestCase +public class ClusterConnectionBridgeTest extends ServiceTestBase { @Test public void testCreateSelectorFromAddressForNormalMatches() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java index 11363a2..4023192 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import org.apache.activemq.artemis.api.core.SimpleString; @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.cluster.impl.RemoteQueueBindingImpl; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class RemoteQueueBindImplTest extends UnitTestCase +public class RemoteQueueBindImplTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java index ba5d738..736e6e9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java @@ -17,10 +17,10 @@ package org.apache.activemq.artemis.tests.unit.core.server.group.impl; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; -public class SystemPropertyOverrideTest extends UnitTestCase +public class SystemPropertyOverrideTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java index 80c45de..3e71f4e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.server.impl; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.server.impl.AIOFileLockNodeManager; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; -public class FileLockTest extends UnitTestCase +public class FileLockTest extends ServiceTestBase { @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java index add2da0..202079d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeFilter; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.filter.impl.FilterImpl; import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; @@ -54,7 +54,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class QueueImplTest extends UnitTestCase +public class QueueImplTest extends ServiceTestBase { // The tests ---------------------------------------------------------------- @@ -1327,7 +1327,7 @@ public class QueueImplTest extends UnitTestCase final String MY_ADDRESS = "myAddress"; final String MY_QUEUE = "myQueue"; - ActiveMQServer server = ActiveMQServers.newActiveMQServer(createDefaultConfig(false), true); + ActiveMQServer server = ActiveMQServers.newActiveMQServer(createDefaultConfig(), true); AddressSettings defaultSetting = new AddressSettings(); defaultSetting.setPageSizeBytes(10 * 1024); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java index 0f60897..7ae56d3 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import javax.jms.JMSRuntimeException; @@ -28,7 +28,7 @@ import org.junit.Assert; import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class ActiveMQDestinationTest extends UnitTestCase +public class ActiveMQDestinationTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java index ee8f0a8..ad25b34 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java @@ -18,13 +18,13 @@ package org.apache.activemq.artemis.tests.unit.jms.client; import javax.jms.MessageFormatException; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ActiveMQMapMessageTest extends UnitTestCase +public class ActiveMQMapMessageTest extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -693,7 +693,7 @@ public class ActiveMQMapMessageTest extends UnitTestCase ActiveMQMapMessage message = new ActiveMQMapMessage(); message.setBytes(itemName, value); - UnitTestCase.assertEqualsByteArrays(value, message.getBytes(itemName)); + ServiceTestBase.assertEqualsByteArrays(value, message.getBytes(itemName)); } @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java index 76e4fda..a29148d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.client; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.util.ArrayList; @@ -29,7 +29,7 @@ import org.junit.Assert; import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class ActiveMQStreamMessageTest extends UnitTestCase +public class ActiveMQStreamMessageTest extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -180,7 +180,7 @@ public class ActiveMQStreamMessageTest extends UnitTestCase byte[] v = new byte[value.length]; message.readBytes(v); - UnitTestCase.assertEqualsByteArrays(value, v); + ServiceTestBase.assertEqualsByteArrays(value, v); } @Test @@ -195,7 +195,7 @@ public class ActiveMQStreamMessageTest extends UnitTestCase byte[] v = new byte[256]; message.readBytes(v); - UnitTestCase.assertEqualsByteArrays(256, value, v); + ServiceTestBase.assertEqualsByteArrays(256, value, v); } @Test @@ -922,7 +922,7 @@ public class ActiveMQStreamMessageTest extends UnitTestCase message.reset(); byte[] v = (byte[])message.readObject(); - UnitTestCase.assertEqualsByteArrays(value, v); + ServiceTestBase.assertEqualsByteArrays(value, v); } @Test @@ -1041,7 +1041,7 @@ public class ActiveMQStreamMessageTest extends UnitTestCase Object v = reader.readType(message); if (value instanceof byte[]) { - UnitTestCase.assertEqualsByteArrays((byte[])value, (byte[])v); + ServiceTestBase.assertEqualsByteArrays((byte[])value, (byte[])v); } else { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java index d4a22f2..82a98a6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java @@ -28,12 +28,12 @@ import javax.jms.JMSSecurityException; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.jms.client.JMSExceptionHelper; import org.junit.Assert; import org.junit.Test; -public class JMSExceptionHelperTest extends UnitTestCase +public class JMSExceptionHelperTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java index ca931e6..5f23ec9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.artemis.tests.unit.jms.client; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import org.junit.Assert; import org.apache.activemq.artemis.jms.client.SelectorTranslator; -public class SelectorTranslatorTest extends UnitTestCase +public class SelectorTranslatorTest extends ServiceTestBase { @Test public void testParseNull() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java index 559a96d..857cc0f 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.misc; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.io.File; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionMetaData; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -public class ManifestTest extends UnitTestCase +public class ManifestTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java index 9884c7e..fe4f89c 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.artemis.tests.unit.jms.referenceable; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; -public class ConnectionFactoryObjectFactoryTest extends UnitTestCase +public class ConnectionFactoryObjectFactoryTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java index 9b79d84..82d19ca 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.referenceable; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import javax.naming.Reference; @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class DestinationObjectFactoryTest extends UnitTestCase +public class DestinationObjectFactoryTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java index 1aa4168..ca3a81f 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,7 +39,7 @@ import org.xml.sax.InputSource; * this test should fail, if it does paste the new commented out configs into the ra.xml file and in here. don't forget to * add a description for each new property added and try and put it in the config some where appropriate. */ -public class ActiveMQResourceAdapterConfigTest extends UnitTestCase +public class ActiveMQResourceAdapterConfigTest extends ServiceTestBase { private static String config = "" + "\n" + http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java index a90d09f..335edf5 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java @@ -21,14 +21,14 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; import org.junit.Test; import static java.beans.Introspector.getBeanInfo; -public class ConnectionFactoryPropertiesTest extends UnitTestCase +public class ConnectionFactoryPropertiesTest extends ServiceTestBase { private static final SortedSet UNSUPPORTED_CF_PROPERTIES; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java index cf42ed4..1adcdf9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java @@ -18,11 +18,11 @@ package org.apache.activemq.artemis.tests.unit.util; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream; import org.junit.Test; -public class ActiveMQBufferInputStreamTest extends UnitTestCase +public class ActiveMQBufferInputStreamTest extends ServiceTestBase { @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java index ee4e62e..363320d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.LinkedListImpl; import org.apache.activemq.artemis.utils.LinkedListIterator; import org.junit.Before; import org.junit.Test; -public class LinkedListTest extends UnitTestCase +public class LinkedListTest extends ServiceTestBase { private LinkedListImpl list; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java index 3a41831..21aef5c 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -40,7 +40,7 @@ import org.junit.Assert; import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader; -public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase +public class ObjectInputStreamWithClassLoaderTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java index 42893ce..95130c6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java @@ -19,12 +19,12 @@ package org.apache.activemq.artemis.tests.unit.util; import java.util.concurrent.CountDownLatch; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.Assert; import org.junit.Test; -public class ReusableLatchTest extends UnitTestCase +public class ReusableLatchTest extends ServiceTestBase { @Test public void testLatchWithParameterizedDown() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java index 940bde7..7abea8f 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java @@ -16,11 +16,11 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.SoftValueHashMap; import org.junit.Test; -public class SoftValueMapTest extends UnitTestCase +public class SoftValueMapTest extends ServiceTestBase { // Constants ----------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java index 5d6f84d..4b0ba37 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.util; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Test; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.utils.DataConstants; import org.apache.activemq.artemis.utils.Random; import org.apache.activemq.artemis.utils.UTF8Util; -public class UTF8Test extends UnitTestCase +public class UTF8Test extends ServiceTestBase { @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java index 1d7a885..08604de 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java @@ -16,12 +16,12 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Test; -public class UUIDGeneratorTest extends UnitTestCase +public class UUIDGeneratorTest extends ServiceTestBase { // Constants ----------------------------------------------------- @@ -58,15 +58,15 @@ public class UUIDGeneratorTest extends UnitTestCase byte[] fiveBytes = new byte[]{1, 2, 3, 4, 5}; byte[] zeroPaddedFiveBytes = UUIDGenerator.getZeroPaddedSixBytes(fiveBytes); - UnitTestCase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, zeroPaddedFiveBytes); + ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, zeroPaddedFiveBytes); byte[] fourBytes = new byte[]{1, 2, 3, 4}; byte[] zeroPaddedFourBytes = UUIDGenerator.getZeroPaddedSixBytes(fourBytes); - UnitTestCase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, zeroPaddedFourBytes); + ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, zeroPaddedFourBytes); byte[] threeBytes = new byte[]{1, 2, 3}; byte[] zeroPaddedThreeBytes = UUIDGenerator.getZeroPaddedSixBytes(threeBytes); - UnitTestCase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, zeroPaddedThreeBytes); + ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, zeroPaddedThreeBytes); } // Package protected --------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java index 897d913..b202c48 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Test; import java.util.HashSet; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.apache.activemq.artemis.utils.UUID; import org.apache.activemq.artemis.utils.UUIDGenerator; -public class UUIDTest extends UnitTestCase +public class UUIDTest extends ServiceTestBase { static final int MANY_TIMES = 100000; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/99147d07/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java index 829b516..cc0a509 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java @@ -19,13 +19,13 @@ package org.apache.activemq.artemis.tests.unit.util; import java.util.Properties; import java.util.StringTokenizer; -import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.version.Version; import org.apache.activemq.artemis.utils.VersionLoader; import org.junit.Assert; import org.junit.Test; -public class VersionLoaderTest extends UnitTestCase +public class VersionLoaderTest extends ServiceTestBase { // Constants -----------------------------------------------------