Repository: activemq-6 Updated Branches: refs/heads/master fdf1a1a26 -> b5039ab8d
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java index 12eeb3e..f65d26b 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.filter.Filter; @@ -422,7 +422,7 @@ public class PageCursorStressTest extends ServiceTestBase // if (i % 100 == 0) System.out.println("read/written " + i); - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); msg.putIntProperty("key", i); @@ -457,7 +457,7 @@ public class PageCursorStressTest extends ServiceTestBase if (i >= NUM_MESSAGES) { - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); msg.putIntProperty("key", i); @@ -489,7 +489,7 @@ public class PageCursorStressTest extends ServiceTestBase if (i >= NUM_MESSAGES * 2 - 1) { - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); msg.putIntProperty("key", i + 1); @@ -585,7 +585,7 @@ public class PageCursorStressTest extends ServiceTestBase for (int i = 0; i < MSGS_TX; i++) { //System.out.println("Sending " + count); - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, count); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, count); ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); msg.putIntProperty("key", count++); @@ -829,7 +829,7 @@ public class PageCursorStressTest extends ServiceTestBase { if (i % 100 == 0) System.out.println("Paged " + i); - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); msg.putIntProperty("key", i); @@ -953,7 +953,7 @@ public class PageCursorStressTest extends ServiceTestBase for (int i = start; i < start + NUM_MESSAGES; i++) { - HornetQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); + ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); ServerMessage msg = new ServerMessageImpl(storage.generateID(), buffer.writerIndex()); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); msg.putIntProperty("key", i); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java index cebc1d8..fcad42d 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java @@ -14,7 +14,7 @@ package org.apache.activemq.tests.stress.paging; import java.util.HashMap; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -239,7 +239,7 @@ public class PageStressTest extends ServiceTestBase } - private int readMessages(final ClientSession session, final ClientConsumer consumer, final SimpleString queue) throws HornetQException + private int readMessages(final ClientSession session, final ClientConsumer consumer, final SimpleString queue) throws ActiveMQException { session.start(); int msgs = 0; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java index 105f7f4..7999829 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.stress.remote; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.Test; @@ -18,7 +19,6 @@ import org.junit.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; @@ -85,7 +85,7 @@ public class PingStressTest extends ServiceTestBase Interceptor noPongInterceptor = new Interceptor() { - public boolean intercept(final Packet packet, final RemotingConnection conn) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection conn) throws ActiveMQException { PingStressTest.log.info("In interceptor, packet is " + packet.getType()); if (packet.getType() == PacketImpl.PING) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/timing-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml index 2491625..7042748 100644 --- a/tests/timing-tests/pom.xml +++ b/tests/timing-tests/pom.xml @@ -111,7 +111,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skipTimingTests}</skipTests> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java ---------------------------------------------------------------------- diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java index 66b4ce6..be534be 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.timing.util; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.junit.After; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.utils.UTF8Util; @@ -51,7 +51,7 @@ public class UTF8Test extends UnitTestCase @Test public void testWriteUTF() throws Exception { - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(10 * 1024); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(10 * 1024); long start = System.currentTimeMillis(); @@ -77,7 +77,7 @@ public class UTF8Test extends UnitTestCase @Test public void testReadUTF() throws Exception { - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(10 * 1024); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(10 * 1024); buffer.writeUTF(str); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java index cd120df..a3d8902 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.asyncio.AIOCallback; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.tests.util.UnitTestCase; @@ -71,7 +71,7 @@ public abstract class AIOTestBase extends UnitTestCase } - protected void preAlloc(final AsynchronousFileImpl controller, final long size) throws HornetQException + protected void preAlloc(final AsynchronousFileImpl controller, final long size) throws ActiveMQException { controller.fill(0L, 1, size, (byte)0); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java index e067708..336cf12 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.asyncio.AIOCallback; import org.apache.activemq.core.asyncio.BufferCallback; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; @@ -92,7 +92,7 @@ public class AsynchronousFileTest extends AIOTestBase public void setUp() throws Exception { super.setUp(); - pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("HornetQ-AIO-poller-pool" + System.identityHashCode(this), + pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("ActiveMQ-AIO-poller-pool" + System.identityHashCode(this), false, this.getClass().getClassLoader())); executor = Executors.newSingleThreadExecutor(); @@ -127,7 +127,7 @@ public class AsynchronousFileTest extends AIOTestBase public void testOpenClose() throws Exception { controller = new AsynchronousFileImpl(executor, pollerExecutor); - for (int i = 0; i < 1000; i++) + for (int i = 0; i < 100; i++) { controller.open(fileName, 10000); controller.close(); @@ -192,7 +192,7 @@ public class AsynchronousFileTest extends AIOTestBase public void testFileNonExistent() throws Exception { controller = new AsynchronousFileImpl(executor, pollerExecutor); - for (int i = 0; i < 1000; i++) + for (int i = 0; i < 100; i++) { try { @@ -415,7 +415,7 @@ public class AsynchronousFileTest extends AIOTestBase Assert.fail("An exception was supposed to be thrown"); } - catch (HornetQException ignored) + catch (ActiveMQException ignored) { System.out.println(ignored); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java index 92c3c5f..7eef77d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.asyncio.AIOCallback; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; @@ -72,7 +72,7 @@ public class MultiThreadAsynchronousFileTest extends AIOTestBase public void setUp() throws Exception { super.setUp(); - pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("HornetQ-AIO-poller-pool" + System.identityHashCode(this), + pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("ActiveMQ-AIO-poller-pool" + System.identityHashCode(this), false, this.getClass().getClassLoader())); executor = Executors.newSingleThreadExecutor(); } @@ -313,7 +313,7 @@ public class MultiThreadAsynchronousFileTest extends AIOTestBase } catch (Exception e) { - callback.onError(HornetQExceptionType.GENERIC_EXCEPTION.getCode(), e.toString()); + callback.onError(ActiveMQExceptionType.GENERIC_EXCEPTION.getCode(), e.toString()); e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java index 7ad1c8c..6408259 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java @@ -26,9 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; @@ -146,7 +146,7 @@ public class LargeMessageBufferTest extends UnitTestCase { LargeMessageControllerImpl buffer = create15BytesSample(); - HornetQBuffer dstBuffer = HornetQBuffers.fixedBuffer(20); + ActiveMQBuffer dstBuffer = ActiveMQBuffers.fixedBuffer(20); dstBuffer.setIndex(0, 5); @@ -235,7 +235,7 @@ public class LargeMessageBufferTest extends UnitTestCase @Test public void testReadData() throws Exception { - HornetQBuffer dynamic = HornetQBuffers.dynamicBuffer(1); + ActiveMQBuffer dynamic = ActiveMQBuffers.dynamicBuffer(1); String str1 = RandomUtil.randomString(); String str2 = RandomUtil.randomString(); @@ -265,7 +265,7 @@ public class LargeMessageBufferTest extends UnitTestCase { clearDataRecreateServerDirs(); - HornetQBuffer dynamic = HornetQBuffers.dynamicBuffer(1); + ActiveMQBuffer dynamic = ActiveMQBuffers.dynamicBuffer(1); String str1 = RandomUtil.randomString(); String str2 = RandomUtil.randomString(); @@ -564,7 +564,7 @@ public class LargeMessageBufferTest extends UnitTestCase outBuffer.waitCompletion(0); fail("supposed to throw an exception"); } - catch (HornetQException e) + catch (ActiveMQException e) { } @@ -658,7 +658,7 @@ public class LargeMessageBufferTest extends UnitTestCase byteArray[i] = getSamplebyte(i); } - HornetQBuffer splitbuffer = splitBuffer(3, byteArray); + ActiveMQBuffer splitbuffer = splitBuffer(3, byteArray); HornetQBufferInputStream is = new HornetQBufferInputStream(splitbuffer); @@ -779,7 +779,7 @@ public class LargeMessageBufferTest extends UnitTestCase } - public void close() throws HornetQException + public void close() throws ActiveMQException { } @@ -788,7 +788,7 @@ public class LargeMessageBufferTest extends UnitTestCase return null; } - public MessageHandler getMessageHandler() throws HornetQException + public MessageHandler getMessageHandler() throws ActiveMQException { return null; } @@ -798,40 +798,40 @@ public class LargeMessageBufferTest extends UnitTestCase return false; } - public ClientMessage receive() throws HornetQException + public ClientMessage receive() throws ActiveMQException { return null; } - public ClientMessage receive(final long timeout) throws HornetQException + public ClientMessage receive(final long timeout) throws ActiveMQException { return null; } - public ClientMessage receiveImmediate() throws HornetQException + public ClientMessage receiveImmediate() throws ActiveMQException { return null; } - public FakeConsumerInternal setMessageHandler(final MessageHandler handler) throws HornetQException + public FakeConsumerInternal setMessageHandler(final MessageHandler handler) throws ActiveMQException { return this; } - public void acknowledge(final ClientMessage message) throws HornetQException + public void acknowledge(final ClientMessage message) throws ActiveMQException { } @Override - public void individualAcknowledge(ClientMessage message) throws HornetQException + public void individualAcknowledge(ClientMessage message) throws ActiveMQException { } - public void cleanUp() throws HornetQException + public void cleanUp() throws ActiveMQException { } - public void clear(boolean waitForOnMessage) throws HornetQException + public void clear(boolean waitForOnMessage) throws ActiveMQException { } @@ -839,11 +839,11 @@ public class LargeMessageBufferTest extends UnitTestCase { } - public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws HornetQException + public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws ActiveMQException { } - public void flushAcks() throws HornetQException + public void flushAcks() throws ActiveMQException { } @@ -904,13 +904,13 @@ public class LargeMessageBufferTest extends UnitTestCase } - public void stop() throws HornetQException + public void stop() throws ActiveMQException { } - public void stop(boolean waitForOnMessage) throws HornetQException + public void stop(boolean waitForOnMessage) throws ActiveMQException { } @@ -931,7 +931,7 @@ public class LargeMessageBufferTest extends UnitTestCase /* (non-Javadoc) * @see org.apache.activemq.core.client.impl.ClientConsumerInternal#prepareForClose() */ - public Thread prepareForClose(FutureLatch future) throws HornetQException + public Thread prepareForClose(FutureLatch future) throws ActiveMQException { return null; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java index b031704..32b5d34 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java @@ -15,8 +15,8 @@ package org.apache.activemq.tests.unit.core.journal.impl; import java.nio.ByteBuffer; import java.util.List; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQIOErrorException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQIOErrorException; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.journal.RecordInfo; import org.apache.activemq.core.journal.SequentialFile; @@ -252,11 +252,11 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase { load(); } - catch (HornetQIOErrorException ioe) + catch (ActiveMQIOErrorException ioe) { exceptionHappened = true; } - catch (HornetQException e) + catch (ActiveMQException e) { fail("invalid exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java index f790051..c54e9b0 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java @@ -11,6 +11,8 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.unit.core.journal.impl; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.junit.Before; import org.junit.After; @@ -24,8 +26,6 @@ import java.util.UUID; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.journal.SequentialFileFactory; @@ -225,15 +225,15 @@ public abstract class SequentialFileFactoryTestBase extends UnitTestCase String s1 = "aardvark"; byte[] bytes1 = s1.getBytes(StandardCharsets.UTF_8); - HornetQBuffer bb1 = wrapBuffer(bytes1); + ActiveMQBuffer bb1 = wrapBuffer(bytes1); String s2 = "hippopotamus"; byte[] bytes2 = s2.getBytes(StandardCharsets.UTF_8); - HornetQBuffer bb2 = wrapBuffer(bytes2); + ActiveMQBuffer bb2 = wrapBuffer(bytes2); String s3 = "echidna"; byte[] bytes3 = s3.getBytes(StandardCharsets.UTF_8); - HornetQBuffer bb3 = wrapBuffer(bytes3); + ActiveMQBuffer bb3 = wrapBuffer(bytes3); long initialPos = sf.position(); sf.write(bb1, true); @@ -410,9 +410,9 @@ public abstract class SequentialFileFactoryTestBase extends UnitTestCase // Private --------------------------------- - private HornetQBuffer wrapBuffer(final byte[] bytes) + private ActiveMQBuffer wrapBuffer(final byte[] bytes) { - return HornetQBuffers.wrappedBuffer(bytes); + return ActiveMQBuffers.wrappedBuffer(bytes); } protected void checkFill(final SequentialFile file, final int pos, final int size, final byte fillChar) throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java index d7301b7..7a065f3 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java @@ -12,6 +12,8 @@ */ package org.apache.activemq.tests.unit.core.journal.impl; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.junit.Test; import java.nio.ByteBuffer; @@ -23,8 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.journal.impl.TimedBuffer; import org.apache.activemq.core.journal.impl.TimedBufferObserver; @@ -110,7 +110,7 @@ public class TimedBufferTest extends UnitTestCase bytes[j] = UnitTestCase.getSamplebyte(x++); } - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(bytes); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); timedBuffer.checkSize(10); timedBuffer.addBytes(buff, false, dummyCallback); @@ -184,7 +184,7 @@ public class TimedBufferTest extends UnitTestCase bytes[j] = UnitTestCase.getSamplebyte(x++); } - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(bytes); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); timedBuffer.checkSize(10); timedBuffer.addBytes(buff, false, dummyCallback); @@ -199,7 +199,7 @@ public class TimedBufferTest extends UnitTestCase bytes[j] = UnitTestCase.getSamplebyte(x++); } - buff = HornetQBuffers.wrappedBuffer(bytes); + buff = ActiveMQBuffers.wrappedBuffer(bytes); timedBuffer.checkSize(10); timedBuffer.addBytes(buff, true, dummyCallback); @@ -297,7 +297,7 @@ public class TimedBufferTest extends UnitTestCase bytes[j] = UnitTestCase.getSamplebyte(x++); } - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(bytes); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); timedBuffer.checkSize(10); timedBuffer.addBytes(buff, true, dummyCallback); @@ -384,7 +384,7 @@ public class TimedBufferTest extends UnitTestCase bytes[j] = UnitTestCase.getSamplebyte(x++); } - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(bytes); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); timedBuffer.checkSize(10); timedBuffer.addBytes(buff, true, dummyCallback); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java index 0b992ca..276b0a6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.asyncio.BufferCallback; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.journal.IOAsyncTask; @@ -251,7 +251,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory if (sendError) { - callback.onError(HornetQExceptionType.UNSUPPORTED_PACKET.getCode(), "Fake aio error"); + callback.onError(ActiveMQExceptionType.UNSUPPORTED_PACKET.getCode(), "Fake aio error"); } else { @@ -271,7 +271,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory catch (Throwable e) { e.printStackTrace(); - callback.onError(HornetQExceptionType.GENERIC_EXCEPTION.getCode(), e.getMessage()); + callback.onError(ActiveMQExceptionType.GENERIC_EXCEPTION.getCode(), e.getMessage()); } } } @@ -603,7 +603,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory /* (non-Javadoc) * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.spi.core.remoting.HornetQBuffer, boolean, org.apache.activemq.core.journal.IOCallback) */ - public void write(final HornetQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws Exception + public void write(final ActiveMQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws Exception { bytes.writerIndex(bytes.capacity()); bytes.readerIndex(0); @@ -614,7 +614,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory /* (non-Javadoc) * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.spi.core.remoting.HornetQBuffer, boolean) */ - public void write(final HornetQBuffer bytes, final boolean sync) throws Exception + public void write(final ActiveMQBuffer bytes, final boolean sync) throws Exception { bytes.writerIndex(bytes.capacity()); bytes.readerIndex(0); @@ -627,7 +627,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory public void write(final EncodingSupport bytes, final boolean sync, final IOAsyncTask callback) throws Exception { ByteBuffer buffer = newBuffer(bytes.getEncodeSize()); - HornetQBuffer outbuffer = HornetQBuffers.wrappedBuffer(buffer); + ActiveMQBuffer outbuffer = ActiveMQBuffers.wrappedBuffer(buffer); bytes.encode(outbuffer); write(outbuffer, sync, callback); } @@ -638,7 +638,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory public void write(final EncodingSupport bytes, final boolean sync) throws Exception { ByteBuffer buffer = newBuffer(bytes.getEncodeSize()); - HornetQBuffer outbuffer = HornetQBuffers.wrappedBuffer(buffer); + ActiveMQBuffer outbuffer = ActiveMQBuffers.wrappedBuffer(buffer); bytes.encode(outbuffer); write(outbuffer, sync); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java index 6d44a9e..95db733 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.unit.core.journal.impl.fakes; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; /** @@ -41,13 +41,13 @@ public class SimpleEncoding implements EncodingSupport } // Public -------------------------------------------------------- - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { throw new UnsupportedOperationException(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { for (int i = 0; i < size; i++) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java index 0373445..4537f83 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.client.impl.ClientMessageImpl; @@ -311,7 +311,7 @@ public class MessageImplTest extends UnitTestCase try { SessionSendMessage ssm = new SessionSendMessage(msg); - HornetQBuffer buf = ssm.encode(null); + ActiveMQBuffer buf = ssm.encode(null); simulateRead(buf); } catch (Throwable e) @@ -353,7 +353,7 @@ public class MessageImplTest extends UnitTestCase } - private void simulateRead(HornetQBuffer buf) + private void simulateRead(ActiveMQBuffer buf) { buf.setIndex(buf.capacity() / 2, buf.capacity() / 2); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java index 86f0998..ebe6a0e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java @@ -16,7 +16,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.journal.SequentialFileFactory; @@ -94,7 +94,7 @@ public class PageTest extends UnitTestCase SimpleString simpleDestination = new SimpleString("Test"); - ArrayList<HornetQBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements); + ArrayList<ActiveMQBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements); impl.sync(); impl.close(); @@ -141,7 +141,7 @@ public class PageTest extends UnitTestCase SimpleString simpleDestination = new SimpleString("Test"); - ArrayList<HornetQBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements); + ArrayList<ActiveMQBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements); impl.sync(); @@ -207,11 +207,11 @@ public class PageTest extends UnitTestCase * @return * @throws Exception */ - protected ArrayList<HornetQBuffer> addPageElements(final SimpleString simpleDestination, + protected ArrayList<ActiveMQBuffer> addPageElements(final SimpleString simpleDestination, final Page page, final int numberOfElements) throws Exception { - ArrayList<HornetQBuffer> buffers = new ArrayList<HornetQBuffer>(); + ArrayList<ActiveMQBuffer> buffers = new ArrayList<ActiveMQBuffer>(); int initialNumberOfMessages = page.getNumberOfMessages(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java index ca272f3..563b159 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.journal.SequentialFileFactory; @@ -89,7 +89,7 @@ public class PagingStoreImplTest extends UnitTestCase Assert.assertEquals(nr1, trans.getNumberOfMessages()); - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(trans.getEncodeSize()); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(trans.getEncodeSize()); trans.encode(buffer); @@ -156,9 +156,9 @@ public class PagingStoreImplTest extends UnitTestCase Assert.assertEquals(1, storeImpl.getNumberOfPages()); - List<HornetQBuffer> buffers = new ArrayList<HornetQBuffer>(); + List<ActiveMQBuffer> buffers = new ArrayList<ActiveMQBuffer>(); - HornetQBuffer buffer = createRandomBuffer(0, 10); + ActiveMQBuffer buffer = createRandomBuffer(0, 10); buffers.add(buffer); SimpleString destination = new SimpleString("test"); @@ -208,14 +208,14 @@ public class PagingStoreImplTest extends UnitTestCase storeImpl.startPaging(); - List<HornetQBuffer> buffers = new ArrayList<HornetQBuffer>(); + List<ActiveMQBuffer> buffers = new ArrayList<ActiveMQBuffer>(); int numMessages = 10; for (int i = 0; i < numMessages; i++) { - HornetQBuffer buffer = createRandomBuffer(i + 1L, 10); + ActiveMQBuffer buffer = createRandomBuffer(i + 1L, 10); buffers.add(buffer); @@ -247,8 +247,8 @@ public class PagingStoreImplTest extends UnitTestCase for (int i = 0; i < numMessages; i++) { - HornetQBuffer horn1 = buffers.get(i); - HornetQBuffer horn2 = msg.get(i).getMessage().getBodyBuffer(); + ActiveMQBuffer horn1 = buffers.get(i); + ActiveMQBuffer horn2 = msg.get(i).getMessage().getBodyBuffer(); horn1.resetReaderIndex(); horn2.resetReaderIndex(); for (int j = 0; j < horn1.writerIndex(); j++) @@ -283,12 +283,12 @@ public class PagingStoreImplTest extends UnitTestCase Assert.assertEquals(1, store.getNumberOfPages()); - List<HornetQBuffer> buffers = new ArrayList<HornetQBuffer>(); + List<ActiveMQBuffer> buffers = new ArrayList<ActiveMQBuffer>(); for (int i = 0; i < 10; i++) { - HornetQBuffer buffer = createRandomBuffer(i + 1L, 10); + ActiveMQBuffer buffer = createRandomBuffer(i + 1L, 10); buffers.add(buffer); @@ -856,7 +856,7 @@ public class PagingStoreImplTest extends UnitTestCase } private ServerMessage createMessage(final long id, final PagingStore store, final SimpleString destination, - final HornetQBuffer buffer) + final ActiveMQBuffer buffer) { ServerMessage msg = new ServerMessageImpl(id, 50 + buffer.capacity()); @@ -872,7 +872,7 @@ public class PagingStoreImplTest extends UnitTestCase return msg; } - protected HornetQBuffer createRandomBuffer(final long id, final int size) + protected ActiveMQBuffer createRandomBuffer(final long id, final int size) { return RandomUtil.randomBuffer(size, id); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java index 5c70c51..7f8fffc 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java @@ -13,8 +13,8 @@ package org.apache.activemq.tests.unit.core.persistence.impl; import java.util.ArrayList; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.core.journal.Journal; import org.apache.activemq.core.journal.PreparedTransactionInfo; import org.apache.activemq.core.journal.RecordInfo; @@ -137,7 +137,7 @@ public class BatchIDGeneratorUnitTest extends UnitTestCase { if (record.userRecordType == JournalRecordIds.ID_COUNTER_RECORD) { - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(record.data); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(record.data); batch.loadState(record.id, buffer); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java index d30c267..1cb35b6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; import org.apache.activemq.tests.util.UnitTestCase; @@ -203,7 +203,7 @@ public class OperationContextUnitTest extends UnitTestCase // We use a latch instead of forcing a sleep here Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); - context.onError(HornetQExceptionType.UNSUPPORTED_PACKET.getCode(), "Poop happens!"); + context.onError(ActiveMQExceptionType.UNSUPPORTED_PACKET.getCode(), "Poop happens!"); t.join(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java index ec9d780..af3d26d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java @@ -12,6 +12,7 @@ */ package org.apache.activemq.tests.unit.core.postoffice.impl; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.server.impl.RefsOperation; import org.junit.Test; @@ -21,7 +22,6 @@ import java.util.Set; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.filter.Filter; import org.apache.activemq.core.postoffice.Binding; @@ -178,7 +178,7 @@ public class BindingsImplTest extends UnitTestCase return null; } - public void markAsRollbackOnly(final HornetQException exception) + public void markAsRollbackOnly(final ActiveMQException exception) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java index 65ab1e9..e7258ba 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.unit.core.remoting; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.junit.Before; import org.junit.After; @@ -18,7 +19,6 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.tests.util.RandomUtil; import org.apache.activemq.tests.util.UnitTestCase; @@ -39,7 +39,7 @@ public abstract class HornetQBufferTestBase extends UnitTestCase // Public -------------------------------------------------------- - private HornetQBuffer wrapper; + private ActiveMQBuffer wrapper; @Override @Before @@ -59,7 +59,7 @@ public abstract class HornetQBufferTestBase extends UnitTestCase super.tearDown(); } - protected abstract HornetQBuffer createBuffer(); + protected abstract ActiveMQBuffer createBuffer(); @Test public void testNullString() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java index 852d6a3..c0408e4 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.unit.core.remoting.impl.netty; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.tests.unit.core.remoting.HornetQBufferTestBase; /** @@ -39,9 +39,9 @@ public class ChannelBufferWrapper2Test extends HornetQBufferTestBase // BufferWrapperBase overrides ----------------------------------- @Override - protected HornetQBuffer createBuffer() + protected ActiveMQBuffer createBuffer() { - return HornetQBuffers.dynamicBuffer(512); + return ActiveMQBuffers.dynamicBuffer(512); } // Package protected --------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java index 5f62f26..b9df0a7 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.concurrent.Executors; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; import org.apache.activemq.core.server.HornetQComponent; @@ -46,7 +46,7 @@ public class NettyAcceptorFactoryTest extends UnitTestCase BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -54,7 +54,7 @@ public class NettyAcceptorFactoryTest extends UnitTestCase ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java index 0633820..0b3214e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java @@ -19,8 +19,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.core.server.HornetQComponent; @@ -73,7 +73,7 @@ public class NettyAcceptorTest extends UnitTestCase BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -82,7 +82,7 @@ public class NettyAcceptorTest extends UnitTestCase ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java index a221f3b..cdcd092 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java @@ -19,9 +19,9 @@ import java.util.Map; import io.netty.channel.Channel; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.embedded.EmbeddedChannel; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.impl.netty.NettyConnection; import org.apache.activemq.core.server.HornetQComponent; import org.apache.activemq.spi.core.remoting.Connection; @@ -51,7 +51,7 @@ public class NettyConnectionTest extends UnitTestCase @Test public void testWrite() throws Exception { - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(ByteBuffer.allocate(128)); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(ByteBuffer.allocate(128)); EmbeddedChannel channel = createChannel(); Assert.assertEquals(0, channel.outboundMessages().size()); @@ -70,7 +70,7 @@ public class NettyConnectionTest extends UnitTestCase final int size = 1234; - HornetQBuffer buff = conn.createBuffer(size); + ActiveMQBuffer buff = conn.createBuffer(size); buff.writeByte((byte) 0x00); // Netty buffer does lazy initialization. Assert.assertEquals(size, buff.capacity()); @@ -94,7 +94,7 @@ public class NettyConnectionTest extends UnitTestCase } - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java index 7d24a02..13c00ee 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java @@ -12,6 +12,8 @@ */ package org.apache.activemq.tests.unit.core.remoting.impl.netty; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Test; import java.util.HashMap; @@ -20,8 +22,6 @@ import java.util.concurrent.Executors; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.core.remoting.impl.netty.NettyConnector; import org.apache.activemq.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.core.server.HornetQComponent; @@ -41,14 +41,14 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; Map<String, Object> params = new HashMap<String, Object>(); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } @@ -82,14 +82,14 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; Map<String, Object> params = new HashMap<String, Object>(); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } @@ -143,7 +143,7 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -155,7 +155,7 @@ public class NettyConnectorTest extends UnitTestCase params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "bad password"); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } @@ -194,7 +194,7 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -206,7 +206,7 @@ public class NettyConnectorTest extends UnitTestCase params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "bad password"); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } @@ -252,7 +252,7 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -261,7 +261,7 @@ public class NettyConnectorTest extends UnitTestCase params.put(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME, "myBadCipherSuite"); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } @@ -297,7 +297,7 @@ public class NettyConnectorTest extends UnitTestCase { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { } }; @@ -306,7 +306,7 @@ public class NettyConnectorTest extends UnitTestCase params.put(TransportConstants.ENABLED_PROTOCOLS_PROP_NAME, "myBadProtocol"); ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener() { - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java index 2ecb401..d0b2603 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java @@ -13,7 +13,7 @@ package org.apache.activemq.tests.unit.core.remoting.server.impl.fake; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.core.protocol.core.Packet; import org.apache.activemq.spi.core.protocol.RemotingConnection; @@ -26,7 +26,7 @@ public class FakeInterceptor implements Interceptor { @Override - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { return false; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java index 32c375d..d853fc4 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.unit.jms.client; -import static org.apache.activemq.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; -import static org.apache.activemq.api.core.HornetQExceptionType.GENERIC_EXCEPTION; -import static org.apache.activemq.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; +import static org.apache.activemq.api.core.ActiveMQExceptionType.CONNECTION_TIMEDOUT; +import static org.apache.activemq.api.core.ActiveMQExceptionType.GENERIC_EXCEPTION; +import static org.apache.activemq.api.core.ActiveMQExceptionType.INVALID_FILTER_EXPRESSION; import javax.jms.IllegalStateException; import javax.jms.InvalidDestinationException; @@ -22,8 +22,8 @@ import javax.jms.InvalidSelectorException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.jms.client.JMSExceptionHelper; import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; @@ -55,13 +55,13 @@ public class JMSExceptionHelperTest extends UnitTestCase @Test public void testILLEGAL_STATE() throws Exception { - doConvertException(HornetQExceptionType.ILLEGAL_STATE, IllegalStateException.class); + doConvertException(ActiveMQExceptionType.ILLEGAL_STATE, IllegalStateException.class); } @Test public void testINTERNAL_ERROR() throws Exception { - doConvertException(HornetQExceptionType.INTERNAL_ERROR, JMSException.class); + doConvertException(ActiveMQExceptionType.INTERNAL_ERROR, JMSException.class); } @Test @@ -73,37 +73,37 @@ public class JMSExceptionHelperTest extends UnitTestCase @Test public void testNOT_CONNECTED() throws Exception { - doConvertException(HornetQExceptionType.NOT_CONNECTED, JMSException.class); + doConvertException(ActiveMQExceptionType.NOT_CONNECTED, JMSException.class); } @Test public void testOBJECT_CLOSED() throws Exception { - doConvertException(HornetQExceptionType.OBJECT_CLOSED, IllegalStateException.class); + doConvertException(ActiveMQExceptionType.OBJECT_CLOSED, IllegalStateException.class); } @Test public void testQUEUE_DOES_NOT_EXIST() throws Exception { - doConvertException(HornetQExceptionType.QUEUE_DOES_NOT_EXIST, InvalidDestinationException.class); + doConvertException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, InvalidDestinationException.class); } @Test public void testQUEUE_EXISTS() throws Exception { - doConvertException(HornetQExceptionType.QUEUE_EXISTS, InvalidDestinationException.class); + doConvertException(ActiveMQExceptionType.QUEUE_EXISTS, InvalidDestinationException.class); } @Test public void testSECURITY_EXCEPTION() throws Exception { - doConvertException(HornetQExceptionType.SECURITY_EXCEPTION, JMSSecurityException.class); + doConvertException(ActiveMQExceptionType.SECURITY_EXCEPTION, JMSSecurityException.class); } @Test public void testUNSUPPORTED_PACKET() throws Exception { - doConvertException(HornetQExceptionType.UNSUPPORTED_PACKET, IllegalStateException.class); + doConvertException(ActiveMQExceptionType.UNSUPPORTED_PACKET, IllegalStateException.class); } @Test @@ -112,10 +112,10 @@ public class JMSExceptionHelperTest extends UnitTestCase doConvertException(GENERIC_EXCEPTION, JMSException.class); } - private void doConvertException(final HornetQExceptionType errorCode, + private void doConvertException(final ActiveMQExceptionType errorCode, final Class<? extends Throwable> expectedException) { - HornetQException me = new HornetQException(errorCode); + ActiveMQException me = new ActiveMQException(errorCode); Exception e = JMSExceptionHelper.convertFromHornetQException(me); Assert.assertNotNull(e); Assert.assertTrue(e.getClass().isAssignableFrom(expectedException)); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java index 10c800d..fea11b0 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.unit.util; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.utils.HornetQBufferInputStream; import org.junit.Test; @@ -35,7 +35,7 @@ public class HornetQBufferInputStreamTest extends UnitTestCase bytes[i] = getSamplebyte(i); } - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(bytes); HornetQBufferInputStream is = new HornetQBufferInputStream(buffer); // First read byte per byte http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java index 5724762..85af592 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java @@ -11,6 +11,8 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.unit.util; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.junit.After; import org.junit.Test; @@ -23,8 +25,6 @@ import java.nio.ByteBuffer; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; import org.apache.activemq.tests.util.RandomUtil; import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.utils.DataConstants; @@ -46,7 +46,7 @@ public class UTF8Test extends UnitTestCase @Test public void testValidateUTF() throws Exception { - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(60 * 1024); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(60 * 1024); byte[] bytes = new byte[20000]; @@ -78,16 +78,16 @@ public class UTF8Test extends UnitTestCase // The maximum size the encoded UTF string would reach is str.length * 3 (look at the UTF8 implementation) testValidateUTFOnDataInputStream(str, - HornetQBuffers.wrappedBuffer(ByteBuffer.allocate(str.length() * 3 + - DataConstants.SIZE_SHORT))); + ActiveMQBuffers.wrappedBuffer(ByteBuffer.allocate(str.length() * 3 + + DataConstants.SIZE_SHORT))); - testValidateUTFOnDataInputStream(str, HornetQBuffers.dynamicBuffer(100)); + testValidateUTFOnDataInputStream(str, ActiveMQBuffers.dynamicBuffer(100)); - testValidateUTFOnDataInputStream(str, HornetQBuffers.fixedBuffer(100 * 1024)); + testValidateUTFOnDataInputStream(str, ActiveMQBuffers.fixedBuffer(100 * 1024)); } } - private void testValidateUTFOnDataInputStream(final String str, final HornetQBuffer wrap) throws Exception + private void testValidateUTFOnDataInputStream(final String str, final ActiveMQBuffer wrap) throws Exception { UTF8Util.saveUTF(wrap, str); @@ -102,7 +102,7 @@ public class UTF8Test extends UnitTestCase outData.writeUTF(str); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(byteOut.toByteArray()); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(byteOut.toByteArray()); newStr = UTF8Util.readUTF(buffer); @@ -122,7 +122,7 @@ public class UTF8Test extends UnitTestCase String str = new String(chars); - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(0xffff + 4); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(0xffff + 4); try {
