QPID-5073 : Add dependency on alternate exchange for queues where such an alternate is set

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

1 files changed, 15 insertions, 17 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
index 6a97eb38cb..2d3483f078 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
@@ -141,22 +141,6 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
             }
         }).when(_queueRegistry).registerQueue(registeredQueue.capture());
 
-        /* These lines necessary to get queue creation to work because AMQQueueFactory is called directly rather than
-           queue creation being on vhost - yuck! */
-        SecurityManager securityManager = mock(SecurityManager.class);
-        when(_vhost.getSecurityManager()).thenReturn(securityManager);
-        when(securityManager.authoriseCreateQueue(anyBoolean(),anyBoolean(),anyBoolean(),anyBoolean(),anyBoolean(),
-                                                  any(AMQShortString.class),anyString())).thenReturn(true);
-        VirtualHostConfiguration configuration = mock(VirtualHostConfiguration.class);
-        when(_vhost.getConfiguration()).thenReturn(configuration);
-        QueueConfiguration queueConfiguration = mock(QueueConfiguration.class);
-        when(configuration.getQueueConfiguration(anyString())).thenReturn(queueConfiguration);
-        LogActor logActor = mock(LogActor.class);
-        CurrentActor.set(logActor);
-        RootMessageLogger rootLogger = mock(RootMessageLogger.class);
-        when(logActor.getRootMessageLogger()).thenReturn(rootLogger);
-        /* end of queue creation mock hackery */
-
         _exchangeFactory = mock(ExchangeFactory.class);
 
         DurableConfiguredObjectRecoverer[] recoverers = {
@@ -372,7 +356,21 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
         final UUID queueId = new UUID(1, 0);
         final UUID exchangeId = new UUID(2, 0);
 
-
+        /* These lines necessary to get queue creation to work because AMQQueueFactory is called directly rather than
+           queue creation being on vhost - yuck! */
+        SecurityManager securityManager = mock(SecurityManager.class);
+        when(_vhost.getSecurityManager()).thenReturn(securityManager);
+        when(securityManager.authoriseCreateQueue(anyBoolean(),anyBoolean(),anyBoolean(),anyBoolean(),anyBoolean(),
+                                                  any(AMQShortString.class),anyString())).thenReturn(true);
+        VirtualHostConfiguration configuration = mock(VirtualHostConfiguration.class);
+        when(_vhost.getConfiguration()).thenReturn(configuration);
+        QueueConfiguration queueConfiguration = mock(QueueConfiguration.class);
+        when(configuration.getQueueConfiguration(anyString())).thenReturn(queueConfiguration);
+        LogActor logActor = mock(LogActor.class);
+        CurrentActor.set(logActor);
+        RootMessageLogger rootLogger = mock(RootMessageLogger.class);
+        when(logActor.getRootMessageLogger()).thenReturn(rootLogger);
+        /* end of queue creation mock hackery */
 
         final Exchange customExchange = mock(Exchange.class);