You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:29 UTC
[22/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
index 992b886..4f23fd0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
@@ -30,6 +30,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerTestHelper;
@@ -38,19 +41,18 @@ import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
+public class FlowToDiskOverflowPolicyHandlerTest extends UnitTestBase
{
private Queue<?> _queue;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
- VirtualHost<?> virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName());
+ VirtualHost<?> virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName(), this);
Map<String, Object> attributes = new HashMap<>();
attributes.put(Queue.NAME, "testQueue");
@@ -59,6 +61,7 @@ public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
_queue = (AbstractQueue<?>) virtualHost.createChild(Queue.class, attributes);
}
+ @Test
public void testOverflowAfterLoweringLimit() throws Exception
{
ServerMessage<?> message = createMessage(10L);
@@ -76,6 +79,7 @@ public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
verify(storedMessage2).flowToDisk();
}
+ @Test
public void testOverflowOnSecondMessage() throws Exception
{
_queue.setAttributes(Collections.singletonMap(Queue.MAXIMUM_QUEUE_DEPTH_BYTES, 10));
@@ -90,6 +94,7 @@ public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
verify(storedMessage2).flowToDisk();
}
+ @Test
public void testBytesOverflow() throws Exception
{
_queue.setAttributes(Collections.singletonMap(Queue.MAXIMUM_QUEUE_DEPTH_BYTES, 0));
@@ -99,6 +104,7 @@ public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
verify(storedMessage).flowToDisk();
}
+ @Test
public void testMessagesOverflow() throws Exception
{
_queue.setAttributes(Collections.singletonMap(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, 0));
@@ -108,6 +114,7 @@ public class FlowToDiskOverflowPolicyHandlerTest extends QpidTestCase
verify(storedMessage).flowToDisk();
}
+ @Test
public void testNoOverflow() throws Exception
{
_queue.setAttributes(Collections.singletonMap(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, 10));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 fc9ec9f..073b67c 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
@@ -19,31 +19,30 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+import org.junit.Test;
+
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;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class LastValueQueueListTest extends QpidTestCase
+public class LastValueQueueListTest extends UnitTestBase
{
private static final String CONFLATION_KEY = "CONFLATION_KEY";
@@ -54,35 +53,37 @@ public class LastValueQueueListTest extends QpidTestCase
private LastValueQueueList _list;
private LastValueQueueImpl _queue;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
- queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.NAME, getTestName());
queueAttributes.put(LastValueQueue.LVQ_KEY, CONFLATION_KEY);
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
_queue = new LastValueQueueImpl(queueAttributes, virtualHost);
_queue.open();
_list = _queue.getEntries();
}
+ @Test
public void testListHasNoEntries()
{
int numberOfEntries = countEntries(_list);
- assertEquals(0, numberOfEntries);
+ assertEquals((long) 0, (long) numberOfEntries);
}
+ @Test
public void testAddMessageWithoutConflationKeyValue()
{
ServerMessage message = createTestServerMessage(null);
_list.add(message, null);
int numberOfEntries = countEntries(_list);
- assertEquals(1, numberOfEntries);
+ assertEquals((long) 1, (long) numberOfEntries);
}
+ @Test
public void testAddAndDiscardMessageWithoutConflationKeyValue()
{
ServerMessage message = createTestServerMessage(null);
@@ -92,18 +93,20 @@ public class LastValueQueueListTest extends QpidTestCase
addedEntry.delete();
int numberOfEntries = countEntries(_list);
- assertEquals(0, numberOfEntries);
+ assertEquals((long) 0, (long) numberOfEntries);
}
+ @Test
public void testAddMessageWithConflationKeyValue()
{
ServerMessage message = createTestServerMessage(TEST_KEY_VALUE);
_list.add(message, null);
int numberOfEntries = countEntries(_list);
- assertEquals(1, numberOfEntries);
+ assertEquals((long) 1, (long) numberOfEntries);
}
+ @Test
public void testAddAndRemoveMessageWithConflationKeyValue()
{
ServerMessage message = createTestServerMessage(TEST_KEY_VALUE);
@@ -113,9 +116,10 @@ public class LastValueQueueListTest extends QpidTestCase
addedEntry.delete();
int numberOfEntries = countEntries(_list);
- assertEquals(0, numberOfEntries);
+ assertEquals((long) 0, (long) numberOfEntries);
}
+ @Test
public void testAddTwoMessagesWithDifferentConflationKeyValue()
{
ServerMessage message1 = createTestServerMessage(TEST_KEY_VALUE1);
@@ -125,9 +129,10 @@ public class LastValueQueueListTest extends QpidTestCase
_list.add(message2, null);
int numberOfEntries = countEntries(_list);
- assertEquals(2, numberOfEntries);
+ assertEquals((long) 2, (long) numberOfEntries);
}
+ @Test
public void testAddTwoMessagesWithSameConflationKeyValue()
{
ServerMessage message1 = createTestServerMessage(TEST_KEY_VALUE);
@@ -137,9 +142,10 @@ public class LastValueQueueListTest extends QpidTestCase
_list.add(message2, null);
int numberOfEntries = countEntries(_list);
- assertEquals(1, numberOfEntries);
+ assertEquals((long) 1, (long) numberOfEntries);
}
+ @Test
public void testSupersededEntryIsDiscardedOnRelease()
{
ServerMessage message1 = createTestServerMessage(TEST_KEY_VALUE);
@@ -151,36 +157,38 @@ public class LastValueQueueListTest extends QpidTestCase
_list.add(message2, null);
assertFalse(entry1.isDeleted());
- assertEquals(2, countEntries(_list));
+ assertEquals((long) 2, (long) countEntries(_list));
entry1.release(); // simulate consumer rollback/recover
- assertEquals(1, countEntries(_list));
+ assertEquals((long) 1, (long) countEntries(_list));
assertTrue(entry1.isDeleted());
}
+ @Test
public void testConflationMapMaintained()
{
- assertEquals(0, _list.getLatestValuesMap().size());
+ assertEquals((long) 0, (long) _list.getLatestValuesMap().size());
ServerMessage message = createTestServerMessage(TEST_KEY_VALUE);
QueueEntry addedEntry = _list.add(message, null);
- assertEquals(1, countEntries(_list));
- assertEquals(1, _list.getLatestValuesMap().size());
+ assertEquals((long) 1, (long) countEntries(_list));
+ assertEquals((long) 1, (long) _list.getLatestValuesMap().size());
addedEntry.acquire();
addedEntry.delete();
- assertEquals(0, countEntries(_list));
- assertEquals(0, _list.getLatestValuesMap().size());
+ assertEquals((long) 0, (long) countEntries(_list));
+ assertEquals((long) 0, (long) _list.getLatestValuesMap().size());
}
+ @Test
public void testConflationMapMaintainedWithDifferentConflationKeyValue()
{
- assertEquals(0, _list.getLatestValuesMap().size());
+ assertEquals((long) 0, (long) _list.getLatestValuesMap().size());
ServerMessage message1 = createTestServerMessage(TEST_KEY_VALUE1);
ServerMessage message2 = createTestServerMessage(TEST_KEY_VALUE2);
@@ -188,18 +196,19 @@ public class LastValueQueueListTest extends QpidTestCase
QueueEntry addedEntry1 = _list.add(message1, null);
QueueEntry addedEntry2 = _list.add(message2, null);
- assertEquals(2, countEntries(_list));
- assertEquals(2, _list.getLatestValuesMap().size());
+ assertEquals((long) 2, (long) countEntries(_list));
+ assertEquals((long) 2, (long) _list.getLatestValuesMap().size());
addedEntry1.acquire();
addedEntry1.delete();
addedEntry2.acquire();
addedEntry2.delete();
- assertEquals(0, countEntries(_list));
- assertEquals(0, _list.getLatestValuesMap().size());
+ assertEquals((long) 0, (long) countEntries(_list));
+ assertEquals((long) 0, (long) _list.getLatestValuesMap().size());
}
+ @Test
public void testGetLesserOldestEntry()
{
LastValueQueueList queueEntryList = new LastValueQueueList(_queue, _queue.getQueueStatistics());
@@ -208,13 +217,13 @@ public class LastValueQueueListTest extends QpidTestCase
assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
QueueEntry entry2 = queueEntryList.add(createTestServerMessage(TEST_KEY_VALUE2), null);
- assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
+ assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
QueueEntry entry3 = queueEntryList.add(createTestServerMessage(TEST_KEY_VALUE1), null);
- assertEquals("Unexpected last message", entry2, queueEntryList.getLeastSignificantOldestEntry());
+ assertEquals("Unexpected last message", entry2, queueEntryList.getLeastSignificantOldestEntry());
queueEntryList.add(createTestServerMessage(TEST_KEY_VALUE2), null);
- assertEquals("Unexpected last message", entry3, queueEntryList.getLeastSignificantOldestEntry());
+ assertEquals("Unexpected last message", entry3, queueEntryList.getLeastSignificantOldestEntry());
}
private int countEntries(LastValueQueueList list)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
index 6701c0f..c83a397 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
@@ -20,15 +20,19 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.server.model.Queue;
+import org.junit.Before;
+import org.junit.Test;
+import org.apache.qpid.server.model.Queue;
public class LastValueQueueTest extends AbstractQueueTestBase
{
- @Override
+ @Before
public void setUp() throws Exception
{
Map<String,Object> arguments = new HashMap<>();
@@ -41,14 +45,15 @@ public class LastValueQueueTest extends AbstractQueueTestBase
@Override
+ @Test
public void testOldestMessage()
{
Queue<?> queue = getQueue();
queue.enqueue(createMessage(1l, (byte)1, Collections.singletonMap("lvqKey", (Object) "Z"), 10l), null, null);
- assertEquals(10l,queue.getOldestMessageArrivalTime());
+ assertEquals(10l, queue.getOldestMessageArrivalTime());
queue.enqueue(createMessage(2l, (byte)4, Collections.singletonMap("lvqKey", (Object) "M"), 100l), null, null);
- assertEquals(10l,queue.getOldestMessageArrivalTime());
+ assertEquals(10l, queue.getOldestMessageArrivalTime());
queue.enqueue(createMessage(3l, (byte)9, Collections.singletonMap("lvqKey", (Object) "Z"), 1000l), null, null);
- assertEquals(100l,queue.getOldestMessageArrivalTime());
+ assertEquals(100l, queue.getOldestMessageArrivalTime());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
index ce68ab7..39e7648 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.queue;
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_AGE_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_COUNT_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_SIZE_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.QUEUE_DEPTH_ALERT;
import static org.mockito.Matchers.contains;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -27,24 +31,21 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_AGE_ALERT;
-import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_COUNT_ALERT;
-import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_SIZE_ALERT;
-import static org.apache.qpid.server.queue.NotificationCheck.QUEUE_DEPTH_ALERT;
-
+import org.junit.Test;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.QueueNotificationListener;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class NotificationCheckTest extends QpidTestCase
+public class NotificationCheckTest extends UnitTestBase
{
private ServerMessage<?> _message = mock(ServerMessage.class);
private Queue<?> _queue = mock(Queue.class);
private QueueNotificationListener _listener = mock(QueueNotificationListener .class);
+ @Test
public void testMessageCountAlertFires() throws Exception
{
when(_queue.getAlertThresholdQueueDepthMessages()).thenReturn(1000l);
@@ -60,6 +61,7 @@ public class NotificationCheckTest extends QpidTestCase
verify(_listener).notifyClients(eq(MESSAGE_COUNT_ALERT), eq(_queue), eq("1001: Maximum count on queue threshold (1000) breached."));
}
+ @Test
public void testMessageSizeAlertFires() throws Exception
{
when(_queue.getAlertThresholdMessageSize()).thenReturn(1024l);
@@ -75,6 +77,7 @@ public class NotificationCheckTest extends QpidTestCase
verify(_listener).notifyClients(eq(MESSAGE_SIZE_ALERT), eq(_queue), contains("1025b : Maximum message size threshold (1024) breached."));
}
+ @Test
public void testMessageAgeAlertFires() throws Exception
{
long now = System.currentTimeMillis();
@@ -89,6 +92,7 @@ public class NotificationCheckTest extends QpidTestCase
verify(_listener).notifyClients(eq(MESSAGE_AGE_ALERT), eq(_queue), contains("s : Maximum age on queue threshold (1s) breached."));
}
+ @Test
public void testQueueDepthAlertFires() throws Exception
{
when(_queue.getAlertThresholdQueueDepthBytes()).thenReturn(1024l);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 648fc8f..e77ef81 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
@@ -20,34 +20,29 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
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.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.server.model.ConfiguredObject;
-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.model.VirtualHostNode;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PriorityQueueListTest extends QpidTestCase
+public class PriorityQueueListTest extends UnitTestBase
{
private static final byte[] PRIORITIES = {4, 5, 5, 4};
PriorityQueueList _list;
@@ -57,17 +52,16 @@ public class PriorityQueueListTest extends QpidTestCase
private QueueEntry _priority5message1;
private QueueEntry _priority5message2;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
QueueEntry[] entries = new QueueEntry[PRIORITIES.length];
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
- queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.NAME, getTestName());
queueAttributes.put(PriorityQueue.PRIORITIES, 10);
- final QueueManagingVirtualHost<?> virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ final QueueManagingVirtualHost<?> virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
PriorityQueueImpl queue = new PriorityQueueImpl(queueAttributes, virtualHost);
queue.open();
_list = queue.getEntries();
@@ -94,12 +88,11 @@ public class PriorityQueueListTest extends QpidTestCase
_priority5message2 = entries[2];
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- super.tearDown();
}
finally
{
@@ -107,58 +100,76 @@ public class PriorityQueueListTest extends QpidTestCase
}
}
+ @Test
public void testPriorityQueueEntryCompareToItself()
{
//check messages compare to themselves properly
assertEquals("message should compare 'equal' to itself",
- 0, _priority4message1.compareTo(_priority4message1));
+ (long) 0,
+ (long) _priority4message1.compareTo(_priority4message1));
assertEquals("message should compare 'equal' to itself",
- 0, _priority5message2.compareTo(_priority5message2));
+ (long) 0,
+ (long) _priority5message2.compareTo(_priority5message2));
}
+ @Test
public void testPriorityQueueEntryCompareToSamePriority()
{
//check messages with the same priority are ordered properly
assertEquals("first message should be 'earlier' than second message of the same priority",
- -1, _priority4message1.compareTo(_priority4message2));
+ (long) -1,
+ (long) _priority4message1.compareTo(_priority4message2));
assertEquals("first message should be 'earlier' than second message of the same priority",
- -1, _priority5message1.compareTo(_priority5message2));
+ (long) -1,
+ (long) _priority5message1.compareTo(_priority5message2));
//and in reverse
assertEquals("second message should be 'later' than first message of the same priority",
- 1, _priority4message2.compareTo(_priority4message1));
+ (long) 1,
+ (long) _priority4message2.compareTo(_priority4message1));
assertEquals("second message should be 'later' than first message of the same priority",
- 1, _priority5message2.compareTo(_priority5message1));
+ (long) 1,
+ (long) _priority5message2.compareTo(_priority5message1));
}
+ @Test
public void testPriorityQueueEntryCompareToDifferentPriority()
{
//check messages with higher priority are ordered 'earlier' than those with lower priority
assertEquals("first message with priority 5 should be 'earlier' than first message of priority 4",
- -1, _priority5message1.compareTo(_priority4message1));
+ (long) -1,
+ (long) _priority5message1.compareTo(_priority4message1));
assertEquals("first message with priority 5 should be 'earlier' than second message of priority 4",
- -1, _priority5message1.compareTo(_priority4message2));
+ (long) -1,
+ (long) _priority5message1.compareTo(_priority4message2));
assertEquals("second message with priority 5 should be 'earlier' than first message of priority 4",
- -1, _priority5message2.compareTo(_priority4message1));
+ (long) -1,
+ (long) _priority5message2.compareTo(_priority4message1));
assertEquals("second message with priority 5 should be 'earlier' than second message of priority 4",
- -1, _priority5message2.compareTo(_priority4message2));
+ (long) -1,
+ (long) _priority5message2.compareTo(_priority4message2));
//and in reverse
assertEquals("first message with priority 4 should be 'later' than first message of priority 5",
- 1, _priority4message1.compareTo(_priority5message1));
+ (long) 1,
+ (long) _priority4message1.compareTo(_priority5message1));
assertEquals("first message with priority 4 should be 'later' than second message of priority 5",
- 1, _priority4message1.compareTo(_priority5message2));
+ (long) 1,
+ (long) _priority4message1.compareTo(_priority5message2));
assertEquals("second message with priority 4 should be 'later' than first message of priority 5",
- 1, _priority4message2.compareTo(_priority5message1));
+ (long) 1,
+ (long) _priority4message2.compareTo(_priority5message1));
assertEquals("second message with priority 4 should be 'later' than second message of priority 5",
- 1, _priority4message2.compareTo(_priority5message2));
+ (long) 1,
+ (long) _priority4message2.compareTo(_priority5message2));
}
+ @Test
public void testGetLeastSignificantOldestEntry()
{
assertEquals("Unexpected last entry", _priority4message1, _list.getLeastSignificantOldestEntry());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index c5d5a9a..d66892d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
@@ -27,22 +28,24 @@ import java.util.Collections;
import java.util.EnumSet;
import junit.framework.AssertionFailedError;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
-
public class PriorityQueueTest extends AbstractQueueTestBase
{
- @Override
+ @Before
public void setUp() throws Exception
{
setArguments(Collections.singletonMap(PriorityQueue.PRIORITIES,(Object)3));
super.setUp();
}
+ @Test
public void testPriorityOrdering() throws Exception, InterruptedException
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
index 381d303..691a65e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
@@ -19,6 +19,8 @@
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.mock;
@@ -34,6 +36,8 @@ import javax.security.auth.Subject;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.connection.SessionPrincipal;
import org.apache.qpid.server.logging.EventLogger;
@@ -43,19 +47,18 @@ import org.apache.qpid.server.logging.messages.QueueMessages;
import org.apache.qpid.server.model.OverflowPolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.session.AMQPSession;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
+public class ProducerFlowControlOverflowPolicyHandlerTest extends UnitTestBase
{
private ProducerFlowControlOverflowPolicyHandler _producerFlowControlOverflowPolicyHandler;
private Queue<?> _queue;
private EventLogger _eventLogger;
private LogSubject _subject;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_eventLogger = mock(EventLogger.class);
_subject = mock(LogSubject.class);
@@ -72,6 +75,7 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
_producerFlowControlOverflowPolicyHandler = new ProducerFlowControlOverflowPolicyHandler(_queue, _eventLogger);
}
+ @Test
public void testCheckOverflowBlocksSessionWhenOverfullBytes() throws Exception
{
AMQPSession<?, ?> session = mock(AMQPSession.class);
@@ -87,6 +91,7 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(session);
}
+ @Test
public void testCheckOverflowBlocksSessionWhenOverfullMessages() throws Exception
{
AMQPSession<?, ?> session = mock(AMQPSession.class);
@@ -102,10 +107,12 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(session);
}
+ @Test
public void testIsQueueFlowStopped() throws Exception
{
assertFalse("Flow should not be stopped", _producerFlowControlOverflowPolicyHandler.isQueueFlowStopped());
+
when(_queue.getQueueDepthBytes()).thenReturn(11L);
when(_queue.getMaximumQueueDepthBytes()).thenReturn(10L);
@@ -114,6 +121,7 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
assertTrue("Flow should be stopped", _producerFlowControlOverflowPolicyHandler.isQueueFlowStopped());
}
+ @Test
public void testCheckOverflowResumesFlowWhenUnderfullBytes() throws Exception
{
AMQPSession<?, ?> session = mock(AMQPSession.class);
@@ -139,6 +147,7 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(session);
}
+ @Test
public void testCheckOverflowResumesFlowWhenUnderfullMessages() throws Exception
{
AMQPSession<?, ?> session = mock(AMQPSession.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 35c8c46..5f41c45 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
@@ -19,6 +19,11 @@
package org.apache.qpid.server.queue;
import static org.apache.qpid.server.message.MessageInstance.NON_CONSUMER_ACQUIRED_STATE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
@@ -27,34 +32,31 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.lang.reflect.Field;
-import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageInstance.EntryState;
import org.apache.qpid.server.message.MessageInstance.StealableConsumerAcquiredState;
import org.apache.qpid.server.message.MessageInstance.UnstealableConsumerAcquiredState;
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;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.StateChangeListener;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests for {@link QueueEntryImpl}
*/
-public abstract class QueueEntryImplTestBase extends QpidTestCase
+public abstract class QueueEntryImplTestBase extends UnitTestBase
{
// tested entry
protected QueueEntryImpl _queueEntry;
@@ -64,13 +66,16 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
public abstract QueueEntryImpl getQueueEntryImpl(int msgId);
+ @Test
public abstract void testCompareTo();
+ @Test
public abstract void testTraverseWithNoDeletedEntries();
+ @Test
public abstract void testTraverseWithDeletedEntries();
- @Override
+ @Before
public void setUp() throws Exception
{
_queueEntry = getQueueEntryImpl(1);
@@ -78,13 +83,16 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
_queueEntry3 = getQueueEntryImpl(3);
}
+ @Test
public void testAcquire()
{
assertTrue("Queue entry should be in AVAILABLE state before invoking of acquire method",
- _queueEntry.isAvailable());
+ _queueEntry.isAvailable());
+
acquire();
}
+ @Test
public void testDelete()
{
delete();
@@ -101,7 +109,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
acquire();
_queueEntry.release();
assertTrue("Queue entry should be in AVAILABLE state after invoking of release method",
- _queueEntry.isAvailable());
+ _queueEntry.isAvailable());
}
/**
@@ -110,12 +118,13 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
* Invoking release on deleted entry should not have any effect on its
* state.
*/
+ @Test
public void testReleaseDeleted()
{
delete();
_queueEntry.release();
assertTrue("Invoking of release on entry in DELETED state should not have any effect",
- _queueEntry.isDeleted());
+ _queueEntry.isDeleted());
}
/**
@@ -126,7 +135,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
_queueEntry.acquire();
_queueEntry.delete();
assertTrue("Queue entry should be in DELETED state after invoking of delete method",
- _queueEntry.isDeleted());
+ _queueEntry.isDeleted());
}
@@ -137,7 +146,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
{
_queueEntry.acquire(newConsumer());
assertTrue("Queue entry should be in ACQUIRED state after invoking of acquire method",
- _queueEntry.isAcquired());
+ _queueEntry.isAcquired());
}
private QueueConsumer newConsumer()
@@ -153,6 +162,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
return consumer;
}
+ @Test
public void testStateChanges()
{
QueueConsumer consumer = newConsumer();
@@ -172,6 +182,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
eq(NON_CONSUMER_ACQUIRED_STATE));
}
+ @Test
public void testLocking()
{
QueueConsumer consumer = newConsumer();
@@ -179,16 +190,19 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
_queueEntry.acquire(consumer);
assertTrue("Queue entry should be in ACQUIRED state after invoking of acquire method",
- _queueEntry.isAcquired());
+ _queueEntry.isAcquired());
+
+ assertFalse("Acquisition should initially be locked",
+ _queueEntry.removeAcquisitionFromConsumer(consumer));
- assertFalse("Acquisition should initially be locked",_queueEntry.removeAcquisitionFromConsumer(consumer));
assertTrue("Should be able to unlock locked queue entry", _queueEntry.makeAcquisitionStealable());
assertFalse("Acquisition should not be able to be removed from the wrong consumer",
- _queueEntry.removeAcquisitionFromConsumer(consumer2));
+ _queueEntry.removeAcquisitionFromConsumer(consumer2));
assertTrue("Acquisition should be able to be removed once unlocked",
- _queueEntry.removeAcquisitionFromConsumer(consumer));
+ _queueEntry.removeAcquisitionFromConsumer(consumer));
assertTrue("Queue Entry should still be acquired", _queueEntry.isAcquired());
- assertFalse("Queue Entry should not be marked as acquired by a consumer", _queueEntry.acquiredByConsumer());
+ assertFalse("Queue Entry should not be marked as acquired by a consumer",
+ _queueEntry.acquiredByConsumer());
_queueEntry.release();
@@ -196,17 +210,20 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
_queueEntry.acquire(consumer);
assertTrue("Queue entry should be in ACQUIRED state after invoking of acquire method",
- _queueEntry.isAcquired());
+ _queueEntry.isAcquired());
- assertFalse("Acquisition should initially be locked",_queueEntry.removeAcquisitionFromConsumer(consumer));
- assertTrue("Should be able to unlock locked queue entry",_queueEntry.makeAcquisitionStealable());
- assertTrue("Should be able to lock queue entry",_queueEntry.makeAcquisitionUnstealable(consumer));
- assertFalse("Acquisition should not be able to be hijacked when locked",_queueEntry.removeAcquisitionFromConsumer(consumer));
+ assertFalse("Acquisition should initially be locked",
+ _queueEntry.removeAcquisitionFromConsumer(consumer));
+ assertTrue("Should be able to unlock locked queue entry", _queueEntry.makeAcquisitionStealable());
+ assertTrue("Should be able to lock queue entry", _queueEntry.makeAcquisitionUnstealable(consumer));
+ assertFalse("Acquisition should not be able to be hijacked when locked",
+ _queueEntry.removeAcquisitionFromConsumer(consumer));
_queueEntry.delete();
assertTrue("Locked queue entry should be able to be deleted", _queueEntry.isDeleted());
}
+ @Test
public void testLockAcquisitionOwnership()
{
QueueConsumer consumer1 = newConsumer();
@@ -252,11 +269,13 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
* Tests rejecting a queue entry records the Consumer ID
* for later verification by isRejectedBy(consumerId).
*/
+ @Test
public void testRejectAndRejectedBy()
{
QueueConsumer sub = newConsumer();
- assertFalse("Queue entry should not yet have been rejected by the consumer", _queueEntry.isRejectedBy(sub));
+ assertFalse("Queue entry should not yet have been rejected by the consumer",
+ _queueEntry.isRejectedBy(sub));
assertFalse("Queue entry should not yet have been acquired by a consumer", _queueEntry.isAcquired());
//acquire, reject, and release the message using the consumer
@@ -270,7 +289,8 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
//repeat rejection using a second consumer
QueueConsumer sub2 = newConsumer();
- assertFalse("Queue entry should not yet have been rejected by the consumer", _queueEntry.isRejectedBy(sub2));
+ assertFalse("Queue entry should not yet have been rejected by the consumer",
+ _queueEntry.isRejectedBy(sub2));
assertTrue("Queue entry should have been able to be acquired", _queueEntry.acquire(sub2));
_queueEntry.reject(sub2);
@@ -282,14 +302,15 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
/**
* Tests if entries in DEQUEUED or DELETED state are not returned by getNext method.
*/
+ @Test
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 QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ queueAttributes.put(Queue.NAME, getTestName());
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost);
queue.open();
OrderedQueueEntryList queueEntryList = queue.getEntries();
@@ -331,7 +352,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
entries[2].delete();
QueueEntry next = entries[0].getNextValidEntry();
- assertEquals("expected forth entry",entries[3], next);
+ assertEquals("expected forth entry", entries[3], next);
next = next.getNextValidEntry();
assertEquals("expected fifth entry", entries[4], next);
next = next.getNextValidEntry();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 e069855..265b1c0 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
@@ -19,21 +19,30 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+
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.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Abstract test class for QueueEntryList implementations.
*/
-public abstract class QueueEntryListTestBase extends QpidTestCase
+public abstract class QueueEntryListTestBase extends UnitTestBase
{
public abstract QueueEntryList getTestList() throws Exception;
public abstract QueueEntryList getTestList(boolean newList) throws Exception;
@@ -41,6 +50,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
public abstract int getExpectedListLength();
public abstract ServerMessage getTestMessageToAdd();
+ @Test
public void testGetQueue() throws Exception
{
assertEquals("Unexpected head entry returned by getHead()", getTestList().getQueue(), getTestQueue());
@@ -53,6 +63,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getTestMessageToAdd()
*/
+ @Test
public void testAddSpecificMessage() throws Exception
{
final QueueEntryList list = getTestList();
@@ -65,7 +76,10 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
iter.getNode();
count++;
}
- assertEquals("List did not grow by one entry after an add", getExpectedListLength() + 1, count);
+ assertEquals("List did not grow by one entry after an add",
+ (long) (getExpectedListLength() + 1),
+ (long) count);
+
}
/**
@@ -73,6 +87,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
+ @Test
public void testAddGenericMessage() throws Exception
{
final QueueEntryList list = getTestList();
@@ -86,8 +101,9 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
iter.getNode();
count++;
}
- assertEquals("List did not grow by one entry after a generic message added", getExpectedListLength() + 1, count);
-
+ assertEquals("List did not grow by one entry after a generic message added",
+ (long) (getExpectedListLength() + 1),
+ (long) count);
}
private ServerMessage createServerMessage(long number)
@@ -108,6 +124,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
+ @Test
public void testListNext() throws Exception
{
final QueueEntryList entryList = getTestList();
@@ -118,7 +135,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
entry = entryList.next(entry);
count++;
}
- assertEquals("Get next didn't get all the list entries", getExpectedListLength(), count);
+ assertEquals("Get next didn't get all the list entries", (long) getExpectedListLength(), (long) count);
}
/**
@@ -126,6 +143,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
+ @Test
public void testIterator() throws Exception
{
final QueueEntryIterator iter = getTestList().iterator();
@@ -135,7 +153,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
iter.getNode();
count++;
}
- assertEquals("Iterator invalid", getExpectedListLength(), count);
+ assertEquals("Iterator invalid", (long) getExpectedListLength(), (long) count);
}
/**
@@ -143,6 +161,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
+ @Test
public void testDequeuedMessagedNotPresentInIterator() throws Exception
{
final int numberOfMessages = getExpectedListLength();
@@ -171,7 +190,8 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
}
final int expectedNumber = numberOfMessages / 2;
assertEquals("Expected " + expectedNumber + " number of entries in iterator but got " + counter2,
- expectedNumber, counter2);
+ (long) expectedNumber,
+ (long) counter2);
}
/**
@@ -179,18 +199,22 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedFirstMsgId()
*/
+ @Test
public void testGetHead() throws Exception
{
final QueueEntry head = getTestList().getHead();
assertNull("Head entry should not contain an actual message", head.getMessage());
- assertEquals("Unexpected message id for first list entry", getExpectedFirstMsgId(), getTestList().next(head)
- .getMessage().getMessageNumber());
+ assertEquals("Unexpected message id for first list entry",
+ getExpectedFirstMsgId(),
+ getTestList().next(head)
+ .getMessage().getMessageNumber());
}
/**
* Test to verify the entry deletion handled correctly.
* @see QueueEntryListTestBase#getTestList()
*/
+ @Test
public void testEntryDeleted() throws Exception
{
final QueueEntry head = getTestList().getHead();
@@ -200,12 +224,16 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
first.delete();
final QueueEntry second = getTestList().next(head);
- assertNotSame("After deletion the next entry should be different", first.getMessage().getMessageNumber(), second
+ assertNotSame("After deletion the next entry should be different",
+ first.getMessage().getMessageNumber(),
+ second
.getMessage().getMessageNumber());
final QueueEntry third = getTestList().next(first);
- assertEquals("After deletion the deleted nodes next node should be the same as the next from head", second
- .getMessage().getMessageNumber(), third.getMessage().getMessageNumber());
+ assertEquals("After deletion the deleted nodes next node should be the same as the next from head",
+ second
+ .getMessage().getMessageNumber(),
+ third.getMessage().getMessageNumber());
}
/**
@@ -215,6 +243,7 @@ public abstract class QueueEntryListTestBase extends QpidTestCase
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
+ @Test
public void testIteratorIgnoresDeletedFinalNode() throws Exception
{
QueueEntryList list = getTestList(true);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
index 79f19d1..4940df9 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,6 +31,9 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -40,19 +44,19 @@ import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class QueueMessageRecoveryTest extends QpidTestCase
+public class QueueMessageRecoveryTest extends UnitTestBase
{
QueueManagingVirtualHost<?> _vhost;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
- _vhost = BrokerTestHelper.createVirtualHost("host");
+ _vhost = BrokerTestHelper.createVirtualHost("host", this);
}
+ @Test
public void testSimpleRecovery() throws Exception
{
// Simple deterministic test to prove that interleaved recovery and new publishing onto a queue is correctly
@@ -70,7 +74,7 @@ public class QueueMessageRecoveryTest extends QpidTestCase
queue.enqueue(createMockMessage(6), null, null);
queue.recover(createMockMessage(3), createEnqueueRecord(3, queue));
- assertEquals(4, messageList.size());
+ assertEquals((long) 4, (long) messageList.size());
for(int i = 0; i < 4; i++)
{
assertEquals((long)i, messageList.get(i).getMessageNumber());
@@ -80,7 +84,7 @@ public class QueueMessageRecoveryTest extends QpidTestCase
queue.enqueue(createMockMessage(7), null, null);
- assertEquals(8, messageList.size());
+ assertEquals((long) 8, (long) messageList.size());
for(int i = 0; i < 8; i++)
{
@@ -90,6 +94,7 @@ public class QueueMessageRecoveryTest extends QpidTestCase
}
+ @Test
public void testMultiThreadedRecovery() throws Exception
{
// Non deterministic test with separate publishing and recovery threads
@@ -97,6 +102,7 @@ public class QueueMessageRecoveryTest extends QpidTestCase
performMultiThreadedRecovery(5000);
}
+ @Test
public void testRepeatedMultiThreadedRecovery() throws Exception
{
// Repeated non deterministic test with separate publishing and recovery threads(but with fewer messages being
@@ -150,7 +156,7 @@ public class QueueMessageRecoveryTest extends QpidTestCase
recoveryThread.join(10000);
publishingThread.join(10000);
- assertEquals(size*2, messageList.size());
+ assertEquals((long) (size * 2), (long) messageList.size());
for(int i = 0; i < (size*2); i++)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java
index 75666f1..7c1d7c6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java
@@ -19,9 +19,13 @@
package org.apache.qpid.server.queue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
@@ -29,17 +33,16 @@ import org.apache.qpid.server.model.OverflowPolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RejectPolicyHandlerTest extends QpidTestCase
+public class RejectPolicyHandlerTest extends UnitTestBase
{
private RejectPolicyHandler _rejectOverflowPolicyHandler;
private Queue<?> _queue;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_queue = mock(Queue.class);
when(_queue.getName()).thenReturn("testQueue");
@@ -52,6 +55,7 @@ public class RejectPolicyHandlerTest extends QpidTestCase
_rejectOverflowPolicyHandler = new RejectPolicyHandler(_queue);
}
+ @Test
public void testOverfullBytes() throws Exception
{
ServerMessage incomingMessage = createIncomingMessage(6);
@@ -70,6 +74,7 @@ public class RejectPolicyHandlerTest extends QpidTestCase
}
}
+ @Test
public void testOverfullMessages() throws Exception
{
ServerMessage incomingMessage = createIncomingMessage(5);
@@ -88,6 +93,7 @@ public class RejectPolicyHandlerTest extends QpidTestCase
}
}
+ @Test
public void testNotOverfullMessages() throws Exception
{
when(_queue.getMaximumQueueDepthMessages()).thenReturn(1L);
@@ -103,6 +109,7 @@ public class RejectPolicyHandlerTest extends QpidTestCase
_rejectOverflowPolicyHandler.checkReject(incomingMessage2);
}
+ @Test
public void testNotOverfullBytes() throws Exception
{
when(_queue.getMaximumQueueDepthBytes()).thenReturn(9L);
@@ -118,6 +125,7 @@ public class RejectPolicyHandlerTest extends QpidTestCase
_rejectOverflowPolicyHandler.checkReject(incomingMessage2);
}
+ @Test
public void testIncomingMessageDeleted() throws Exception
{
when(_queue.getMaximumQueueDepthMessages()).thenReturn(1L);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
index ca14820..9d26754 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
@@ -28,6 +28,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
@@ -37,19 +40,18 @@ import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.OverflowPolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.ProducerFlowControlOverflowPolicyHandlerTest.LogMessageMatcher;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RingOverflowPolicyHandlerTest extends QpidTestCase
+public class RingOverflowPolicyHandlerTest extends UnitTestBase
{
private RingOverflowPolicyHandler _ringOverflowPolicyHandler;
private Queue<?> _queue;
private EventLogger _eventLogger;
private LogSubject _subject;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_eventLogger = mock(EventLogger.class);
_subject = mock(LogSubject.class);
@@ -64,6 +66,7 @@ public class RingOverflowPolicyHandlerTest extends QpidTestCase
_ringOverflowPolicyHandler = new RingOverflowPolicyHandler(_queue, _eventLogger);
}
+ @Test
public void testCheckOverflowWhenOverfullBytes() throws Exception
{
QueueEntry lastEntry = createLastEntry();
@@ -80,6 +83,7 @@ public class RingOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(_eventLogger);
}
+ @Test
public void testCheckOverflowWhenOverfullMessages() throws Exception
{
QueueEntry lastEntry = createLastEntry();
@@ -96,6 +100,7 @@ public class RingOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(_eventLogger);
}
+ @Test
public void testCheckOverflowWhenUnderfullBytes() throws Exception
{
when(_queue.getQueueDepthBytes()).thenReturn(5L);
@@ -108,6 +113,7 @@ public class RingOverflowPolicyHandlerTest extends QpidTestCase
verifyNoMoreInteractions(_eventLogger);
}
+ @Test
public void testCheckOverflowWhenUnderfullMessages() throws Exception
{
when(_queue.getQueueDepthMessages()).thenReturn(5);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 d2daddb..0f0285a 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
@@ -20,40 +20,37 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+
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;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
{
private OrderedQueueEntryList queueEntryList;
- @Override
+ @Before
public void setUp() throws Exception
{
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, "SimpleQueueEntryImplTest");
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost);
queue.open();
queueEntryList = queue.getEntries();
@@ -96,14 +93,13 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
QueueEntry current = _queueEntry;
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry2, current);
+ assertSame("Unexpected current entry", _queueEntry2, current);
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry3, current);
+ assertSame("Unexpected current entry", _queueEntry3, current);
current = current.getNextValidEntry();
assertNull(current);
-
}
@Override
@@ -117,7 +113,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
QueueEntry current = _queueEntry;
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry3, current);
+ assertSame("Unexpected current entry", _queueEntry3, current);
current = current.getNextValidEntry();
assertNull(current);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 f0c2226..9d3c80f 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
@@ -19,33 +19,30 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+import org.junit.Test;
+
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;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
public class SortedQueueEntryListTest extends QueueEntryListTestBase
{
private static SelfValidatingSortedQueueEntryList _sqel;
@@ -80,18 +77,18 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
private SortedQueueImpl _testQueue;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
Map<String,Object> attributes = new HashMap<String,Object>();
attributes.put(Queue.ID,UUID.randomUUID());
- attributes.put(Queue.NAME, getName());
+ attributes.put(Queue.NAME, getTestName());
attributes.put(Queue.DURABLE, false);
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
attributes.put(SortedQueue.SORT_KEY, "KEY");
// Create test list
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
_testQueue = new SortedQueueImpl(attributes, virtualHost)
{
SelfValidatingSortedQueueEntryList _entries;
@@ -111,8 +108,6 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
_testQueue.open();
_sqel = (SelfValidatingSortedQueueEntryList) _testQueue.getEntries();
- super.setUp();
-
// Create result array
Arrays.sort(keysSorted);
@@ -188,6 +183,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
}
@Override
+ @Test
public void testIterator() throws Exception
{
super.testIterator();
@@ -197,8 +193,9 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
int count = 0;
while(iter.advance())
{
- assertEquals("Sorted queue entry value does not match sorted key array",
- keysSorted[count++], getSortedKeyValue(iter));
+ final Object expected = keysSorted[count++];
+ assertEquals("Sorted queue entry value does not match sorted key array", expected,
+ getSortedKeyValue(iter));
}
}
@@ -212,6 +209,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
return (iter.getNode()).getMessage().getMessageNumber();
}
+ @Test
public void testNonUniqueSortKeys() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -229,10 +227,12 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
while(iter.advance())
{
assertEquals("Sorted queue entry value is not as expected", "samekey", getSortedKeyValue(iter));
- assertEquals("Message id not as expected", Long.valueOf(count++), getMessageId(iter));
+ final Object expected = Long.valueOf(count++);
+ assertEquals("Message id not as expected", expected, getMessageId(iter));
}
}
+ @Test
public void testNullSortKeys() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -250,10 +250,12 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
while(iter.advance())
{
assertNull("Sorted queue entry value is not as expected", getSortedKeyValue(iter));
- assertEquals("Message id not as expected", Long.valueOf(count++), getMessageId(iter));
+ final Object expected = Long.valueOf(count++);
+ assertEquals("Message id not as expected", expected, getMessageId(iter));
}
}
+ @Test
public void testAscendingSortKeys() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -277,6 +279,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
}
}
+ @Test
public void testDescendingSortKeys() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -295,11 +298,14 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
while(iter.advance())
{
assertEquals("Sorted queue entry value is not as expected", textkeys[count], getSortedKeyValue(iter));
- assertEquals("Message id not as expected", Long.valueOf(textkeys.length-count-1), getMessageId(iter));
+ assertEquals("Message id not as expected",
+ Long.valueOf(textkeys.length - count - 1),
+ getMessageId(iter));
count++;
}
}
+ @Test
public void testInsertAfter() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -320,6 +326,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
validateEntry(entry, "B", 2);
}
+ @Test
public void testInsertBefore() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -340,6 +347,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
validateEntry(entry, "B", 1);
}
+ @Test
public void testInsertInbetween() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -371,6 +379,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
validateEntry(entry, "C", 2);
}
+ @Test
public void testInsertAtHead() throws Exception
{
_sqel = new SelfValidatingSortedQueueEntryList(_testQueue);
@@ -418,6 +427,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
validateEntry(entry, "D", 2);
}
+ @Test
public void testGetLeastSignificantOldestEntry()
{
SortedQueueEntryList list = new SortedQueueEntryList(_testQueue, _testQueue.getQueueStatistics());
@@ -438,9 +448,12 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
private void validateEntry(final SortedQueueEntry entry, final String expectedSortKey, final long expectedMessageId)
{
assertEquals("Sorted queue entry value is not as expected",
- expectedSortKey, entry.getMessage().getMessageHeader().getHeader("KEY"));
+ expectedSortKey,
+ entry.getMessage().getMessageHeader().getHeader("KEY"));
assertEquals("Sorted queue entry id is not as expected",
- expectedMessageId, entry.getMessage().getMessageNumber());
+ expectedMessageId,
+ entry.getMessage().getMessageNumber());
+
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/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 2dbcec2..4a80275 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
@@ -19,32 +19,30 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+import org.junit.Test;
+
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;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
public class SortedQueueEntryTest extends QueueEntryImplTestBase
{
@@ -52,17 +50,17 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
private SelfValidatingSortedQueueEntryList _queueEntryList;
- @Override
+ @Before
public void setUp() throws Exception
{
Map<String,Object> attributes = new HashMap<String,Object>();
attributes.put(Queue.ID,UUID.randomUUID());
- attributes.put(Queue.NAME, getName());
+ attributes.put(Queue.NAME, getTestName());
attributes.put(Queue.DURABLE, false);
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
attributes.put(SortedQueue.SORT_KEY, "KEY");
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
SortedQueueImpl queue = new SortedQueueImpl(attributes, virtualHost)
{
SelfValidatingSortedQueueEntryList _entries;
@@ -102,6 +100,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
}
@Override
+ @Test
public void testCompareTo()
{
assertTrue(_queueEntry.compareTo(_queueEntry2) > 0);
@@ -119,22 +118,23 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
}
@Override
+ @Test
public void testTraverseWithNoDeletedEntries()
{
QueueEntry current = _queueEntry2;
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry3, current);
+ assertSame("Unexpected current entry", _queueEntry3, current);
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry, current);
+ assertSame("Unexpected current entry", _queueEntry, current);
current = current.getNextValidEntry();
assertNull(current);
-
}
@Override
+ @Test
public void testTraverseWithDeletedEntries()
{
// Delete 2nd queue entry
@@ -145,7 +145,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
QueueEntry current = _queueEntry2;
current = current.getNextValidEntry();
- assertSame("Unexpected current entry",_queueEntry, current);
+ assertSame("Unexpected current entry", _queueEntry, current);
current = current.getNextValidEntry();
assertNull(current);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
index 83bc500..21e6a3a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
@@ -23,11 +23,12 @@ package org.apache.qpid.server.queue;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.server.model.Queue;
+import org.junit.Before;
+import org.apache.qpid.server.model.Queue;
public class SortedQueueTest extends AbstractQueueTestBase
{
- @Override
+ @Before
public void setUp() throws Exception
{
Map<String,Object> arguments = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org