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:18 UTC
[11/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-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
index 21f9d69..ebf854c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.protocol.v1_0;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,7 +31,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -38,7 +39,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import com.google.common.io.ByteStreams;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -57,9 +59,9 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotations;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
+public class MessageConverter_v1_0_to_InternalTest extends UnitTestBase
{
private static final MessageAnnotations MESSAGE_MESSAGE_ANNOTATION =
new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 0));
@@ -75,13 +77,13 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 5));
private MessageConverter_v1_0_to_Internal _converter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_converter = new MessageConverter_v1_0_to_Internal();
}
+ @Test
public void testAmqpValueWithNullWithTextMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -95,6 +97,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected mime type", "text/plain", convertedMessage.getMessageHeader().getMimeType());
}
+ @Test
public void testAmqpValueWithNullWithMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -108,6 +111,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithObjectMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -117,11 +121,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/x-java-serialized-object",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/x-java-serialized-object",
+ convertedMessage.getMessageHeader().getMimeType());
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithMapMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -134,6 +139,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithBytesMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -143,11 +149,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithStreamMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -160,6 +167,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithUnknownMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -175,6 +183,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNullWithContentType() throws Exception
{
Properties properties = new Properties();
@@ -186,12 +195,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- mimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", mimeType, convertedMessage.getMessageHeader().getMimeType());
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithNull() throws Exception
{
final Object expected = null;
@@ -204,6 +213,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertNull("Unexpected content", convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithString() throws Exception
{
final String expected = "testContent";
@@ -216,6 +226,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", expected, convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithStringWithKnownTextualContentType() throws Exception
{
Properties properties = new Properties();
@@ -227,11 +238,11 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- mimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", mimeType, convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content", expected, convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithStringWithUnknownTextualContentType() throws Exception
{
Properties properties = new Properties();
@@ -243,12 +254,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- "text/plain", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", "text/plain", convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content", expected, convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpValueWithMap() throws Exception
{
final Map<Object, Object> originalMap = new LinkedHashMap<>();
@@ -267,16 +278,19 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
Map<Object, Object> convertedMap = (Map<Object, Object>) convertedMessage.getMessageBody();
- assertEquals("Unexpected size", originalMap.size(), convertedMap.size());
+ assertEquals("Unexpected size", (long) originalMap.size(), (long) convertedMap.size());
assertArrayEquals("Unexpected binary entry", ((Binary) originalMap.get("binaryEntry")).getArray(),
(byte[]) convertedMap.get("binaryEntry"));
assertEquals("Unexpected int entry", originalMap.get("intEntry"), convertedMap.get("intEntry"));
assertEquals("Unexpected null entry", originalMap.get("nullEntry"), convertedMap.get("nullEntry"));
assertEquals("Unexpected uuid entry", originalMap.get("uuidEntry"), convertedMap.get("uuidEntry"));
assertEquals("Unexpected nonstringkey entry", originalMap.get(43), convertedMap.get(43));
- assertEquals("Unexpected map entry", new HashMap((Map) originalMap.get("mapEntry")), new HashMap((Map) convertedMap.get("mapEntry")));
+ assertEquals("Unexpected map entry",
+ new HashMap((Map) originalMap.get("mapEntry")),
+ new HashMap((Map) convertedMap.get("mapEntry")));
}
+ @Test
public void testAmqpValueWithList() throws Exception
{
final List<Object> originalList = new ArrayList<>();
@@ -292,15 +306,18 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
List<Object> convertedList = ((List<Object>) convertedMessage.getMessageBody());
- assertEquals("Unexpected size", originalList.size(), convertedList.size());
+ assertEquals("Unexpected size", (long) originalList.size(), (long) convertedList.size());
assertArrayEquals("Unexpected binary item", ((Binary) originalList.get(0)).getArray(),
(byte[]) convertedList.get(0));
assertEquals("Unexpected int item", originalList.get(1), convertedList.get(1));
assertEquals("Unexpected null item", originalList.get(2), convertedList.get(2));
- assertEquals("Unexpected map item", new HashMap((Map) originalList.get(3)), new HashMap((Map) convertedList.get(3)));
+ assertEquals("Unexpected map item",
+ new HashMap((Map) originalList.get(3)),
+ new HashMap((Map) convertedList.get(3)));
}
+ @Test
public void testAmqpValueWithAmqpType() throws Exception
{
final Date originalValue = new Date();
@@ -316,6 +333,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", originalValue, convertedMessage.getMessageBody());
}
+ @Test
public void testAmqpSequenceWithSimpleTypes() throws Exception
{
final List<Object> originalList = new ArrayList<>();
@@ -328,11 +346,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
List<Object> convertedList = ((List<Object>) convertedMessage.getMessageBody());
- assertEquals("Unexpected size", originalList.size(), convertedList.size());
+ assertEquals("Unexpected size", (long) originalList.size(), (long) convertedList.size());
assertEquals("Unexpected first item", originalList.get(0), convertedList.get(0));
assertEquals("Unexpected second item", originalList.get(1), convertedList.get(1));
}
+ @Test
public void testDataWithMessageAnnotation() throws Exception
{
final byte[] data = "helloworld".getBytes(UTF_8);
@@ -340,6 +359,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
}
+ @Test
public void testDataWithMessageAnnotationWithContentType() throws Exception
{
final byte[] data = "helloworld".getBytes(UTF_8);
@@ -347,6 +367,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
doTestDataWithAnnotation(data, MESSAGE_MESSAGE_ANNOTATION, mimeType, mimeType);
}
+ @Test
public void testDataWithObjectMessageAnnotation() throws Exception
{
byte[] bytes = "helloworld".getBytes(UTF_8);
@@ -356,6 +377,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
"application/x-java-serialized-object");
}
+ @Test
public void testDataWithObjectMessageAnnotationWithContentType() throws Exception
{
byte[] bytes = "helloworld".getBytes(UTF_8);
@@ -364,6 +386,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
doTestDataWithAnnotation(expected, OBJECT_MESSAGE_MESSAGE_ANNOTATION, mimeType, mimeType);
}
+ @Test
public void testDataWithMapMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -371,6 +394,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
null, "application/octet-stream");
}
+ @Test
public void testDataWithMapMessageAnnotationWithContentType() throws Exception
{
final String mimeType = "foor/bar";
@@ -379,6 +403,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
mimeType, mimeType);
}
+ @Test
public void testDataWithBytesMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -386,6 +411,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
null, "application/octet-stream");
}
+ @Test
public void testDataWithBytesMessageAnnotationWithContentType() throws Exception
{
final String mimeType = "foo/bar";
@@ -394,12 +420,14 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
mimeType, mimeType);
}
+ @Test
public void testDataWithStreamMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), STREAM_MESSAGE_MESSAGE_ANNOTATION,
null, "application/octet-stream");
}
+ @Test
public void testDataWithStreamMessageAnnotationWithContentType() throws Exception
{
final String mimeType = "foo/bar";
@@ -407,16 +435,19 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
mimeType, mimeType);
}
+ @Test
public void testDataWithTextMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), TEXT_MESSAGE_MESSAGE_ANNOTATION, null, "application/octet-stream");
}
+ @Test
public void testDataWithTextMessageAnnotationWithContentType() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), TEXT_MESSAGE_MESSAGE_ANNOTATION, "foo/bar", "foo/bar");
}
+ @Test
public void testDataWithUnsupportedMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -425,6 +456,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
null, "application/octet-stream");
}
+ @Test
public void testDataWithUnsupportedMessageAnnotationWithContentType() throws Exception
{
final String mimeType = "foo/bar";
@@ -434,6 +466,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
mimeType, mimeType);
}
+ @Test
public void testData() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
@@ -443,11 +476,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content", expected, ((byte[]) convertedMessage.getMessageBody()));
}
+ @Test
public void testNoBodyWithMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(MESSAGE_MESSAGE_ANNOTATION, null);
@@ -458,6 +492,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithObjectMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -465,11 +500,13 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/x-java-serialized-object",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/x-java-serialized-object",
+ convertedMessage.getMessageHeader().getMimeType());
+
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithMapMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -480,6 +517,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithBytesMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -487,11 +525,12 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithStreamMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -502,6 +541,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithTextMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -512,6 +552,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithTextMessageAnnotationWithKnownTextualContentType() throws Exception
{
final String mimeType = "text/foo";
@@ -526,6 +567,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithTextMessageAnnotationWithUnknownTextualContentType() throws Exception
{
final String mimeType = "foo/bar";
@@ -540,6 +582,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
}
+ @Test
public void testNoBodyWithUnknownMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage =
@@ -552,6 +595,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithUnknownMessageAnnotationWithContentType() throws Exception
{
@@ -568,6 +612,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBody() throws Exception
{
final Message_1_0 sourceMessage = createTestMessage(null);
@@ -578,6 +623,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testNoBodyWithContentTypeApplicationOctetStream() throws Exception
{
final String mimeType = "foo/bar";
@@ -591,6 +637,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
+ @Test
public void testMessageAnnotationTakesPrecedenceOverContentType() throws Exception
{
final Properties properties = new Properties();
@@ -600,8 +647,8 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/x-java-serialized-object",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/x-java-serialized-object",
+ convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content", null, convertedMessage.getMessageBody());
}
@@ -717,8 +764,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
final InternalMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content", data, ((byte[]) convertedMessage.getMessageBody()));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
index 726adc9..4963dd1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
@@ -22,6 +22,11 @@ package org.apache.qpid.server.protocol.v1_0;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -35,6 +40,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
@@ -46,21 +54,21 @@ import org.apache.qpid.server.protocol.v1_0.type.Binary;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
+public class PropertyConverter_Internal_to_v1_0Test extends UnitTestBase
{
private MessageConverter_Internal_to_v1_0 _messageConverter;
private NamedAddressSpace _addressSpace;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_messageConverter = new MessageConverter_Internal_to_v1_0();
_addressSpace = mock(NamedAddressSpace.class);
}
+ @Test
public void testDurableTrueConversion()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -70,9 +78,10 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertTrue("Unexpected persistence of message", convertedMessage.isPersistent());
assertTrue("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testDurableFalseConversion()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -82,9 +91,10 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertFalse("Unexpected persistence of message", convertedMessage.isPersistent());
assertFalse("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testPriorityConversion()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -94,9 +104,13 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
Message_1_0 convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected priority", priority, convertedMessage.getMessageHeader().getPriority());
+ assertEquals("Unexpected priority",
+ (long) priority,
+ (long) convertedMessage.getMessageHeader().getPriority());
+
}
+ @Test
public void testExpirationConversion() throws InterruptedException
{
long ttl = 10000;
@@ -112,6 +126,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected TTL", expiryTime - originalMessage.getArrivalTime(), convertedTtl.longValue());
}
+ @Test
public void testContentEncodingConversion()
{
String contentEncoding = "my-test-encoding";
@@ -125,6 +140,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected content encoding", contentEncoding, convertedContentEncoding.toString());
}
+ @Test
public void testMessageIdStringConversion()
{
final String messageId = "testMessageId";
@@ -138,6 +154,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, convertedMessageId);
}
+ @Test
public void testMessageIdUuidConversion()
{
final UUID messageId = UUID.randomUUID();
@@ -151,6 +168,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, convertedMessageId);
}
+ @Test
public void testMessageIdUnsignedLongConversion()
{
final UnsignedLong messageId = UnsignedLong.valueOf(-1L);
@@ -164,6 +182,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, convertedMessageId);
}
+ @Test
public void testCorrelationIdStringConversion()
{
final String correlationId = "testCorrelationId";
@@ -177,6 +196,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected messageId", correlationId, convertedCorrelationId);
}
+ @Test
public void testCorrelationIdUuidConversion()
{
final UUID correlationId = UUID.randomUUID();
@@ -190,6 +210,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected correlationId", correlationId, convertedCorrelationId);
}
+ @Test
public void testCorrelationIdUnsignedLongConversion()
{
final UnsignedLong correlationId = UnsignedLong.valueOf(-1L);
@@ -203,6 +224,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected correlationId", correlationId, convertedCorrelationId);
}
+ @Test
public void testUserIdConversion()
{
final String userId = "testUserId";
@@ -216,6 +238,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertTrue("Unexpected userId", Arrays.equals(userId.getBytes(UTF_8), convertedUserId.getArray()));
}
+ @Test
public void testReplyToConversion()
{
final String replyTo = "amq.direct/test";
@@ -229,6 +252,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected replyTo", replyTo, convertedReplyTo);
}
+ @Test
public void testToConversion() throws IOException
{
final String to = "amq.direct/test";
@@ -239,6 +263,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected to", to, convertedMessage.getTo());
}
+ @Test
public void testTimestampConversion()
{
final long timestamp = System.currentTimeMillis();
@@ -253,6 +278,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected timestamp", timestamp, creationTime.getTime());
}
+ @Test
public void testHeadersConversion()
{
final Map<String, Object> properties = new HashMap<>();
@@ -273,6 +299,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
assertEquals("Unexpected application properties", properties, new HashMap<>(convertedHeaders));
}
+ @Test
public void testHeadersConversionWithNonSimpleTypes()
{
final Map<String, Object> properties = Collections.singletonMap("listProperty", Collections.emptyList());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java
index cbb6dac..fd7e034 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java
@@ -22,6 +22,9 @@ package org.apache.qpid.server.protocol.v1_0;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,6 +34,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -48,21 +54,21 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotations;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
+public class PropertyConverter_v1_0_to_InternalTest extends UnitTestBase
{
private MessageConverter_v1_0_to_Internal _messageConverter;
private NamedAddressSpace _addressSpace;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_messageConverter = new MessageConverter_v1_0_to_Internal();
_addressSpace = mock(NamedAddressSpace.class);
}
+ @Test
public void testDurableTrueConversion()
{
final Header header = new Header();
@@ -73,9 +79,10 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertTrue("Unexpected persistence of message", convertedMessage.isPersistent());
assertTrue("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testDurableFalseConversion()
{
final Header header = new Header();
@@ -86,9 +93,10 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertFalse("Unexpected persistence of message", convertedMessage.isPersistent());
assertFalse("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testPriorityConversion()
{
final byte priority = 7;
@@ -98,9 +106,13 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected priority", priority, convertedMessage.getMessageHeader().getPriority());
+ assertEquals("Unexpected priority",
+ (long) priority,
+ (long) convertedMessage.getMessageHeader().getPriority());
+
}
+ @Test
public void testAbsoluteExpiryTimeConversion()
{
long ttl = 10000;
@@ -112,9 +124,10 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected expiration", 0, convertedMessage.getMessageHeader().getExpiration());
+ assertEquals("Unexpected expiration", (long) 0, convertedMessage.getMessageHeader().getExpiration());
}
+ @Test
public void testTTLConversion()
{
long ttl = 10000;
@@ -130,6 +143,7 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected expiration", expiryTime, convertedMessage.getMessageHeader().getExpiration());
}
+ @Test
public void testContentEncodingConversion()
{
String contentEncoding = "my-test-encoding";
@@ -139,9 +153,13 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected content encoding", contentEncoding, convertedMessage.getMessageHeader().getEncoding());
+ assertEquals("Unexpected content encoding",
+ contentEncoding,
+ convertedMessage.getMessageHeader().getEncoding());
+
}
+ @Test
public void testMessageIdStringConversion()
{
final String messageId = "testMessageId";
@@ -151,11 +169,10 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected messageId",
- messageId,
- convertedMessage.getMessageHeader().getMessageId());
+ assertEquals("Unexpected messageId", messageId, convertedMessage.getMessageHeader().getMessageId());
}
+ @Test
public void testMessageIdUuidConversion()
{
final UUID messageId = UUID.randomUUID();
@@ -166,10 +183,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected messageId",
- messageId.toString(),
- convertedMessage.getMessageHeader().getMessageId());
+ messageId.toString(),
+ convertedMessage.getMessageHeader().getMessageId());
}
+ @Test
public void testMessageIdUnsignedLongConversion()
{
final UnsignedLong messageId = UnsignedLong.valueOf(-1L);
@@ -180,10 +198,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected messageId",
- messageId.toString(),
- convertedMessage.getMessageHeader().getMessageId());
+ messageId.toString(),
+ convertedMessage.getMessageHeader().getMessageId());
}
+ @Test
public void testMessageIdBinaryConversion()
{
final byte[] data = new byte[]{(byte) 0xc3, 0x28};
@@ -194,9 +213,12 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected messageId", messageId.toString(), convertedMessage.getMessageHeader().getMessageId());
+ assertEquals("Unexpected messageId",
+ messageId.toString(),
+ convertedMessage.getMessageHeader().getMessageId());
}
+ @Test
public void testCorrelationIdStringConversion()
{
final String correlationId = "testMessageCorrelationId";
@@ -207,10 +229,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected correlationId",
- correlationId,
- convertedMessage.getMessageHeader().getCorrelationId());
+ correlationId,
+ convertedMessage.getMessageHeader().getCorrelationId());
}
+ @Test
public void testCorrelationIdUuidConversion()
{
final UUID correlationId = UUID.randomUUID();
@@ -221,10 +244,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected correlationId",
- correlationId.toString(),
- convertedMessage.getMessageHeader().getCorrelationId());
+ correlationId.toString(),
+ convertedMessage.getMessageHeader().getCorrelationId());
}
+ @Test
public void testCorrelationIdUnsignedLongConversion()
{
final UnsignedLong correlationId = UnsignedLong.valueOf(-1L);
@@ -235,10 +259,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected correlationId",
- correlationId.toString(),
- convertedMessage.getMessageHeader().getCorrelationId());
+ correlationId.toString(),
+ convertedMessage.getMessageHeader().getCorrelationId());
}
+ @Test
public void testCorrelationIdBinaryConversion()
{
final byte[] data = new byte[]{(byte) 0xc3, 0x28};
@@ -250,10 +275,11 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected correlationId",
- correlationId.toString(),
- convertedMessage.getMessageHeader().getCorrelationId());
+ correlationId.toString(),
+ convertedMessage.getMessageHeader().getCorrelationId());
}
+ @Test
public void testUserIdConversion()
{
final byte[] data = new byte[]{(byte) 0xc3, 0x28};
@@ -264,9 +290,12 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected userId", new String(data, UTF_8), convertedMessage.getMessageHeader().getUserId());
+ assertEquals("Unexpected userId",
+ new String(data, UTF_8),
+ convertedMessage.getMessageHeader().getUserId());
}
+ @Test
public void testReplyToConversion()
{
final String replyTo = "amq.direct/test";
@@ -279,6 +308,7 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected replyTo", replyTo, convertedMessage.getMessageHeader().getReplyTo());
}
+ @Test
public void testCreationTimeConversion()
{
final long creationTime = System.currentTimeMillis();
@@ -291,6 +321,7 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected timestamp", creationTime, convertedMessage.getMessageHeader().getTimestamp());
}
+ @Test
public void testToConversionIntoToAndInitialRoutingAddressWhenToIncludesExchangeNameAndRoutingKey()
{
final String exchangeName = "amq.direct";
@@ -306,6 +337,7 @@ public class PropertyConverter_v1_0_to_InternalTest extends QpidTestCase
assertEquals("Unexpected initialRoutingAddress", "", convertedMessage.getInitialRoutingAddress());
}
+ @Test
public void testApplicationPropertiesConversion()
{
Map<String, Object> properties = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index 6876e22..262838a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v1_0;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
@@ -30,17 +32,16 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
import java.security.Principal;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -76,9 +77,9 @@ import org.apache.qpid.server.transport.ByteBufferSender;
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.virtualhost.ConnectionEstablishmentPolicy;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ProtocolEngine_1_0_0Test extends QpidTestCase
+public class ProtocolEngine_1_0_0Test extends UnitTestBase
{
private AMQPConnection_1_0Impl _protocolEngine_1_0_0;
private ServerNetworkConnection _networkConnection;
@@ -89,10 +90,9 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
private AMQPConnection _connection;
private VirtualHost<?> _virtualHost;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_networkConnection = mock(ServerNetworkConnection.class);
when(_networkConnection.getLocalAddress()).thenReturn(new InetSocketAddress(0));
_broker = mock(Broker.class);
@@ -183,6 +183,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
});
}
+ @Test
public void testProtocolEngineWithNoSaslNonTLSandAnon() throws Exception
{
final Map<String, Object> attrs = Collections.singletonMap(ConfiguredObject.NAME, getTestName());
@@ -203,10 +204,13 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
verify(_virtualHost).registerConnection(any(AMQPConnection.class), any(ConnectionEstablishmentPolicy.class));
AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getAuthorizedPrincipal();
assertNotNull(principal);
- assertEquals(principal, new AuthenticatedPrincipal(anonymousAuthenticationManager.getAnonymousPrincipal()));
+ assertEquals(principal,
+ new AuthenticatedPrincipal(anonymousAuthenticationManager.getAnonymousPrincipal()));
+
}
+ @Test
public void testProtocolEngineWithNoSaslNonTLSandNoAnon() throws Exception
{
allowMechanisms("foo");
@@ -224,6 +228,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
}
+ @Test
public void testProtocolEngineWithNoSaslTLSandExternal() throws Exception
{
final Principal principal = () -> "test";
@@ -244,6 +249,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
assertEquals(authPrincipal, new AuthenticatedPrincipal(principal));
}
+ @Test
public void testProtocolEngineWithSaslNonTLSandAnon() throws Exception
{
final Map<String, Object> attrs = Collections.singletonMap(ConfiguredObject.NAME, getTestName());
@@ -273,7 +279,8 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
verify(_virtualHost).registerConnection(any(AMQPConnection.class), any(ConnectionEstablishmentPolicy.class));
AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getAuthorizedPrincipal();
assertNotNull(principal);
- assertEquals(principal, new AuthenticatedPrincipal(anonymousAuthenticationManager.getAnonymousPrincipal()));
+ assertEquals(principal,
+ new AuthenticatedPrincipal(anonymousAuthenticationManager.getAnonymousPrincipal()));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
index b5ba0aa..83bf658 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
@@ -21,6 +21,9 @@
package org.apache.qpid.server.protocol.v1_0;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -40,6 +43,9 @@ import javax.security.auth.Subject;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -78,9 +84,9 @@ import org.apache.qpid.server.queue.QueueConsumer;
import org.apache.qpid.server.transport.AggregateTicker;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class Session_1_0Test extends QpidTestCase
+public class Session_1_0Test extends UnitTestBase
{
private static final AMQPDescribedTypeRegistry DESCRIBED_TYPE_REGISTRY = AMQPDescribedTypeRegistry.newInstance()
.registerTransportLayer()
@@ -100,27 +106,26 @@ public class Session_1_0Test extends QpidTestCase
private int _handle;
private CurrentThreadTaskExecutor _taskExecutor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
Map<String, Object> virtualHostAttributes = new HashMap<>();
virtualHostAttributes.put(QueueManagingVirtualHost.NAME, "testVH");
virtualHostAttributes.put(QueueManagingVirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
- _virtualHost = BrokerTestHelper.createVirtualHost(virtualHostAttributes);
+ _virtualHost = BrokerTestHelper.createVirtualHost(virtualHostAttributes, this);
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
_connection = createAmqpConnection_1_0("testContainerId");
this._session = createSession_1_0(_connection, 0);
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
_taskExecutor.stop();
- super.tearDown();
}
+ @Test
public void testReceiveAttachTopicNonDurableNoContainer() throws Exception
{
final String linkName = "testLink";
@@ -133,6 +138,7 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(TOPIC_NAME, LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS);
}
+ @Test
public void testReceiveAttachTopicNonDurableWithContainer() throws Exception
{
final String linkName = "testLink";
@@ -145,6 +151,7 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(TOPIC_NAME, LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS);
}
+ @Test
public void testReceiveAttachTopicDurableNoContainer() throws Exception
{
final String linkName = "testLink";
@@ -157,6 +164,7 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(TOPIC_NAME, LifetimePolicy.PERMANENT);
}
+ @Test
public void testReceiveAttachTopicDurableWithContainer() throws Exception
{
final String linkName = "testLink";
@@ -175,9 +183,15 @@ public class Session_1_0Test extends QpidTestCase
assertAttachSent(secondConnection, secondSession, attach2);
Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after second subscription with the same subscription name but different container id ", 2, queues.size());
+ assertEquals(
+ "Unexpected number of queues after second subscription with the same subscription name but different "
+ + "container id ",
+ (long) 2,
+ (long) queues.size());
+
}
+ @Test
public void testReceiveAttachSharedTopicNonDurableNoContainer() throws Exception
{
final String linkName = "testLink";
@@ -199,13 +213,14 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(TOPIC_NAME, LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS);
final Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after attach", 1, queues.size());
+ assertEquals("Unexpected number of queues after attach", (long) 1, (long) queues.size());
Queue<?> queue = queues.iterator().next();
Collection<QueueConsumer<?,?>> consumers = queue.getConsumers();
- assertEquals("Unexpected number of consumers", 2, consumers.size());
+ assertEquals("Unexpected number of consumers", (long) 2, (long) consumers.size());
}
+ @Test
public void testReceiveAttachSharedTopicNonDurableWithContainer() throws Exception
{
final String linkName = "testLink";
@@ -226,15 +241,18 @@ public class Session_1_0Test extends QpidTestCase
assertAttachSent(secondConnection, secondSession, attach2);
final Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after attach", 2, queues.size());
+ assertEquals("Unexpected number of queues after attach", (long) 2, (long) queues.size());
for (Queue<?> queue : queues)
{
Collection<QueueConsumer<?,?>> consumers = queue.getConsumers();
- assertEquals("Unexpected number of consumers on queue " + queue.getName(), 1, consumers.size());
+ assertEquals("Unexpected number of consumers on queue " + queue.getName(),
+ (long) 1,
+ (long) consumers.size());
}
}
+ @Test
public void testSeparateSubscriptionNameSpaces() throws Exception
{
AMQPConnection_1_0 secondConnection = createAmqpConnection_1_0();
@@ -248,52 +266,65 @@ public class Session_1_0Test extends QpidTestCase
assertAttachSent(_connection, _session, durableSharedWithContainerId, 0);
Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 1, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId", (long) 1, (long)
+ queues.size());
Attach durableNonSharedWithContainerId = createTopicAttach(true, linkName, address, false);
_session.receiveAttach(durableNonSharedWithContainerId);
assertAttachFailed(_connection, _session, durableNonSharedWithContainerId, 1);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 1, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 1,
+ (long) queues.size());
Attach nonDurableSharedWithContainerId = createSharedTopicAttach(false, linkName + "|3", address, false);
_session.receiveAttach(nonDurableSharedWithContainerId);
assertAttachSent(_connection, _session, nonDurableSharedWithContainerId, 3);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 2, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 2,
+ (long) queues.size());
Attach durableSharedWithoutContainerId = createSharedTopicAttach(true, linkName + "|4", address, true);
secondSession.receiveAttach(durableSharedWithoutContainerId);
assertAttachSent(secondConnection, secondSession, durableSharedWithoutContainerId, 0);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 3, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 3,
+ (long) queues.size());
Attach nonDurableSharedWithoutContainerId = createSharedTopicAttach(false, linkName + "|5", address, true);
secondSession.receiveAttach(nonDurableSharedWithoutContainerId);
assertAttachSent(secondConnection, secondSession, nonDurableSharedWithoutContainerId, 1);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 4, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 4,
+ (long) queues.size());
Attach nonDurableNonSharedWithoutContainerId = createTopicAttach(false, linkName + "|6", address, true);
secondSession.receiveAttach(nonDurableNonSharedWithoutContainerId);
assertAttachSent(secondConnection, secondSession, nonDurableNonSharedWithoutContainerId, 2);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 5, queues.size());
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 5,
+ (long) queues.size());
Attach nonDurableNonSharedWithContainerId = createTopicAttach(false, linkName + "|6", address, false);
_session.receiveAttach(nonDurableNonSharedWithContainerId);
assertAttachSent(_connection, _session, nonDurableNonSharedWithContainerId, 4);
queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after durable non shared with containerId", 6, queues.size());
-
+ assertEquals("Unexpected number of queues after durable non shared with containerId",
+ (long) 6,
+ (long) queues.size());
}
+ @Test
public void testReceiveAttachForInvalidUnsubscribe() throws Exception
{
final String linkName = "testLink";
@@ -306,9 +337,10 @@ public class Session_1_0Test extends QpidTestCase
assertAttachFailed(_connection, _session, unsubscribeAttach);
Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after unsubscribe", 0, queues.size());
+ assertEquals("Unexpected number of queues after unsubscribe", (long) 0, (long) queues.size());
}
+ @Test
public void testNullSourceLookup() throws Exception
{
final String linkName = "testLink";
@@ -335,12 +367,15 @@ public class Session_1_0Test extends QpidTestCase
assertNotNull("Unexpected source", sentAttach.getSource());
Source source = (Source)sentAttach.getSource();
assertEquals("Unexpected address", address, source.getAddress());
- assertTrue("Unexpected source capabilities", Arrays.asList(source.getCapabilities()).contains(Symbol.valueOf("topic")));
+ assertTrue("Unexpected source capabilities",
+ Arrays.asList(source.getCapabilities()).contains(Symbol.valueOf("topic")));
+
Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after unsubscribe", 1, queues.size());
+ assertEquals("Unexpected number of queues after unsubscribe", (long) 1, (long) queues.size());
}
+ @Test
public void testReceiveDetachClosed() throws Exception
{
final String linkName = "testLink";
@@ -355,9 +390,10 @@ public class Session_1_0Test extends QpidTestCase
sendDetach(_session, attach.getHandle(), true);
Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after unsubscribe", 0, queues.size());
+ assertEquals("Unexpected number of queues after unsubscribe", (long) 0, (long) queues.size());
}
+ @Test
public void testReceiveAttachToExistingQueue() throws Exception
{
final String linkName = "testLink";
@@ -372,6 +408,7 @@ public class Session_1_0Test extends QpidTestCase
assertAttachActions(queue, attach);
}
+ @Test
public void testReceiveAttachToNonExistingQueue() throws Exception
{
final String linkName = "testLink";
@@ -380,6 +417,7 @@ public class Session_1_0Test extends QpidTestCase
assertAttachFailed(_connection, _session, attach);
}
+ @Test
public void testReceiveAttachRebindingQueueNoActiveLinks()
{
final String linkName = "testLink";
@@ -394,7 +432,8 @@ public class Session_1_0Test extends QpidTestCase
ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class);
verify(_connection, times(2)).sendFrame(eq(_session.getChannelId()), frameCapture.capture());
- assertTrue(frameCapture.getAllValues().get(1) instanceof Detach);
+ final boolean condition = frameCapture.getAllValues().get(1) instanceof Detach;
+ assertTrue(condition);
assertQueues(TOPIC_NAME, LifetimePolicy.PERMANENT);
@@ -408,6 +447,7 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(topicName2, LifetimePolicy.PERMANENT);
}
+ @Test
public void testReceiveReattachRebindingQueueNoActiveLinks()
{
final String linkName = "testLink";
@@ -422,7 +462,8 @@ public class Session_1_0Test extends QpidTestCase
ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class);
verify(_connection, times(2)).sendFrame(eq(_session.getChannelId()), frameCapture.capture());
- assertTrue(frameCapture.getAllValues().get(1) instanceof Detach);
+ final boolean condition = frameCapture.getAllValues().get(1) instanceof Detach;
+ assertTrue(condition);
assertQueues(TOPIC_NAME, LifetimePolicy.PERMANENT);
@@ -436,6 +477,7 @@ public class Session_1_0Test extends QpidTestCase
assertQueues(topicName2, LifetimePolicy.PERMANENT);
}
+ @Test
public void testReceiveAttachTopicNonDurableNoContainerWithInvalidSelector() throws Exception
{
final String linkName = "testLink";
@@ -447,9 +489,10 @@ public class Session_1_0Test extends QpidTestCase
assertAttachFailed(_connection, _session, attach);
final Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after attach", 0, queues.size());
+ assertEquals("Unexpected number of queues after attach", (long) 0, (long) queues.size());
}
+ @Test
public void testReceiveAttachTopicNonDurableNoContainerWithValidSelector() throws Exception
{
final String linkName = "testLink";
@@ -472,9 +515,12 @@ public class Session_1_0Test extends QpidTestCase
assertNotNull("Binding is not found", binding);
Map<String,Object> arguments = binding.getArguments();
assertNotNull("Unexpected arguments", arguments);
- assertEquals("Unexpected filter on binding", selectorExpression, arguments.get(AMQPFilterTypes.JMS_SELECTOR.toString()));
+ assertEquals("Unexpected filter on binding",
+ selectorExpression,
+ arguments.get(AMQPFilterTypes.JMS_SELECTOR.toString()));
}
+ @Test
public void testLinkStealing()
{
_virtualHost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, QUEUE_NAME));
@@ -501,11 +547,14 @@ public class Session_1_0Test extends QpidTestCase
Source source = (Source)sentAttach.getSource();
Map<Symbol, Filter> filter = source.getFilter();
assertNotNull("Filter is not set in response", filter);
- assertEquals("Unexpected filter size", 1, filter.size());
+ assertEquals("Unexpected filter size", (long) 1, (long) filter.size());
assertTrue("Selector is not found", filter.containsKey(JMS_SELECTOR_FILTER));
Filter jmsSelectorFilter = filter.get(JMS_SELECTOR_FILTER);
- assertTrue("Unexpected selector filter", jmsSelectorFilter instanceof JMSSelectorFilter);
- assertEquals("Unexpected selector", selectorExpression, ((JMSSelectorFilter) jmsSelectorFilter).getValue());
+ final boolean condition = jmsSelectorFilter instanceof JMSSelectorFilter;
+ assertTrue("Unexpected selector filter", condition);
+ assertEquals("Unexpected selector",
+ selectorExpression,
+ ((JMSSelectorFilter) jmsSelectorFilter).getValue());
}
private Binding findBinding(final String exchangeName, final String bindingName)
@@ -535,7 +584,7 @@ public class Session_1_0Test extends QpidTestCase
private void assertAttachActions(final Queue<?> queue, final Attach receivedAttach)
{
Collection<QueueConsumer<?,?>> consumers = queue.getConsumers();
- assertEquals("Unexpected consumers size", 1, consumers.size());
+ assertEquals("Unexpected consumers size", (long) 1, (long) consumers.size());
ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class);
verify(_connection).sendFrame(eq(_session.getChannelId()), frameCapture.capture());
@@ -549,7 +598,9 @@ public class Session_1_0Test extends QpidTestCase
assertEquals("Unexpected source address", receivedSource.getAddress(), sentSource.getAddress());
assertArrayEquals("Unexpected source capabilities", receivedSource.getCapabilities(), sentSource.getCapabilities());
assertEquals("Unexpected source durability", receivedSource.getDurable(), sentSource.getDurable());
- assertEquals("Unexpected source expiry policy", receivedSource.getExpiryPolicy(), sentSource.getExpiryPolicy());
+ assertEquals("Unexpected source expiry policy",
+ receivedSource.getExpiryPolicy(),
+ sentSource.getExpiryPolicy());
assertEquals("Unexpected source dynamic flag", receivedSource.getDynamic(), sentSource.getDynamic());
Target receivedTarget = (Target) receivedAttach.getTarget();
@@ -557,11 +608,13 @@ public class Session_1_0Test extends QpidTestCase
assertEquals("Unexpected target address", receivedTarget.getAddress(), sentTarget.getAddress());
assertArrayEquals("Unexpected target capabilities", receivedTarget.getCapabilities(), sentTarget.getCapabilities());
assertEquals("Unexpected target durability", receivedTarget.getDurable(), sentTarget.getDurable());
- assertEquals("Unexpected target expiry policy", receivedTarget.getExpiryPolicy(), sentTarget.getExpiryPolicy());
+ assertEquals("Unexpected target expiry policy",
+ receivedTarget.getExpiryPolicy(),
+ sentTarget.getExpiryPolicy());
assertEquals("Unexpected target dynamic flag", receivedTarget.getDynamic(), sentTarget.getDynamic());
final Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after attach", 1, queues.size());
+ assertEquals("Unexpected number of queues after attach", (long) 1, (long) queues.size());
}
private void assertDetachSent(final AMQPConnection_1_0 connection,
@@ -573,10 +626,13 @@ public class Session_1_0Test extends QpidTestCase
verify(connection, times(invocationOffset + 1)).sendFrame(eq(session.getChannelId()), frameCapture.capture());
List<FrameBody> sentFrames = frameCapture.getAllValues();
- assertTrue("unexpected Frame sent", sentFrames.get(invocationOffset) instanceof Detach);
+ final boolean condition = sentFrames.get(invocationOffset) instanceof Detach;
+ assertTrue("unexpected Frame sent", condition);
Detach sentDetach = (Detach) sentFrames.get(invocationOffset);
assertTrue("Unexpected closed state", sentDetach.getClosed());
- assertEquals("Closed with unexpected error condition", expectedError, sentDetach.getError().getCondition());
+ assertEquals("Closed with unexpected error condition",
+ expectedError,
+ sentDetach.getError().getCondition());
}
private void assertAttachSent(final AMQPConnection_1_0 connection,
@@ -610,14 +666,15 @@ public class Session_1_0Test extends QpidTestCase
private void assertQueues(final String publishingLinkName, final LifetimePolicy expectedLifetimePolicy)
{
final Collection<Queue> queues = _virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after attach", 1, queues.size());
+ assertEquals("Unexpected number of queues after attach", (long) 1, (long) queues.size());
Queue<?> queue = queues.iterator().next();
- assertEquals("Unexpected queue durability",
- expectedLifetimePolicy, queue.getLifetimePolicy());
+ assertEquals("Unexpected queue durability", expectedLifetimePolicy, queue.getLifetimePolicy());
Collection<PublishingLink> queuePublishingLinks = queue.getPublishingLinks();
- assertEquals("Unexpected number of publishing links", 1, queuePublishingLinks.size());
- assertEquals("Unexpected link name", publishingLinkName, queuePublishingLinks.iterator().next().getName());
+ assertEquals("Unexpected number of publishing links", (long) 1, (long) queuePublishingLinks.size());
+ assertEquals("Unexpected link name",
+ publishingLinkName,
+ queuePublishingLinks.iterator().next().getName());
Exchange<?> exchange = _virtualHost.getChildByName(Exchange.class, "amq.direct");
assertTrue("Binding should exist", exchange.hasBinding(publishingLinkName, queue));
@@ -629,13 +686,15 @@ public class Session_1_0Test extends QpidTestCase
verify(connection, times(invocationOffset + 2)).sendFrame(eq(session.getChannelId()), frameCapture.capture());
List<FrameBody> sentFrames = frameCapture.getAllValues();
- assertTrue("unexpected Frame sent", sentFrames.get(invocationOffset) instanceof Attach);
+ final boolean condition1 = sentFrames.get(invocationOffset) instanceof Attach;
+ assertTrue("unexpected Frame sent", condition1);
Attach sentAttach = (Attach) sentFrames.get(invocationOffset);
assertEquals("Unexpected name", attach.getName(), sentAttach.getName());
assertEquals("Unexpected role", Role.SENDER, sentAttach.getRole());
assertEquals("Unexpected source", null, sentAttach.getSource());
- assertTrue("unexpected Frame sent", sentFrames.get(invocationOffset + 1) instanceof Detach);
+ final boolean condition = sentFrames.get(invocationOffset + 1) instanceof Detach;
+ assertTrue("unexpected Frame sent", condition);
Detach sentDetach = (Detach) sentFrames.get(invocationOffset + 1);
assertTrue("Unexpected closed state", sentDetach.getClosed());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
index 7c65225..cb3029a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
@@ -20,13 +20,19 @@
package org.apache.qpid.server.protocol.v1_0.codec;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ValueHandlerTest extends QpidTestCase
+public class ValueHandlerTest extends UnitTestBase
{
private final byte[] FORMAT_CODES = {
@@ -53,14 +59,14 @@ public class ValueHandlerTest extends QpidTestCase
private ValueHandler _valueHandle;
private ValueHandler _sectionValueHandler;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_valueHandle = new ValueHandler(TYPE_REGISTRY);
_sectionValueHandler = new ValueHandler(TYPE_REGISTRY.getSectionDecoderRegistry());
}
+ @Test
public void testIncompleteValueParsingFormatCodeOnly()
{
for (byte b : FORMAT_CODES)
@@ -70,6 +76,7 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingVariableOneFormatCodeOnlyAndSize()
{
byte[] variableOne = {(byte) 0xA0, (byte) 0xA1, (byte) 0xA3};
@@ -80,6 +87,7 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingVariableFour()
{
byte[] variableFour = {(byte) 0xB0, (byte) 0xB1, (byte) 0xB3};
@@ -90,6 +98,7 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingCompoundOneOrArrayOne()
{
byte[] compoundOne = {(byte) 0xC0, (byte) 0xC1, (byte) 0xE0};
@@ -100,6 +109,7 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingCompoundFourOrArrayFour()
{
byte[] compoundFour = {(byte) 0xD0, (byte) 0xD1, (byte) 0xF0};
@@ -111,6 +121,7 @@ public class ValueHandlerTest extends QpidTestCase
}
+ @Test
public void testIncompleteValueParsingCompoundOneWhenOnlySizeAndCountSpecified()
{
byte[] compoundOne = {(byte) 0xC0, (byte) 0xC1, (byte) 0xE0};
@@ -121,6 +132,7 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingCompoundFourWhenOnlySizeAndCountSpecified()
{
byte[] compoundFour = {(byte) 0xD0, (byte) 0xD1, (byte) 0xF0};
@@ -131,24 +143,28 @@ public class ValueHandlerTest extends QpidTestCase
}
}
+ @Test
public void testIncompleteValueParsingArrayOneElementConstructor()
{
byte[] in = {(byte) 0xE0, (byte) 3, (byte) 1, 0x50};
performTest((byte) 0xE0, in);
}
+ @Test
public void testIncompleteValueParsingArrayOneElementConstructorWhenSizeIsWrong()
{
byte[] in = {(byte) 0xE0, (byte) 2, (byte) 1, 0x50, (byte) 1};
performTest((byte) 0xE0, in);
}
+ @Test
public void testIncompleteValueParsingArrayFourElementConstructor()
{
byte[] in = {(byte) 0xF0, (byte) 0, (byte) 0, (byte) 0, (byte) 2, (byte) 0, (byte) 0, (byte) 0, (byte) 1, 0x50};
performTest((byte) 0xF0, in);
}
+ @Test
public void testIncompleteSection()
{
byte[] in = { 0x00, 0x53, 0x75, (byte) 0xA0, 0x01, 0x00 };
@@ -182,8 +198,9 @@ public class ValueHandlerTest extends QpidTestCase
catch (AmqpErrorException e)
{
assertEquals(String.format("Unexpected error code for %#02x", type),
- AmqpError.DECODE_ERROR,
- e.getError().getCondition());
+ AmqpError.DECODE_ERROR,
+ e.getError().getCondition());
+
}
catch (Exception e)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java
index acb7465..c1a0d53 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java
@@ -21,10 +21,14 @@
package org.apache.qpid.server.protocol.v1_0.framing;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -34,20 +38,20 @@ import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort;
import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FrameHandlerTest extends QpidTestCase
+public class FrameHandlerTest extends UnitTestBase
{
private static final int MAX_FRAME_SIZE = 4096;
private ValueHandler _valueHandler;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_valueHandler = new ValueHandler(AMQPDescribedTypeRegistry.newInstance());
}
+ @Test
public void testSaslHeartbeat()
{
ConnectionHandler connectionHandler = mock(ConnectionHandler.class);
@@ -69,9 +73,11 @@ public class FrameHandlerTest extends QpidTestCase
Error error = errorCaptor.getValue();
assertNotNull(error);
assertEquals(ConnectionError.FRAMING_ERROR, error.getCondition());
- assertEquals("Empty (heartbeat) frames are not permitted during SASL negotiation", error.getDescription());
+ assertEquals("Empty (heartbeat) frames are not permitted during SASL negotiation",
+ error.getDescription());
}
+ @Test
public void testOversizedFrame()
{
ConnectionHandler connectionHandler = mock(ConnectionHandler.class);
@@ -95,7 +101,7 @@ public class FrameHandlerTest extends QpidTestCase
assertNotNull(error);
assertEquals(ConnectionError.FRAMING_ERROR, error.getCondition());
assertEquals(String.format("specified frame size %s larger than maximum frame header size %s",
- body.capacity(),
- MAX_FRAME_SIZE), error.getDescription());
+ body.capacity(),
+ MAX_FRAME_SIZE), error.getDescription());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java
index 06e058e..b244216 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java
@@ -20,9 +20,17 @@
package org.apache.qpid.server.protocol.v1_0.store;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Collection;
import java.util.Collections;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.protocol.v1_0.LinkDefinition;
import org.apache.qpid.server.protocol.v1_0.LinkDefinitionImpl;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
@@ -37,9 +45,9 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusDurability;
import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusExpiryPolicy;
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public abstract class LinkStoreTestCase extends QpidTestCase
+public abstract class LinkStoreTestCase extends UnitTestBase
{
private static final String ADDRESS = "amqp.direct/test";
private static final String CAPABILITY = "test.capability";
@@ -48,10 +56,9 @@ public abstract class LinkStoreTestCase extends QpidTestCase
private Source _source;
private Target _target;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_linkStore = createLinkStore();
_source = new Source();
@@ -80,13 +87,13 @@ public abstract class LinkStoreTestCase extends QpidTestCase
_target.setDurable(TerminusDurability.CONFIGURATION);
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
deleteLinkStore();
}
+ @Test
public void testOpenAndLoad() throws Exception
{
Collection<LinkDefinition<Source, Target>> links = _linkStore.openAndLoad(new LinkStoreUpdaterImpl());
@@ -111,6 +118,7 @@ public abstract class LinkStoreTestCase extends QpidTestCase
}
+ @Test
public void testClose() throws Exception
{
_linkStore.openAndLoad(new LinkStoreUpdaterImpl());
@@ -128,6 +136,7 @@ public abstract class LinkStoreTestCase extends QpidTestCase
}
}
+ @Test
public void testSaveLink() throws Exception
{
@@ -158,6 +167,7 @@ public abstract class LinkStoreTestCase extends QpidTestCase
assertEquals("Unexpected target", linkDefinition.getTarget(), recoveredLink.getTarget());
}
+ @Test
public void testDeleteLink() throws Exception
{
_linkStore.openAndLoad(new LinkStoreUpdaterImpl());
@@ -193,6 +203,7 @@ public abstract class LinkStoreTestCase extends QpidTestCase
assertEquals("Unexpected target", linkDefinition.getTarget(), recoveredLink.getTarget());
}
+ @Test
public void testDelete() throws Exception
{
_linkStore.openAndLoad(new LinkStoreUpdaterImpl());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org