Author: rgodfrey
Date: Fri Aug 16 10:23:51 2013
New Revision: 1514640
URL: http://svn.apache.org/r1514640
Log:
QPID-5073 : Add dependency on alternate exchange for queues where such an
alternate is set
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java?rev=1514640&r1=1514639&r2=1514640&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
Fri Aug 16 10:23:51 2013
@@ -141,22 +141,6 @@ public class DurableConfigurationRecover
}
}).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 DurableConfigurationRecover
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
