You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/05/03 15:59:08 UTC
[2/3] qpid-broker-j git commit: QPID-7763: [Java Broker] Fix mock in
unit tests
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/453e5a79
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/453e5a79
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/453e5a79
Branch: refs/heads/6.1.x
Commit: 453e5a79a10cd1868faeeb5de7e2eaab66ba866c
Parents: c1284ac
Author: Lorenz Quack <lq...@apache.org>
Authored: Fri Apr 28 10:26:38 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed May 3 16:21:18 2017 +0100
----------------------------------------------------------------------
.../qpid/server/model/BrokerTestHelper.java | 1 +
.../server/queue/LastValueQueueListTest.java | 11 ++-----
.../server/queue/PriorityQueueListTest.java | 12 ++------
.../server/queue/QueueEntryImplTestBase.java | 14 ++-------
.../server/queue/QueueEntryListTestBase.java | 18 ++++++------
.../server/queue/SimpleQueueEntryImplTest.java | 11 ++-----
.../server/queue/SortedQueueEntryListTest.java | 13 ++-------
.../qpid/server/queue/SortedQueueEntryTest.java | 11 ++-----
.../queue/StandardQueueEntryListTest.java | 30 ++++++--------------
9 files changed, 32 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/453e5a79/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index 8ee2a92..8b029c1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -138,6 +138,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);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/453e5a79/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 cd5ce2a..840cb56 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
@@ -35,6 +35,7 @@ import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
@@ -61,15 +62,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 VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost 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/453e5a79/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 9e5ecc6..4c97a23 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
@@ -54,7 +54,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];
@@ -62,15 +62,7 @@ public class PriorityQueueListTest extends QpidTestCase
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
queueAttributes.put(PriorityQueue.PRIORITIES, 10);
- final VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost 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/453e5a79/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 3e07bda..3fd2b4c 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
@@ -42,6 +42,7 @@ import org.apache.qpid.server.message.MessageInstance.UnstealableConsumerAcquire
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
@@ -278,23 +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 VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost);
queue.open();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/453e5a79/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 a17e57b..e069855 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
@@ -35,13 +35,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());
}
@@ -53,7 +53,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);
@@ -73,7 +73,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);
@@ -108,7 +108,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();
@@ -126,7 +126,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;
@@ -179,7 +179,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());
@@ -191,7 +191,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/453e5a79/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 7671218..1435fc7 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
@@ -35,6 +35,7 @@ import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
@@ -52,15 +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 VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost 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/453e5a79/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 87543ca..7dce1ed 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
@@ -38,6 +38,7 @@ import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
@@ -90,15 +91,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
attributes.put(SortedQueue.SORT_KEY, "KEY");
// Create test list
- final VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
_testQueue = new SortedQueueImpl(attributes, virtualHost)
{
SelfValidatingSortedQueueEntryList _entries;
@@ -191,7 +184,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/453e5a79/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 9648b17..1b535cc 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
@@ -37,6 +37,7 @@ import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
@@ -61,15 +62,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
attributes.put(SortedQueue.SORT_KEY, "KEY");
- final VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
SortedQueueImpl queue = new SortedQueueImpl(attributes, virtualHost)
{
SelfValidatingSortedQueueEntryList _entries;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/453e5a79/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 2f4005c..94d4b99 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
@@ -37,6 +37,7 @@ import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
@@ -53,22 +54,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 VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+
_testQueue = new StandardQueueImpl(queueAttributes, virtualHost);
_testQueue.open();
_sqel = _testQueue.getEntries();
@@ -100,28 +94,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 VirtualHost virtualHost = mock(VirtualHost.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 VirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost);
queue.open();
return queue.getEntries();
@@ -261,7 +247,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];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org