[01/21] activemq-artemis git commit: More test-suite refactoring

clebertsuconic Thu, 28 May 2015 08:25:28 -0700

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 30416db00 -> 9972624ba



http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 2a2caea..6932914 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class TimedBufferTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------
@@ -104,7 +104,7 @@ public class TimedBufferTest extends ServiceTestBase
             byte[] bytes = new byte[10];
             for (int j = 0; j < 10; j++)
             {
-               bytes[j] = ServiceTestBase.getSamplebyte(x++);
+               bytes[j] = ActiveMQTestBase.getSamplebyte(x++);
             }
 
             ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes);
@@ -127,7 +127,7 @@ public class TimedBufferTest extends ServiceTestBase
 
          for (int i = 0; i < 100; i++)
          {
-            Assert.assertEquals(ServiceTestBase.getSamplebyte(i), 
flushedBuffer.get());
+            Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), 
flushedBuffer.get());
          }
       }
       finally
@@ -178,7 +178,7 @@ public class TimedBufferTest extends ServiceTestBase
          byte[] bytes = new byte[10];
          for (int j = 0; j < 10; j++)
          {
-            bytes[j] = ServiceTestBase.getSamplebyte(x++);
+            bytes[j] = ActiveMQTestBase.getSamplebyte(x++);
          }
 
          ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes);
@@ -193,7 +193,7 @@ public class TimedBufferTest extends ServiceTestBase
          bytes = new byte[10];
          for (int j = 0; j < 10; j++)
          {
-            bytes[j] = ServiceTestBase.getSamplebyte(x++);
+            bytes[j] = ActiveMQTestBase.getSamplebyte(x++);
          }
 
          buff = ActiveMQBuffers.wrappedBuffer(bytes);
@@ -215,7 +215,7 @@ public class TimedBufferTest extends ServiceTestBase
 
          for (int i = 0; i < 20; i++)
          {
-            Assert.assertEquals(ServiceTestBase.getSamplebyte(i), 
flushedBuffer.get());
+            Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), 
flushedBuffer.get());
          }
       }
       finally
@@ -291,7 +291,7 @@ public class TimedBufferTest extends ServiceTestBase
          byte[] bytes = new byte[10];
          for (int j = 0; j < 10; j++)
          {
-            bytes[j] = ServiceTestBase.getSamplebyte(x++);
+            bytes[j] = ActiveMQTestBase.getSamplebyte(x++);
          }
 
          ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes);
@@ -378,7 +378,7 @@ public class TimedBufferTest extends ServiceTestBase
          byte[] bytes = new byte[10];
          for (int j = 0; j < 10; j++)
          {
-            bytes[j] = ServiceTestBase.getSamplebyte(x++);
+            bytes[j] = ActiveMQTestBase.getSamplebyte(x++);
          }
 
          ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 d51b598..d18786e 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class MessageImplTest extends ActiveMQTestBase
 {
    @Test
    public void getSetAttributes()

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 1b41cef..0301c0d 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Test;
 
-public class PagePositionTest extends ServiceTestBase
+public class PagePositionTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 3e56780..48c133c 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class PageTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -114,11 +114,11 @@ public class PageTest extends ServiceTestBase
       {
          Assert.assertEquals(simpleDestination, 
msgs.get(i).getMessage().getAddress());
 
-         
ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), 
msgs.get(i)
-            .getMessage()
-            .getBodyBuffer()
-            .toByteBuffer()
-            .array());
+         
ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), 
msgs.get(i)
+                 .getMessage()
+                 .getBodyBuffer()
+                 .toByteBuffer()
+                 .array());
       }
 
       impl.delete(null);
@@ -186,11 +186,11 @@ public class PageTest extends ServiceTestBase
       {
          Assert.assertEquals(simpleDestination, 
msgs.get(i).getMessage().getAddress());
 
-         
ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), 
msgs.get(i)
-            .getMessage()
-            .getBodyBuffer()
-            .toByteBuffer()
-            .array());
+         
ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), 
msgs.get(i)
+                 .getMessage()
+                 .getBodyBuffer()
+                 .toByteBuffer()
+                 .array());
       }
 
       impl.delete(null);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 0ae40d9..7b2ed0c 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class PagingManagerImplTest extends ServiceTestBase
+public class PagingManagerImplTest extends ActiveMQTestBase
 {
    private final ReadLock lock = new ReentrantReadWriteLock().readLock();
 
@@ -52,9 +52,7 @@ public class PagingManagerImplTest extends ServiceTestBase
    {
 
       HierarchicalRepository<AddressSettings> addressSettings = new 
HierarchicalObjectRepository<AddressSettings>();
-      AddressSettings settings = new AddressSettings();
-      settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
-      addressSettings.setDefault(settings);
+      addressSettings.setDefault(new 
AddressSettings().setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE));
 
       final StorageManager storageManager = new NullStorageManager();
 
@@ -86,11 +84,11 @@ public class PagingManagerImplTest extends ServiceTestBase
 
       Assert.assertEquals(1, msgs.size());
 
-      
ServiceTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), 
msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0)
-         .getMessage()
-         .getBodyBuffer()
-         .toByteBuffer()
-         .array());
+      
ActiveMQTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), 
msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0)
+              .getMessage()
+              .getBodyBuffer()
+              .toByteBuffer()
+              .array());
 
       Assert.assertTrue(store.isPaging());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 1d468ba..326f9ff 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class PagingStoreImplTest extends ActiveMQTestBase
 {
 
    private static final SimpleString destinationTestName = new 
SimpleString("test");
@@ -108,13 +108,10 @@ public class PagingStoreImplTest extends ServiceTestBase
    {
       SequentialFileFactory factory = new FakeSequentialFileFactory();
 
-      AddressSettings addressSettings = new AddressSettings();
-      
addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
-
       PagingStore storeImpl =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
                              createStorageManagerMock(), factory, null, 
PagingStoreImplTest.destinationTestName,
-                             addressSettings, 
getExecutorFactory().getExecutor(), true);
+                             new 
AddressSettings().setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE), 
getExecutorFactory().getExecutor(), true);
 
       storeImpl.start();
 
@@ -130,7 +127,7 @@ public class PagingStoreImplTest extends ServiceTestBase
    @Test
    public void testPageWithNIO() throws Exception
    {
-      ServiceTestBase.recreateDirectory(getTestDir());
+      ActiveMQTestBase.recreateDirectory(getTestDir());
       testConcurrentPaging(new NIOSequentialFileFactory(getTestDir()), 1);
    }
 
@@ -141,8 +138,8 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       PagingStoreFactory storeFactory = new FakeStoreFactory(factory);
 
-      AddressSettings addressSettings = new AddressSettings();
-      
addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+      AddressSettings addressSettings = new 
AddressSettings().setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+
       PagingStore storeImpl =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
                              createStorageManagerMock(), factory, storeFactory,
@@ -195,12 +192,10 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       PagingStoreFactory storeFactory = new FakeStoreFactory(factory);
 
-      AddressSettings addressSettings = new AddressSettings();
-      
addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
       PagingStoreImpl storeImpl =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
                              createStorageManagerMock(), factory, storeFactory,
-                             PagingStoreImplTest.destinationTestName, 
addressSettings,
+                             PagingStoreImplTest.destinationTestName, new 
AddressSettings().setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE),
                              getExecutorFactory().getExecutor(), true);
 
       storeImpl.start();
@@ -268,12 +263,10 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       PagingStoreFactory storeFactory = new FakeStoreFactory(factory);
 
-      AddressSettings addressSettings = new AddressSettings();
-      
addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
       PagingStoreImpl store =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
                              createStorageManagerMock(), factory, storeFactory,
-                             PagingStoreImplTest.destinationTestName, 
addressSettings,
+                             PagingStoreImplTest.destinationTestName, new 
AddressSettings().setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE),
                              getExecutorFactory().getExecutor(), true);
 
       store.start();
@@ -327,7 +320,7 @@ public class PagingStoreImplTest extends ServiceTestBase
          for (int i = 0; i < 5; i++)
          {
             Assert.assertEquals(sequence++, 
msg.get(i).getMessage().getMessageID());
-            ServiceTestBase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + 
i), msg.get(i).getMessage().getBodyBuffer());
+            ActiveMQTestBase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + 
i), msg.get(i).getMessage().getBodyBuffer());
          }
       }
 
@@ -378,7 +371,7 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       Assert.assertEquals(1L, msgs.get(0).getMessage().getMessageID());
 
-      ServiceTestBase.assertEqualsBuffers(18, buffers.get(0), 
msgs.get(0).getMessage().getBodyBuffer());
+      ActiveMQTestBase.assertEqualsBuffers(18, buffers.get(0), 
msgs.get(0).getMessage().getBodyBuffer());
 
       Assert.assertEquals(1, store.getNumberOfPages());
 
@@ -416,9 +409,9 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       final ArrayList<Page> readPages = new ArrayList<Page>();
 
-      AddressSettings settings = new AddressSettings();
-      settings.setPageSizeBytes(MAX_SIZE);
-      settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+      AddressSettings settings = new AddressSettings()
+              .setPageSizeBytes(MAX_SIZE)
+              .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
 
       final PagingStore storeImpl =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
@@ -496,7 +489,7 @@ public class PagingStoreImplTest extends ServiceTestBase
             try
             {
                // Wait every producer to produce at least one message
-               ServiceTestBase.waitForLatch(latchStart);
+               ActiveMQTestBase.waitForLatch(latchStart);
 
                while (aliveProducers.get() > 0)
                {
@@ -559,7 +552,7 @@ public class PagingStoreImplTest extends ServiceTestBase
             buffers2.put(id, msg.getMessage());
             Assert.assertNotNull(msgWritten);
             Assert.assertEquals(msg.getMessage().getAddress(), 
msgWritten.getAddress());
-            ServiceTestBase.assertEqualsBuffers(10, 
msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer());
+            ActiveMQTestBase.assertEqualsBuffers(10, 
msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer());
          }
       }
 
@@ -627,10 +620,10 @@ public class PagingStoreImplTest extends ServiceTestBase
             ServerMessage msgWritten = buffers2.remove(id);
             Assert.assertNotNull(msgWritten);
             Assert.assertEquals(msg.getMessage().getAddress(), 
msgWritten.getAddress());
-            
ServiceTestBase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(),
 msgWritten.getBodyBuffer()
-               .toByteBuffer()
-               .array(),
-                                                
msg.getMessage().getBodyBuffer().toByteBuffer().array());
+            
ActiveMQTestBase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(),
 msgWritten.getBodyBuffer()
+                                                            .toByteBuffer()
+                                                            .array(),
+                                                    
msg.getMessage().getBodyBuffer().toByteBuffer().array());
          }
       }
 
@@ -657,9 +650,9 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       final int MAX_SIZE = 1024 * 10;
 
-      AddressSettings settings = new AddressSettings();
-      settings.setPageSizeBytes(MAX_SIZE);
-      settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+      AddressSettings settings = new AddressSettings()
+              .setPageSizeBytes(MAX_SIZE)
+              .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
 
       final PagingStore storeImpl =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),
@@ -694,9 +687,9 @@ public class PagingStoreImplTest extends ServiceTestBase
 
       final int MAX_SIZE = 1024 * 10;
 
-      AddressSettings settings = new AddressSettings();
-      settings.setPageSizeBytes(MAX_SIZE);
-      settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+      AddressSettings settings = new AddressSettings()
+              .setPageSizeBytes(MAX_SIZE)
+              .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
 
       final PagingStore store =
          new PagingStoreImpl(PagingStoreImplTest.destinationTestName, null, 
100, createMockManager(),

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 b68f3ef..c8bcfbf 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class BatchIDGeneratorUnitTest extends ActiveMQTestBase
 {
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 5400855..9d2c8ee 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class OperationContextUnitTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 2dbc354..e6495d7 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class AddressImplTest extends ActiveMQTestBase
 {
    @Test
    public void testNoDots()

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 905f5ca..b979e4b 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class BindingsImplTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
----------------------------------------------------------------------
diff --git 
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index 2c965b3..8dbcada 100644
--- 
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -28,7 +28,7 @@ import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import 
org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
 import org.apache.activemq.artemis.tests.unit.util.FakePagingManager;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.persistence.GroupingInfo;
 import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
@@ -45,7 +45,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class DuplicateDetectionUnitTest extends ServiceTestBase
+public class DuplicateDetectionUnitTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -90,7 +90,7 @@ public class DuplicateDetectionUnitTest extends 
ServiceTestBase
 
          SimpleString ADDRESS = new SimpleString("address");
 
-         Configuration configuration = createDefaultConfig();
+         Configuration configuration = createDefaultInVMConfig();
 
          PostOffice postOffice = new FakePostOffice();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 4b3f51c..5e3cf6d 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class WildcardAddressManagerUnitTest extends ActiveMQTestBase
 {
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 9268bf6..6f43b5a 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -100,7 +100,7 @@ public abstract class ActiveMQBufferTestBase extends 
ServiceTestBase
       SimpleString result = putAndGetNullableSimpleString(emptySimpleString);
 
       Assert.assertNotNull(result);
-      ServiceTestBase.assertEqualsByteArrays(emptySimpleString.getData(), 
result.getData());
+      ActiveMQTestBase.assertEqualsByteArrays(emptySimpleString.getData(), 
result.getData());
    }
 
    @Test
@@ -110,7 +110,7 @@ public abstract class ActiveMQBufferTestBase extends 
ServiceTestBase
       SimpleString result = putAndGetNullableSimpleString(junk);
 
       Assert.assertNotNull(result);
-      ServiceTestBase.assertEqualsByteArrays(junk.getData(), result.getData());
+      ActiveMQTestBase.assertEqualsByteArrays(junk.getData(), 
result.getData());
    }
 
    @Test
@@ -144,7 +144,7 @@ public abstract class ActiveMQBufferTestBase extends 
ServiceTestBase
 
       byte[] b = new byte[bytes.length];
       wrapper.readBytes(b);
-      ServiceTestBase.assertEqualsByteArrays(bytes, b);
+      ActiveMQTestBase.assertEqualsByteArrays(bytes, b);
    }
 
    @Test
@@ -156,7 +156,7 @@ public abstract class ActiveMQBufferTestBase extends 
ServiceTestBase
 
       byte[] b = new byte[bytes.length / 2];
       wrapper.readBytes(b, 0, b.length);
-      ServiceTestBase.assertEqualsByteArrays(b.length, bytes, b);
+      ActiveMQTestBase.assertEqualsByteArrays(b.length, bytes, b);
    }
 
    @Test
@@ -289,7 +289,7 @@ public abstract class ActiveMQBufferTestBase extends 
ServiceTestBase
 
       byte[] array = wrapper.toByteBuffer().array();
       Assert.assertEquals(wrapper.capacity(), array.length);
-      ServiceTestBase.assertEqualsByteArrays(128, bytes, 
wrapper.toByteBuffer().array());
+      ActiveMQTestBase.assertEqualsByteArrays(128, bytes, 
wrapper.toByteBuffer().array());
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 e74a414..4fba13b 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class NettyAcceptorFactoryTest extends ServiceTestBase
+public class NettyAcceptorFactoryTest extends ActiveMQTestBase
 {
    @Test
    public void testCreateAcceptor() throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 a662696..6f13635 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class NettyAcceptorTest extends ActiveMQTestBase
 {
    private ScheduledExecutorService pool2;
 
@@ -47,7 +47,7 @@ public class NettyAcceptorTest extends ServiceTestBase
    {
       super.setUp();
 
-      ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
+      ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
    }
 
    @Override
@@ -56,7 +56,7 @@ public class NettyAcceptorTest extends ServiceTestBase
    {
       try
       {
-         ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
+         ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
       }
       finally
       {
@@ -111,13 +111,13 @@ public class NettyAcceptorTest extends ServiceTestBase
       Assert.assertTrue(acceptor.isStarted());
       acceptor.stop();
       Assert.assertFalse(acceptor.isStarted());
-      ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
+      ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
 
       acceptor.start();
       Assert.assertTrue(acceptor.isStarted());
       acceptor.stop();
       Assert.assertFalse(acceptor.isStarted());
-      ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
+      ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT);
 
       pool2.shutdown();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 f63064a..65c63e4 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class NettyConnectionTest extends ActiveMQTestBase
 {
    private static final Map<String, Object> emptyMap = Collections.emptyMap();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 ea341ef..f24d759 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class NettyConnectorTest extends ActiveMQTestBase
 {
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 99789cf..7fcb9ef 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class SSLSupportTest extends ActiveMQTestBase
 {
    @Parameterized.Parameters(name = "storeType={0}")
    public static Collection getParameters()

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 51fa4b5..7b3c772 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ActiveMQSecurityManagerImplTest extends ActiveMQTestBase
 {
    private ActiveMQSecurityManagerImpl securityManager;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 48f6653..ecbe440 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import 
org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge;
 import org.junit.Test;
 
-public class ClusterConnectionBridgeTest extends ServiceTestBase
+public class ClusterConnectionBridgeTest extends ActiveMQTestBase
 {
    @Test
    public void testCreateSelectorFromAddressForNormalMatches()

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 4023192..f8cc7a2 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class RemoteQueueBindImplTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 736e6e9..d89fb51 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import 
org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
 
-public class SystemPropertyOverrideTest extends ServiceTestBase
+public class SystemPropertyOverrideTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 3e71f4e..2047c29 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class FileLockTest extends ActiveMQTestBase
 {
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 202079d..eb9a550 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class QueueImplTest extends ActiveMQTestBase
 {
    // The tests 
----------------------------------------------------------------
 
@@ -1327,18 +1327,18 @@ public class QueueImplTest extends ServiceTestBase
       final String MY_ADDRESS = "myAddress";
       final String MY_QUEUE = "myQueue";
 
-      ActiveMQServer server = 
ActiveMQServers.newActiveMQServer(createDefaultConfig(), true);
+      ActiveMQServer server = 
addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), true));
 
-      AddressSettings defaultSetting = new AddressSettings();
-      defaultSetting.setPageSizeBytes(10 * 1024);
-      defaultSetting.setMaxSizeBytes(20 * 1024);
+      AddressSettings defaultSetting = new AddressSettings()
+              .setPageSizeBytes(10 * 1024)
+              .setMaxSizeBytes(20 * 1024);
       server.getAddressSettingsRepository().addMatch("#", defaultSetting);
       server.start();
 
-      ServerLocator locator = createInVMNonHALocator();
-      locator.setBlockOnNonDurableSend(true);
-      locator.setBlockOnDurableSend(true);
-      locator.setBlockOnAcknowledge(true);
+      ServerLocator locator = createInVMNonHALocator()
+              .setBlockOnNonDurableSend(true)
+              .setBlockOnDurableSend(true)
+              .setBlockOnAcknowledge(true);
 
       ClientSessionFactory factory = createSessionFactory(locator);
       ClientSession session = addClientSession(factory.createSession(false, 
true, true));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 7ae56d3..2c532dd 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ActiveMQDestinationTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 ad25b34..a0bca8b 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ActiveMQMapMessageTest extends ServiceTestBase
+public class ActiveMQMapMessageTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -693,7 +693,7 @@ public class ActiveMQMapMessageTest extends ServiceTestBase
       ActiveMQMapMessage message = new ActiveMQMapMessage();
       message.setBytes(itemName, value);
 
-      ServiceTestBase.assertEqualsByteArrays(value, 
message.getBytes(itemName));
+      ActiveMQTestBase.assertEqualsByteArrays(value, 
message.getBytes(itemName));
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 a29148d..e047450 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ActiveMQStreamMessageTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -180,7 +180,7 @@ public class ActiveMQStreamMessageTest extends 
ServiceTestBase
       byte[] v = new byte[value.length];
       message.readBytes(v);
 
-      ServiceTestBase.assertEqualsByteArrays(value, v);
+      ActiveMQTestBase.assertEqualsByteArrays(value, v);
    }
 
    @Test
@@ -195,7 +195,7 @@ public class ActiveMQStreamMessageTest extends 
ServiceTestBase
       byte[] v = new byte[256];
       message.readBytes(v);
 
-      ServiceTestBase.assertEqualsByteArrays(256, value, v);
+      ActiveMQTestBase.assertEqualsByteArrays(256, value, v);
    }
 
    @Test
@@ -922,7 +922,7 @@ public class ActiveMQStreamMessageTest extends 
ServiceTestBase
       message.reset();
 
       byte[] v = (byte[])message.readObject();
-      ServiceTestBase.assertEqualsByteArrays(value, v);
+      ActiveMQTestBase.assertEqualsByteArrays(value, v);
    }
 
    @Test
@@ -1041,7 +1041,7 @@ public class ActiveMQStreamMessageTest extends 
ServiceTestBase
       Object v = reader.readType(message);
       if (value instanceof byte[])
       {
-         ServiceTestBase.assertEqualsByteArrays((byte[])value, (byte[])v);
+         ActiveMQTestBase.assertEqualsByteArrays((byte[]) value, (byte[]) v);
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 82a98a6..f8b8b80 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.jms.client.JMSExceptionHelper;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class JMSExceptionHelperTest extends ServiceTestBase
+public class JMSExceptionHelperTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 5f23ec9..7d9f825 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
 import org.apache.activemq.artemis.jms.client.SelectorTranslator;
 
-public class SelectorTranslatorTest extends ServiceTestBase
+public class SelectorTranslatorTest extends ActiveMQTestBase
 {
    @Test
    public void testParseNull()

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 857cc0f..962139f 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ManifestTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 fe4f89c..db4d5e0 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Test;
 
-public class ConnectionFactoryObjectFactoryTest extends ServiceTestBase
+public class ConnectionFactoryObjectFactoryTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 82d19ca..a69d09c 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class DestinationObjectFactoryTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 ca3a81f..cc4310a 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ActiveMQResourceAdapterConfigTest extends ActiveMQTestBase
 {
    private static String config = "" +
       "<config-property>\n" +

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 335edf5..e4a710f 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ConnectionFactoryPropertiesTest extends ActiveMQTestBase
 {
 
    private static final SortedSet<String> UNSUPPORTED_CF_PROPERTIES;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git 
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
index 4be356b..0c8ddb8 100644
--- 
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
+++ 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
@@ -29,7 +29,7 @@ import 
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import 
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
 import 
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
@@ -43,7 +43,7 @@ import 
org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ResourceAdapterTest extends ServiceTestBase
+public class ResourceAdapterTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 1adcdf9..02fcb6b 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
 import org.junit.Test;
 
-public class ActiveMQBufferInputStreamTest extends ServiceTestBase
+public class ActiveMQBufferInputStreamTest extends ActiveMQTestBase
 {
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 363320d..28532b9 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class LinkedListTest extends ActiveMQTestBase
 {
    private LinkedListImpl<Integer> list;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 21aef5c..ff2351b 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 95130c6..fc21571 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ReusableLatchTest extends ServiceTestBase
+public class ReusableLatchTest extends ActiveMQTestBase
 {
    @Test
    public void testLatchWithParameterizedDown() throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 7abea8f..197a789 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.utils.SoftValueHashMap;
 import org.junit.Test;
 
-public class SoftValueMapTest extends ServiceTestBase
+public class SoftValueMapTest extends ActiveMQTestBase
 {
 
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 4b0ba37..197e33e 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class UTF8Test extends ActiveMQTestBase
 {
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 08604de..0925ded 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UUIDGeneratorTest extends ServiceTestBase
+public class UUIDGeneratorTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------
 
@@ -58,15 +58,15 @@ public class UUIDGeneratorTest extends ServiceTestBase
 
       byte[] fiveBytes = new byte[]{1, 2, 3, 4, 5};
       byte[] zeroPaddedFiveBytes = 
UUIDGenerator.getZeroPaddedSixBytes(fiveBytes);
-      ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, 
zeroPaddedFiveBytes);
+      ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, 
zeroPaddedFiveBytes);
 
       byte[] fourBytes = new byte[]{1, 2, 3, 4};
       byte[] zeroPaddedFourBytes = 
UUIDGenerator.getZeroPaddedSixBytes(fourBytes);
-      ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, 
zeroPaddedFourBytes);
+      ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, 
zeroPaddedFourBytes);
 
       byte[] threeBytes = new byte[]{1, 2, 3};
       byte[] zeroPaddedThreeBytes = 
UUIDGenerator.getZeroPaddedSixBytes(threeBytes);
-      ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, 
zeroPaddedThreeBytes);
+      ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, 
zeroPaddedThreeBytes);
    }
 
    // Package protected ---------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 b202c48..b3263ca 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class UUIDTest extends ActiveMQTestBase
 {
    static final int MANY_TIMES = 100000;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/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 cc0a509..cff2519 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.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 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 ServiceTestBase
+public class VersionLoaderTest extends ActiveMQTestBase
 {
    // Constants -----------------------------------------------------

[01/21] activemq-artemis git commit: More test-suite refactoring

Reply via email to