svn commit: r1413724 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java

[rg...@apache.org]

Author: rgodfrey
Date: Mon Nov 26 17:03:36 2012
New Revision: 1413724

URL: http://svn.apache.org/viewvc?rev=1413724&view=rev
Log:
QPID-4472 : [Java Test] Fix MultiVersionProtocolEngineTest to work with AMQP 1.0 connections.

Modified:
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1413724&r1=1413723&r2=1413724&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Mon Nov 26 17:03:36 2012
@@ -20,12 +20,31 @@
 */
 package org.apache.qpid.server.protocol;
 
+import java.util.UUID;
+import java.util.concurrent.ScheduledFuture;
 import org.apache.commons.configuration.XMLConfiguration;
 
 import org.apache.qpid.protocol.ServerProtocolEngine;
+import org.apache.qpid.server.binding.BindingFactory;
 import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.connection.IConnectionRegistry;
+import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
+import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.stats.StatisticsCounter;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.txn.DtxRegistry;
 import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.virtualhost.HouseKeepingTask;
+import org.apache.qpid.server.virtualhost.State;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.TestNetworkConnection;
 
@@ -42,6 +61,12 @@ public class MultiVersionProtocolEngineF
 
         //the factory needs a registry instance
         ApplicationRegistry.initialise(new TestApplicationRegistry(new ServerConfiguration(new XMLConfiguration())));
+        // AMQP 1-0 connection needs default vhost to be present
+        VirtualHostRegistry virtualHostRegistry = ApplicationRegistry.getInstance().getVirtualHostRegistry();
+        VirtualHostImpl vhostImpl = new VirtualHostImpl(ApplicationRegistry.getInstance(), new VirtualHostConfiguration("default",new XMLConfiguration()));
+        virtualHostRegistry.registerVirtualHost(vhostImpl);
+        virtualHostRegistry.setDefaultVirtualHostName("default");
+
     }
 
     protected void tearDown()
@@ -160,6 +185,7 @@ public class MultiVersionProtocolEngineF
             assertEquals("ID was not as expected following receipt of the AMQP version header", expectedID, engine.getConnectionId());
 
             previousId = expectedID;
+            engine.closed();
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org