diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
| commit | 49c02f9fcf8c2dd1b063c887f8948f840ec785c2 (patch) | |
| tree | 7fa009399d501d9ad3e9f77f735d85a2b75807cf /qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java | |
| parent | d31279a6374f4fd4326d04fdae456543547d441f (diff) | |
| parent | b66b4f357a756449c7e7184be4d963fb36f5b2d4 (diff) | |
| download | qpid-python-QPID-6262-JavaBrokerNIO.tar.gz | |
Merge from trunkQPID-6262-JavaBrokerNIO
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666219 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java')
| -rw-r--r-- | qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java index 8b53042f6f..5a99538edc 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java @@ -62,6 +62,7 @@ public class AbstractVirtualHostTest extends QpidTestCase when(systemConfig.getEventLogger()).thenReturn(mock(EventLogger.class)); Broker<?> broker = mock(Broker.class); when(broker.getParent(SystemConfig.class)).thenReturn(systemConfig); + when(broker.getModel()).thenReturn(BrokerModel.getInstance()); when(broker.getSecurityManager()).thenReturn(new SecurityManager(broker, false)); _taskExecutor = new TaskExecutorImpl(); |