Repository: qpid-broker-j Updated Branches: refs/heads/6.0.x aad81a643 -> 0169136fc
QPID-7763: [Java Broker] Fix mock in unit tests (cherry picked from commit bc9bf4b6c476cdbde04027b447e74b68aa8d0919) Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/0169136f Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0169136f Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0169136f Branch: refs/heads/6.0.x Commit: 0169136fc01628dbbf064ffe7a3aafaac200d319 Parents: 2b91b44 Author: Lorenz Quack <[email protected]> Authored: Fri Apr 28 10:26:38 2017 +0100 Committer: Alex Rudyy <[email protected]> Committed: Wed May 3 17:56:40 2017 +0100 ---------------------------------------------------------------------- .../server/queue/LastValueQueueListTest.java | 12 ++------ .../server/queue/PriorityQueueListTest.java | 13 ++------ .../server/queue/QueueEntryImplTestBase.java | 15 ++------- .../server/queue/QueueEntryListTestBase.java | 18 +++++------ .../server/queue/SimpleQueueEntryImplTest.java | 12 ++------ .../server/queue/SortedQueueEntryListTest.java | 15 +++------ .../qpid/server/queue/SortedQueueEntryTest.java | 12 ++------ .../queue/StandardQueueEntryListTest.java | 32 +++++--------------- .../qpid/server/util/BrokerTestHelper.java | 1 + 9 files changed, 33 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java index 139c714..2da7920 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java @@ -40,6 +40,7 @@ import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.TransactionLogResource; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; @@ -62,16 +63,7 @@ public class LastValueQueueListTest extends QpidTestCase queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, getName()); queueAttributes.put(LastValueQueue.LVQ_KEY, CONFLATION_KEY); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); _queue = new LastValueQueueImpl(queueAttributes, virtualHost); _queue.open(); _list = _queue.getEntries(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java index e794b76..bedc71d 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java @@ -55,7 +55,7 @@ public class PriorityQueueListTest extends QpidTestCase private QueueEntry _priority5message1; private QueueEntry _priority5message2; - protected void setUp() + protected void setUp() throws Exception { BrokerTestHelper.setUp(); QueueEntry[] entries = new QueueEntry[PRIORITIES.length]; @@ -63,16 +63,7 @@ public class PriorityQueueListTest extends QpidTestCase queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, getName()); queueAttributes.put(PriorityQueue.PRIORITIES, 10); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); PriorityQueueImpl queue = new PriorityQueueImpl(queueAttributes, virtualHost); queue.open(); _list = queue.getEntries(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java index d30d9bc..f2eb14c 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java @@ -47,6 +47,7 @@ import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.virtualhost.VirtualHostImpl; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.util.StateChangeListener; import org.apache.qpid.test.utils.QpidTestCase; @@ -278,24 +279,14 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase /** * Tests if entries in DEQUEUED or DELETED state are not returned by getNext method. */ - public void testGetNext() + public void testGetNext() throws Exception { int numberOfEntries = 5; QueueEntryImpl[] entries = new QueueEntryImpl[numberOfEntries]; Map<String,Object> queueAttributes = new HashMap<String, Object>(); queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, getName()); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost); queue.open(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java index af9a014..940e371 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java @@ -34,13 +34,13 @@ import org.apache.qpid.test.utils.QpidTestCase; */ public abstract class QueueEntryListTestBase extends QpidTestCase { - public abstract QueueEntryList getTestList(); - public abstract QueueEntryList getTestList(boolean newList); + public abstract QueueEntryList getTestList() throws Exception; + public abstract QueueEntryList getTestList(boolean newList) throws Exception; public abstract long getExpectedFirstMsgId(); public abstract int getExpectedListLength(); public abstract ServerMessage getTestMessageToAdd(); - public void testGetQueue() + public void testGetQueue() throws Exception { assertEquals("Unexpected head entry returned by getHead()", getTestList().getQueue(), getTestQueue()); } @@ -52,7 +52,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * @see QueueEntryListTestBase#getTestList() * @see QueueEntryListTestBase#getTestMessageToAdd() */ - public void testAddSpecificMessage() + public void testAddSpecificMessage() throws Exception { final QueueEntryList list = getTestList(); list.add(getTestMessageToAdd(), null); @@ -72,7 +72,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * @see QueueEntryListTestBase#getTestList() * @see QueueEntryListTestBase#getExpectedListLength() */ - public void testAddGenericMessage() + public void testAddGenericMessage() throws Exception { final QueueEntryList list = getTestList(); final ServerMessage message = createServerMessage(666l); @@ -107,7 +107,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * @see QueueEntryListTestBase#getTestList() * @see QueueEntryListTestBase#getExpectedListLength() */ - public void testListNext() + public void testListNext() throws Exception { final QueueEntryList entryList = getTestList(); QueueEntry entry = entryList.getHead(); @@ -125,7 +125,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * @see QueueEntryListTestBase#getTestList() * @see QueueEntryListTestBase#getExpectedListLength() */ - public void testIterator() + public void testIterator() throws Exception { final QueueEntryIterator iter = getTestList().iterator(); int count = 0; @@ -178,7 +178,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * @see QueueEntryListTestBase#getTestList() * @see QueueEntryListTestBase#getExpectedFirstMsgId() */ - public void testGetHead() + public void testGetHead() throws Exception { final QueueEntry head = getTestList().getHead(); assertNull("Head entry should not contain an actual message", head.getMessage()); @@ -190,7 +190,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase * Test to verify the entry deletion handled correctly. * @see QueueEntryListTestBase#getTestList() */ - public void testEntryDeleted() + public void testEntryDeleted() throws Exception { final QueueEntry head = getTestList().getHead(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java index 5e662f0..6e77f5a 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java @@ -39,6 +39,7 @@ import org.apache.qpid.server.model.ConfiguredObjectFactory; import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.store.TransactionLogResource; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase @@ -52,16 +53,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase Map<String,Object> queueAttributes = new HashMap<String, Object>(); queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, "SimpleQueueEntryImplTest"); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost); queue.open(); queueEntryList = queue.getEntries(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java index f4d8df9..40853fc 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java @@ -44,6 +44,7 @@ import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.TransactionLogResource; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class SortedQueueEntryListTest extends QueueEntryListTestBase @@ -91,16 +92,8 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase attributes.put(SortedQueue.SORT_KEY, "KEY"); // Create test list - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); + _testQueue = new SortedQueueImpl(attributes, virtualHost) { SelfValidatingSortedQueueEntryList _entries; @@ -193,7 +186,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase return message; } - public void testIterator() + public void testIterator() throws Exception { super.testIterator(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java index 9ca577d..cada40c 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java @@ -42,6 +42,7 @@ import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.store.TransactionLogResource; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class SortedQueueEntryTest extends QueueEntryImplTestBase @@ -61,16 +62,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT); attributes.put(SortedQueue.SORT_KEY, "KEY"); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(factory); - when(virtualHost.getModel()).thenReturn(factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); SortedQueueImpl queue = new SortedQueueImpl(attributes, virtualHost) { SelfValidatingSortedQueueEntryList _entries; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java index a762903..1455050 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java @@ -41,6 +41,7 @@ import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.TransactionLogResource; +import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class StandardQueueEntryListTest extends QueueEntryListTestBase @@ -54,23 +55,15 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase private ConfiguredObjectFactoryImpl _factory; @Override - protected void setUp() + protected void setUp() throws Exception { oldScavengeValue = System.setProperty(SCAVENGE_PROP, "9"); Map<String,Object> queueAttributes = new HashMap<String, Object>(); queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, getName()); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - _factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); - when(virtualHost.getObjectFactory()).thenReturn(_factory); - when(virtualHost.getModel()).thenReturn(_factory.getModel()); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); + _testQueue = new StandardQueueImpl(queueAttributes, virtualHost); _testQueue.open(); _sqel = _testQueue.getEntries(); @@ -102,29 +95,20 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase } @Override - public StandardQueueEntryList getTestList() + public StandardQueueEntryList getTestList() throws Exception { return getTestList(false); } @Override - public StandardQueueEntryList getTestList(boolean newList) + public StandardQueueEntryList getTestList(boolean newList) throws Exception { if(newList) { Map<String,Object> queueAttributes = new HashMap<String, Object>(); queueAttributes.put(Queue.ID, UUID.randomUUID()); queueAttributes.put(Queue.NAME, getName()); - final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class); - when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class)); - when(virtualHost.getEventLogger()).thenReturn(new EventLogger()); - when(virtualHost.getObjectFactory()).thenReturn(_factory); - when(virtualHost.getModel()).thenReturn(_factory.getModel()); - when(virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); - TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); - when(virtualHost.getTaskExecutor()).thenReturn(taskExecutor); - when(virtualHost.getChildExecutor()).thenReturn(taskExecutor); - + final VirtualHostImpl virtualHost = BrokerTestHelper.createVirtualHost("testVH"); StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost); queue.open(); return queue.getEntries(); @@ -264,7 +248,7 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase assertEquals("Count should have been equal",count,remainingMessages.size()); } - public void testGettingNextElement() + public void testGettingNextElement() throws Exception { final int numberOfEntries = 5; final OrderedQueueEntry[] entries = new OrderedQueueEntry[numberOfEntries]; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0169136f/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java index 9c7d599..343820c 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java +++ b/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java @@ -101,6 +101,7 @@ public class BrokerTestHelper when(broker.getCategoryClass()).thenReturn(Broker.class); when(broker.getParent(SystemConfig.class)).thenReturn(systemConfig); when(broker.getContextValue(eq(Long.class), eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0l); + when(broker.getFlowToDiskThreshold()).thenReturn(Long.MAX_VALUE); when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR); when(systemConfig.getTaskExecutor()).thenReturn(TASK_EXECUTOR); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
