QPID-4659 : [Java Broker] reduce unnecessary usage of 0-8 classes in tests

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1503625 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 48 insertions, 66 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
index c44fdebc03..b9efac1ae8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
@@ -18,27 +18,26 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol.v0_8;
+package org.apache.qpid.server.logging.subjects;
 
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.logging.subjects.AbstractTestLogSubject;
-import org.apache.qpid.server.logging.subjects.SubscriptionLogSubject;
-import org.apache.qpid.server.flow.LimitlessCreditManager;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MockAMQQueue;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * Validate SubscriptionLogSubjects are logged as expected
  */
 public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
 {
 
+    private static final long SUBSCRIPTION_ID = 1;
     private AMQQueue _queue;
     private VirtualHost _testVhost;
-    private int _channelID = 1;
     private Subscription _subscription;
 
     @Override
@@ -46,23 +45,14 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
     {
         super.setUp();
 
-        InternalTestProtocolSession session = BrokerTestHelper_0_8.createProtocolSession();
-        _testVhost = session.getVirtualHost();
+        _testVhost = BrokerTestHelper.createVirtualHost("test");
 
         _queue = new MockAMQQueue("SubscriptionLogSubjectTest");
         ((MockAMQQueue) _queue).setVirtualHost(_testVhost);
 
-        AMQChannel channel = new AMQChannel(session, _channelID, _testVhost.getMessageStore());
-
-        session.addChannel(channel);
-
-        SubscriptionFactory factory = new SubscriptionFactoryImpl();
-
-        _subscription = factory.createSubscription(_channelID, session, new AMQShortString("cTag"),
-                                                   false, null, false,
-                                                   new LimitlessCreditManager());
-
-        _subscription.setQueue(_queue, false);
+        _subscription = mock(Subscription.class);
+        when(_subscription.getQueue()).thenReturn(_queue);
+        when(_subscription.getSubscriptionID()).thenReturn(SUBSCRIPTION_ID);
 
         _subject = new SubscriptionLogSubject(_subscription);
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
index 2da93d2d99..7f36b4a081 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
@@ -23,11 +23,7 @@ package org.apache.qpid.server.protocol.v0_8;
 import junit.framework.TestCase;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.protocol.v0_8.UnacknowledgedMessageMapImpl;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.protocol.v0_8.ExtractResendAndRequeue;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MockAMQMessage;
 import org.apache.qpid.server.queue.MockAMQQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.queue.QueueEntryIterator;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
index 0e1c2d59de..1cc3607298 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
@@ -18,9 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
+package org.apache.qpid.server.protocol.v0_8;
 
 public class MockAMQMessage extends AMQMessage
 {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
index bcf4c7efc6..ab29e58a6c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.queue;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
index 6d1ad22a39..15573a871f 100755
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
@@ -18,13 +18,12 @@
 * under the License.
 *
 */
-package org.apache.qpid.server.queue;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.StoredMessage;
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index d50df47998..87fbcfa9b3 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
@@ -18,16 +18,16 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.message.MessageReference;
+import org.apache.qpid.server.store.StoredMessage;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 358246330a..b677ece408 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -24,7 +24,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.configuration.QueueConfiguration;
-import org.apache.qpid.server.configuration.plugins.AbstractConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.message.ServerMessage;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
index c3485f6140..f5d4f1219d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.subscription.Subscription;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
index 25ab115748..beb5bda7ff 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
@@ -71,19 +71,12 @@ public abstract class QueueEntryListTestBase extends TestCase
      * Test to add a generic mock message.
      * @see QueueEntryListTestBase#getTestList()
      * @see QueueEntryListTestBase#getExpectedListLength()
-     * @see MockAMQMessage
      * @throws AMQException
      */
     public void testAddGenericMessage() throws AMQException
     {
         final QueueEntryList<QueueEntry> list = getTestList();
-        final ServerMessage message = mock(ServerMessage.class);
-        when(message.getMessageNumber()).thenReturn((long)666);
-        MessageReference ref = mock(MessageReference.class);
-        AMQMessageHeader hdr = mock(AMQMessageHeader.class);
-        when(ref.getMessage()).thenReturn(message);
-        when(message.newReference()).thenReturn(ref);
-        when(message.getMessageHeader()).thenReturn(hdr);
+        final ServerMessage message = createServerMessage(666l);
         list.add(message);
 
         final QueueEntryIterator<?> iter = list.iterator();
@@ -97,6 +90,18 @@ public abstract class QueueEntryListTestBase extends TestCase
 
     }
 
+    private ServerMessage createServerMessage(long number)
+    {
+        final ServerMessage message = mock(ServerMessage.class);
+        when(message.getMessageNumber()).thenReturn(number);
+        MessageReference ref = mock(MessageReference.class);
+        AMQMessageHeader hdr = mock(AMQMessageHeader.class);
+        when(ref.getMessage()).thenReturn(message);
+        when(message.newReference()).thenReturn(ref);
+        when(message.getMessageHeader()).thenReturn(hdr);
+        return message;
+    }
+
     /**
      * Test for getting the next element in a queue list.
      * @see QueueEntryListTestBase#getTestList()
@@ -213,8 +218,8 @@ public abstract class QueueEntryListTestBase extends TestCase
         QueueEntryList<QueueEntry> list = getTestList(true);
         int i = 0;
 
-        QueueEntry queueEntry1 = list.add(new MockAMQMessage(i++));
-        QueueEntry queueEntry2 = list.add(new MockAMQMessage(i++));
+        QueueEntry queueEntry1 = list.add(createServerMessage(i++));
+        QueueEntry queueEntry2 = list.add(createServerMessage(i++));
 
         assertSame(queueEntry2, list.next(queueEntry1));
         assertNull(list.next(queueEntry2));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
index c6d166bc4c..62c731b2ec 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
@@ -48,7 +48,6 @@ import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MockStoredMessage;
 import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
 import org.apache.qpid.server.store.Transaction.Record;
 import org.apache.qpid.test.utils.QpidTestCase;
@@ -445,7 +444,9 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         EnqueableMessage message1 = mock(EnqueableMessage.class);
         when(message1.isPersistent()).thenReturn(true);
         when(message1.getMessageNumber()).thenReturn(messageNumber);
-        when(message1.getStoredMessage()).thenReturn(new MockStoredMessage(messageNumber));
+        final StoredMessage storedMessage = mock(StoredMessage.class);
+        when(storedMessage.getMessageNumber()).thenReturn(messageNumber);
+        when(message1.getStoredMessage()).thenReturn(storedMessage);
         Record enqueueRecord = new TestRecord(queue1, message1);
         return enqueueRecord;
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index facc231bca..4a246b018b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
@@ -27,15 +27,8 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.message.EnqueableMessage;
-import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
+import org.apache.qpid.server.plugin.MessageMetaDataType;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.FileUtils;
@@ -115,23 +108,25 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple
 
     protected EnqueableMessage addMessage(long id)
     {
-        MessagePublishInfo pubInfoBody = new MessagePublishInfoImpl(new AMQShortString(getName()), false, false,
-                new AMQShortString(getName()));
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-        props.setDeliveryMode(Integer.valueOf(BasicContentHeaderProperties.PERSISTENT).byteValue());
-        props.setContentType(getTestName());
-
-        MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(ProtocolVersion.v0_9);
-        int classForBasic = methodRegistry.createBasicQosOkBody().getClazz();
-        ContentHeaderBody contentHeaderBody = new ContentHeaderBody(classForBasic, 1, props, MESSAGE_DATA.length);
-
-        MessageMetaData metaData = new MessageMetaData(pubInfoBody, contentHeaderBody, 1);
-        StoredMessage<MessageMetaData> handle = _store.addMessage(metaData);
+        StorableMessageMetaData metaData = createMetaData(id, MESSAGE_DATA.length);
+        StoredMessage handle = _store.addMessage(metaData);
         handle.addContent(0, ByteBuffer.wrap(MESSAGE_DATA));
         TestMessage message = new TestMessage(id, handle);
         return message;
     }
 
+    private StorableMessageMetaData createMetaData(long id, int length)
+    {
+        StorableMessageMetaData metaData = mock(StorableMessageMetaData.class);
+        when(metaData.isPersistent()).thenReturn(true);
+        when(metaData.getContentSize()).thenReturn(length);
+        when(metaData.getStorableSize()).thenReturn(0);
+        MessageMetaDataType type = mock(MessageMetaDataType.class);
+        when(type.ordinal()).thenReturn(-1);
+        when(metaData.getType()).thenReturn(type);
+        return metaData;
+    }
+
     @Override
     public void event(Event event)
     {