Fixed the test failures due to changes in the broker code

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

3 files changed, 12 insertions, 40 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index ccd23bc0bc..ff5517bdd5 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -158,7 +158,6 @@ public class AbstractHeadersExchangeTestBase extends TestCase
         private boolean _mandatory;
         private AMQShortString _routingKey;
 
-
         public MessagePublishInfoImpl(AMQShortString routingKey)
         {
             _routingKey = routingKey;
@@ -217,31 +216,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
 
     static MessagePublishInfo getPublishRequest(final String id)
     {
-        MessagePublishInfo request = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return new AMQShortString(id);
-            }
-        };
-                                                      
-        return request;
+        return new MessagePublishInfoImpl(null, false, false, new AMQShortString(id));
     }
 
     static ContentHeaderBody getContentHeader(FieldTable headers)
diff --git a/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index da1455294a..de214e6e4f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
@@ -24,10 +24,7 @@ import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.queue.DefaultQueueRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.store.MessageStore;
@@ -42,14 +39,10 @@ import javax.management.JMException;
  */
 public class AMQProtocolSessionMBeanTest   extends TestCase
 {
-    private IoSession _mockIOSession;
     private MessageStore _messageStore = new SkeletonMessageStore();
     private AMQMinaProtocolSession _protocolSession;
     private AMQChannel _channel;
-    private QueueRegistry _queueRegistry;
-    private ExchangeRegistry _exchangeRegistry;
     private AMQProtocolSessionMBean _mbean;
-    private VirtualHost _virtualHost;
 
     public void testChannels() throws Exception
     {
@@ -57,7 +50,10 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
         int channelCount = _mbean.channels().size();
         assertTrue(channelCount == 1);
         AMQQueue queue = new org.apache.qpid.server.queue.AMQQueue(new AMQShortString("testQueue_" + System.currentTimeMillis()),
-                                                            false, new AMQShortString("test"), true, _virtualHost);
+                                                                   false,
+                                                                   new AMQShortString("test"),
+                                                                   true,
+                                                                   _protocolSession.getVirtualHost());
         AMQChannel channel = new AMQChannel(_protocolSession,2, _messageStore, null);
         channel.setDefaultQueue(queue);
         _protocolSession.addChannel(channel);
@@ -111,11 +107,11 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
         super.setUp();
 
         IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = appRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _queueRegistry = _virtualHost.getQueueRegistry();
-        _exchangeRegistry = _virtualHost.getExchangeRegistry();
-        _mockIOSession = new MockIoSession();
-        _protocolSession = new AMQMinaProtocolSession(_mockIOSession, appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true));
+        _protocolSession = new AMQMinaProtocolSession(new MockIoSession(),
+                                                      appRegistry.getVirtualHostRegistry(),
+                                                      new AMQCodecFactory(true),
+                                                      null);
+        _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
         _channel = new AMQChannel(_protocolSession,1, _messageStore, null);
         _protocolSession.addChannel(_channel);
         _mbean = (AMQProtocolSessionMBean)_protocolSession.getManagedObject();
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
index c334547b7f..508d88f941 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.VersionSpecificRegistry;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.output.ProtocolOutputConverter;
+import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.store.MessageStore;
@@ -173,7 +174,7 @@ public class MockProtocolSession implements AMQProtocolSession
 
     public ProtocolOutputConverter getProtocolOutputConverter()
     {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+        return ProtocolOutputConverterRegistry.getConverter(this);
     }
 
     public byte getProtocolMajorVersion()