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:15 UTC
[08/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-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
index cc2ada2..198d500 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.protocol.converter.v0_8_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.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -37,6 +39,8 @@ import java.util.List;
import java.util.Map;
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;
@@ -67,9 +71,9 @@ import org.apache.qpid.server.typedmessage.mimecontentconverter.JmsMapMessageToM
import org.apache.qpid.server.typedmessage.mimecontentconverter.JmsStreamMessageToList;
import org.apache.qpid.server.typedmessage.mimecontentconverter.ListToJmsStreamMessage;
import org.apache.qpid.server.typedmessage.mimecontentconverter.MapToJmsMapMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
+public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
{
private static final MessageAnnotations MESSAGE_MESSAGE_ANNOTATION =
new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 0));
@@ -85,13 +89,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 5));
private MessageConverter_1_0_to_v0_8 _converter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_converter = new MessageConverter_1_0_to_v0_8();
}
+ @Test
public void testAmqpValueWithNullWithTextMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -102,9 +106,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", "text/plain", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
+
}
+ @Test
public void testAmqpValueWithNullWithMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -115,9 +123,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithObjectMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -129,11 +140,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size", getObjectBytes(null), getBytes(content));
}
+ @Test
public void testAmqpValueWithNullWithMapMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -144,12 +156,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size",
new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()),
getBytes(content));
}
+ @Test
public void testAmqpValueWithNullWithBytesMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -159,11 +174,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithStreamMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -172,10 +190,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/stream-message", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected mime type",
+ "jms/stream-message",
+ convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithUnknownMessageAnnotation() throws Exception
{
final Object expected = null;
@@ -188,9 +211,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithContentTypeApplicationOctetStream() throws Exception
{
Properties properties = new Properties();
@@ -201,10 +227,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "application/octet-stream", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected mime type",
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithObjectMessageContentType() throws Exception
{
final Properties properties = new Properties();
@@ -216,14 +247,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content size",
- getObjectBytes(null).length,
- convertedMessage.getMessageMetaData().getContentSize());
+ (long) getObjectBytes(null).length,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithNullWithJmsMapContentType() throws Exception
{
final Properties properties = new Properties();
@@ -236,13 +268,16 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size",
new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()),
getBytes(content));
}
+ @Test
public void testAmqpValueWithNull() throws Exception
{
final Object expected = null;
@@ -252,9 +287,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testAmqpValueWithString() throws Exception
{
final String expected = "testContent";
@@ -268,6 +306,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected content", expected, new String(getBytes(content), UTF_8));
}
+ @Test
public void testAmqpValueWithStringWithTextMessageAnnotation() throws Exception
{
final String expected = "testContent";
@@ -282,6 +321,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected content", expected, new String(getBytes(content), UTF_8));
}
+ @Test
public void testAmqpValueWithMap() throws Exception
{
final Map<String, Object> originalMap = new LinkedHashMap<>();
@@ -293,17 +333,20 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
Map<String, Object> convertedMap = new JmsMapMessageToMap().toObject(getBytes(content));
- 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"));
}
+ @Test
public void testAmqpValueWithMapContainingMap() throws Exception
{
final Map<String, Object> originalMap =
@@ -318,11 +361,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
Map<String, Object> convertedMap = new AmqpMapToMapConverter().toObject(getBytes(content));
- assertEquals("Unexpected size", originalMap.size(), convertedMap.size());
- assertEquals("Unexpected binary entry", new HashMap((Map<String, Object>) originalMap.get("testMap")),
- new HashMap((Map<String, Object>) convertedMap.get("testMap")));
+ assertEquals("Unexpected size", (long) originalMap.size(), (long) convertedMap.size());
+ assertEquals("Unexpected binary entry",
+ new HashMap((Map<String, Object>) originalMap.get("testMap")),
+ new HashMap((Map<String, Object>) convertedMap.get("testMap")));
}
+ @Test
public void testAmqpValueWithMapContainingNonFieldTableCompliantEntries() throws Exception
{
final AmqpValue amqpValue = new AmqpValue(Collections.<Object, Object>singletonMap(13, 42));
@@ -339,6 +384,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testAmqpValueWithList() throws Exception
{
final List<Object> originalList = new ArrayList<>();
@@ -350,17 +396,20 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/stream-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/stream-message",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
List<Object> convertedList = new JmsStreamMessageToList().toObject(getBytes(content));
- 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));
}
+ @Test
public void testAmqpValueWithListContainingMap() throws Exception
{
final List<Object> originalList = Collections.singletonList(Collections.singletonMap("testKey", "testValue"));
@@ -373,11 +422,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
- assertEquals("Unexpected size", originalList.size(), convertedList.size());
- assertEquals("Unexpected map item", new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)));
+ assertEquals("Unexpected size", (long) originalList.size(), (long) convertedList.size());
+ assertEquals("Unexpected map item",
+ new HashMap<String, Object>((Map) originalList.get(0)),
+ new HashMap<String, Object>((Map) convertedList.get(0)));
}
+ @Test
public void testAmqpValueWithListContainingUnsupportedType() throws Exception
{
final List<Object> originalList = Collections.singletonList(new Source());
@@ -395,6 +446,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testAmqpValueWithUnsupportedType() throws Exception
{
final Integer originalValue = 42;
@@ -412,6 +464,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testAmqpSequenceWithSimpleTypes() throws Exception
{
final List<Integer> expected = new ArrayList<>();
@@ -422,11 +475,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/stream-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/stream-message",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("Unexpected content", expected, new JmsStreamMessageToList().toObject(getBytes(content)));
}
+ @Test
public void testAmqpSequenceWithMap() throws Exception
{
final List<Object> originalList = Collections.singletonList(Collections.singletonMap("testKey", "testValue"));
@@ -439,11 +495,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
- assertEquals("Unexpected size", originalList.size(), convertedList.size());
- assertEquals("Unexpected map item", new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)));
+ assertEquals("Unexpected size", (long) originalList.size(), (long) convertedList.size());
+ assertEquals("Unexpected map item",
+ new HashMap<String, Object>((Map) originalList.get(0)),
+ new HashMap<String, Object>((Map) convertedList.get(0)));
}
+ @Test
public void testAmqpSequenceWithUnsupportedType() throws Exception
{
final List<Object> originalList = Collections.singletonList(new Source());
@@ -461,11 +519,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testDataWithMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), MESSAGE_MESSAGE_ANNOTATION, "application/octet-stream");
}
+ @Test
public void testDataWithObjectMessageAnnotation() throws Exception
{
byte[] bytes = "helloworld".getBytes(UTF_8);
@@ -473,6 +533,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
doTestDataWithAnnotation(expected, OBJECT_MESSAGE_MESSAGE_ANNOTATION, "application/java-object-stream");
}
+ @Test
public void testDataWithMapMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -480,6 +541,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
"application/octet-stream");
}
+ @Test
public void testDataWithMapMessageAnnotationAndContentTypeJmsMapMessage() throws Exception
{
Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
@@ -494,12 +556,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", data, getBytes(content));
}
+ @Test
public void testDataWithMapMessageAnnotationAndContentTypeAmqpMap() throws Exception
{
Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
@@ -514,12 +576,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", data, getBytes(content));
}
+ @Test
public void testDataWithBytesMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -527,12 +589,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
"application/octet-stream");
}
+ @Test
public void testDataWithStreamMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), STREAM_MESSAGE_MESSAGE_ANNOTATION,
"application/octet-stream");
}
+ @Test
public void testDataWithStreamMessageAnnotationAndContentTypeJmsStreamMessage() throws Exception
{
List<Object> originalList = Collections.singletonList("testValue");
@@ -547,12 +611,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", data, getBytes(content));
}
+ @Test
public void testDataWithStreamMessageAnnotationAndContentTypeAmqpList() throws Exception
{
List<Object> originalList = Collections.singletonList("testValue");
@@ -567,17 +631,18 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", data, getBytes(content));
}
+ @Test
public void testDataWithTextMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), TEXT_MESSAGE_MESSAGE_ANNOTATION, "text/plain");
}
+ @Test
public void testDataWithUnsupportedMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
@@ -586,46 +651,55 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
"application/octet-stream");
}
+ @Test
public void testDataWithContentTypeText() throws Exception
{
doTestConvertOfDataSectionForTextualType("text/foobar");
}
+ @Test
public void testDataWithContentTypeApplicationXml() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/xml");
}
+ @Test
public void testDataWithContentTypeApplicationXmlDtd() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/xml-dtd");
}
+ @Test
public void testDataWithContentTypeApplicationFooXml() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/foo+xml");
}
+ @Test
public void testDataWithContentTypeApplicationJson() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/json");
}
+ @Test
public void testDataWithContentTypeApplicationFooJson() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/foo+json");
}
+ @Test
public void testDataWithContentTypeApplicationJavascript() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/javascript");
}
+ @Test
public void testDataWithContentTypeApplicationEcmascript() throws Exception
{
doTestConvertOfDataSectionForTextualType("application/ecmascript");
}
+ @Test
public void testDataWithContentTypeAmqpMap() throws Exception
{
Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
@@ -643,6 +717,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
assertArrayEquals("Unexpected content", bytes, getBytes(content));
}
+ @Test
public void testDataWithContentTypeJmsMapMessage() throws Exception
{
Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
@@ -655,11 +730,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", bytes, getBytes(content));
}
+ @Test
public void testDataWithContentTypeAmqpList() throws Exception
{
List<Object> originalMap = Collections.singletonList("testValue");
@@ -677,6 +755,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
assertArrayEquals("Unexpected content", bytes, getBytes(content));
}
+ @Test
public void testDataWithContentTypeJmsStreamMessage() throws Exception
{
List<Object> originalMap = Collections.singletonList("testValue");
@@ -689,11 +768,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/stream-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/stream-message",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", bytes, getBytes(content));
}
+ @Test
public void testDataWithContentTypeJavaSerializedObject() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
@@ -705,13 +787,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", expected, getBytes(content));
}
+ @Test
public void testDataWithContentTypeJavaObjectStream() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
@@ -723,12 +806,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", expected, getBytes(content));
}
+ @Test
public void testDataWithContentTypeOther() throws Exception
{
final byte[] expected = "helloworld".getBytes(UTF_8);
@@ -740,12 +824,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", expected, getBytes(content));
}
+ @Test
public void testData() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
@@ -755,12 +840,13 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals("Unexpected content", expected, getBytes(content));
}
+ @Test
public void testNoBodyWithMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(MESSAGE_MESSAGE_ANNOTATION, null);
@@ -768,9 +854,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithObjectMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -780,11 +869,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size", getObjectBytes(null), getBytes(content));
}
+ @Test
public void testNoBodyWithMapMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -793,12 +883,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size",
new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()),
getBytes(content));
}
+ @Test
public void testNoBodyWithBytesMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -806,21 +899,29 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/octet-stream",
- convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ "application/octet-stream",
+ convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithStreamMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "jms/stream-message", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected mime type",
+ "jms/stream-message",
+ convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithTextMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage = createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, null);
@@ -828,9 +929,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", "text/plain", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithUnknownMessageAnnotation() throws Exception
{
Message_1_0 sourceMessage =
@@ -840,9 +944,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBody() throws Exception
{
final Message_1_0 sourceMessage = createTestMessage(null);
@@ -850,9 +957,12 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type", null, convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithContentTypeApplicationOctetStream() throws Exception
{
Properties properties = new Properties();
@@ -861,10 +971,14 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type", "application/octet-stream", convertedMessage.getMessageHeader().getMimeType());
- assertEquals("Unexpected content size", 0, convertedMessage.getMessageMetaData().getContentSize());
+ assertEquals("Unexpected mime type", "application/octet-stream", convertedMessage.getMessageHeader()
+ .getMimeType());
+ assertEquals("Unexpected content size",
+ (long) 0,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithObjectMessageContentType() throws Exception
{
final Properties properties = new Properties();
@@ -874,14 +988,15 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content size",
- getObjectBytes(null).length,
- convertedMessage.getMessageMetaData().getContentSize());
+ (long) getObjectBytes(null).length,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
+ @Test
public void testNoBodyWithJmsMapContentType() throws Exception
{
final Properties properties = new Properties();
@@ -892,13 +1007,16 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("Unexpected mime type", "jms/map-message", convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type",
+ "jms/map-message",
+ convertedMessage.getMessageHeader().getMimeType());
assertArrayEquals("Unexpected content size",
new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()),
getBytes(content));
}
+ @Test
public void testMessageAnnotationTakesPrecedenceOverContentType() throws Exception
{
final Properties properties = new Properties();
@@ -908,11 +1026,11 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("Unexpected mime type",
- "application/java-object-stream",
- convertedMessage.getMessageHeader().getMimeType());
+ "application/java-object-stream",
+ convertedMessage.getMessageHeader().getMimeType());
assertEquals("Unexpected content size",
- getObjectBytes(null).length,
- convertedMessage.getMessageMetaData().getContentSize());
+ (long) getObjectBytes(null).length,
+ (long) convertedMessage.getMessageMetaData().getContentSize());
}
private void doTestConvertOfDataSectionForTextualType(final String contentType) throws Exception
@@ -1042,8 +1160,7 @@ public class MessageConverter_1_0_to_v0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("Unexpected mime type",
- expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected mime type", expectedMimeType, convertedMessage.getMessageHeader().getMimeType());
final QpidByteBuffer content = convertedMessage.getContent();
assertArrayEquals("Unexpected content", data, getBytes(content));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java
index f9443e0..4579083 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java
@@ -21,6 +21,11 @@
package org.apache.qpid.server.protocol.converter.v0_8_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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,6 +33,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.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.protocol.converter.MessageConversionException;
@@ -42,21 +50,21 @@ import org.apache.qpid.server.protocol.v1_0.Message_1_0;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
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_0_8_to_1_0Test extends QpidTestCase
+public class PropertyConverter_0_8_to_1_0Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_0_8_to_1_0 _messageConverter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_namedAddressSpace = mock(NamedAddressSpace.class);
_messageConverter = new MessageConverter_0_8_to_1_0();
}
+ @Test
public void testContentTypeConversion()
{
String contentType = "test-content-type";
@@ -70,6 +78,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected content type", contentType, properties.getContentType().toString());
}
+ @Test
public void testContentTypeJavaObjectStreamConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -80,10 +89,12 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("Unexpected content type",
- "application/x-java-serialized-object",
- properties.getContentType().toString());
+ "application/x-java-serialized-object",
+ properties.getContentType().toString());
+
}
+ @Test
public void testContentEncodingConversion()
{
String contentEncoding = "my-test-encoding";
@@ -97,6 +108,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected content encoding", contentEncoding, properties.getContentEncoding().toString());
}
+ @Test
public void testHeaderConversion()
{
Map<String, Object> headers = new HashMap<>();
@@ -112,6 +124,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected applicationProperties", headers, new HashMap<>(applicationProperties));
}
+ @Test
public void testHeaderConversionWhenQpidSubjectIsPresent()
{
String testSubject = "testSubject";
@@ -127,9 +140,12 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("Unexpected subject", testSubject, properties.getSubject());
Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
- assertFalse("Unexpected subject in application properties", applicationProperties.containsKey("qpid.subject"));
+ assertFalse("Unexpected subject in application properties",
+ applicationProperties.containsKey("qpid.subject"));
+
}
+ @Test
public void testPersistentDeliveryModeConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -142,6 +158,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertTrue("Unexpected durable header", header.getDurable());
}
+ @Test
public void testNonPersistentDeliveryModeConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -154,6 +171,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertFalse("Unexpected durable header", header.getDurable());
}
+ @Test
public void testPriorityConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -164,9 +182,10 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
Header header = convertedMessage.getHeaderSection().getValue();
- assertEquals("Unexpected priority", priority, header.getPriority().byteValue());
+ assertEquals("Unexpected priority", (long) priority, (long) header.getPriority().byteValue());
}
+ @Test
public void testCorrelationIdConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -180,6 +199,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected correlationId", correlationId, properties.getCorrelationId());
}
+ @Test
public void testReplyToConversionWhenBindingURLFormatIsUsed()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -194,6 +214,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected reply-to", "amq.direct/test_routing_key", properties.getReplyTo());
}
+ @Test
public void testReplyToConversionWhenBindingURLFormatIsUsed2()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -208,6 +229,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected reply-to", "amq.direct/queue_name", properties.getReplyTo());
}
+ @Test
public void testReplyToConversionWhenBindingURLFormatIsUsed3()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -222,6 +244,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected reply-to", "queue_name", properties.getReplyTo());
}
+ @Test
public void testReplyToConversionWhenBindingURLFormatIsUsed4()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -236,6 +259,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected reply-to", "test_routing_key", properties.getReplyTo());
}
+ @Test
public void testReplyToConversionWhenNonBindingURLFormatIsUsed()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -250,6 +274,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected reply-to", "test", properties.getReplyTo());
}
+ @Test
public void testExpirationConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -263,12 +288,13 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
Header header = convertedMessage.getHeaderSection().getValue();
- assertEquals("Unexpected TTL", ttl, header.getTtl().longValue());
+ assertEquals("Unexpected TTL", (long) ttl, header.getTtl().longValue());
Properties properties = convertedMessage.getPropertiesSection().getValue();
assertNull("Unexpected expiration", properties.getAbsoluteExpiryTime());
}
+ @Test
public void testMessageIdConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -282,6 +308,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, properties.getMessageId());
}
+ @Test
public void testTimestampConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -295,6 +322,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected creation timestamp", timestamp, properties.getCreationTime().getTime());
}
+ @Test
public void testArrivalTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 10000;
@@ -306,6 +334,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected creation timestamp", timestamp, properties.getCreationTime().getTime());
}
+ @Test
public void testTypeConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -319,6 +348,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected subject", type, properties.getSubject());
}
+ @Test
public void testUserIdConversion()
{
BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
@@ -332,6 +362,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
assertEquals("Unexpected user-id", userId, new String(properties.getUserId().getArray(), UTF_8));
}
+ @Test
public void testHeaderJMSXGroupIdConversion()
{
Map<String, Object> headers = new HashMap<>();
@@ -350,9 +381,10 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertFalse("Unexpected JMSXGroupID in application properties",
- applicationProperties.containsKey("JMSXGroupID"));
+ applicationProperties.containsKey("JMSXGroupID"));
}
+ @Test
public void testHeaderJMSXGroupSeqConversion()
{
Map<String, Object> headers = new HashMap<>();
@@ -367,13 +399,17 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
Properties properties = convertedMessage.getPropertiesSection().getValue();
- assertEquals("Unexpected group-sequence", testGroupSequenceNumber, properties.getGroupSequence().intValue());
+ assertEquals("Unexpected group-sequence",
+ (long) testGroupSequenceNumber,
+ (long) properties.getGroupSequence().intValue());
+
Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertFalse("Unexpected JMSXGroupSeq in application properties",
- applicationProperties.containsKey("JMSXGroupSeq"));
+ applicationProperties.containsKey("JMSXGroupSeq"));
}
+ @Test
public void testHeaderJMSXGroupSeqConversionWhenWrongType()
{
Map<String, Object> headers = new HashMap<>();
@@ -393,9 +429,11 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertTrue("JMSXGroupSeq was removed from application properties",
- applicationProperties.containsKey("JMSXGroupSeq"));
+ applicationProperties.containsKey("JMSXGroupSeq"));
+
}
+ @Test
public void testHeaderWithFiledTableValueConversionFails()
{
Map<String, Object> headers = Collections.singletonMap("mapHeader", Collections.emptyMap());
@@ -414,6 +452,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
}
}
+ @Test
public void testHeaderWithFieldArrayValueConversionFails()
{
Map<String, Object> headers = Collections.singletonMap("listHeader", Collections.emptyList());
@@ -432,6 +471,7 @@ public class PropertyConverter_0_8_to_1_0Test extends QpidTestCase
}
}
+ @Test
public void testExchangeRoutingKeyConversion()
{
final String testExchange = "testExchange";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
index 6f7e75c..5eab830 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
@@ -20,6 +20,10 @@
package org.apache.qpid.server.protocol.converter.v0_8_v1_0;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
@@ -33,6 +37,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.exchange.ExchangeDefaults;
import org.apache.qpid.server.model.Exchange;
@@ -58,22 +65,22 @@ 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_1_0_to_0_8Test extends QpidTestCase
+public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_1_0_to_v0_8 _messageConverter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_namedAddressSpace = mock(NamedAddressSpace.class);
when(_namedAddressSpace.getLocalAddress(anyString())).then(returnsFirstArg());
_messageConverter = new MessageConverter_1_0_to_v0_8();
}
+ @Test
public void testContentEncodingConversion()
{
@@ -85,9 +92,13 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected content encoding", contentEncoding, convertedProperties.getEncoding().toString());
+ assertEquals("Unexpected content encoding",
+ contentEncoding,
+ convertedProperties.getEncoding().toString());
+
}
+ @Test
public void testContentEncodingConversionWhenLengthExceeds255()
{
@@ -107,6 +118,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testApplicationPropertiesConversion()
{
Map<String, Object> properties = new HashMap<>();
@@ -122,6 +134,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected headers", properties, new HashMap<>(headers));
}
+ @Test
public void testApplicationPropertiesConversionWithUuid()
{
Map<String, Object> properties = new HashMap<>();
@@ -134,11 +147,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = FieldTable.convertToMap(convertedProperties.getHeaders());
- assertEquals("Unexpected headers size", properties.size(), headers.size());
+ assertEquals("Unexpected headers size", (long) properties.size(), (long) headers.size());
assertEquals("Unexpected headers", properties.get(key), UUID.fromString((String) headers.get(key)));
-
}
+ @Test
public void testApplicationPropertiesConversionWithDate()
{
Map<String, Object> properties = new HashMap<>();
@@ -151,11 +164,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = FieldTable.convertToMap(convertedProperties.getHeaders());
- assertEquals("Unexpected headers size", properties.size(), headers.size());
+ assertEquals("Unexpected headers size", (long) properties.size(), (long) headers.size());
assertEquals("Unexpected headers", properties.get(key), new Date((Long) headers.get(key)));
-
}
+ @Test
public void testSubjectConversion()
{
final String subject = "testSubject";
@@ -173,6 +186,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing-key", subject, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testSubjectConversionWhenSubjectExceeds255()
{
final String subject = generateLongString();
@@ -191,6 +205,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testDurableConversion()
{
final Header header = new Header();
@@ -201,10 +216,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("Unexpected deliveryMode",
- BasicContentHeaderProperties.PERSISTENT,
- convertedProperties.getDeliveryMode());
+ (long) BasicContentHeaderProperties.PERSISTENT,
+ (long) convertedProperties.getDeliveryMode());
}
+ @Test
public void testNonDurableConversion()
{
final Header header = new Header();
@@ -215,10 +231,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("Unexpected deliveryMode",
- BasicContentHeaderProperties.NON_PERSISTENT,
- convertedProperties.getDeliveryMode());
+ (long) BasicContentHeaderProperties.NON_PERSISTENT,
+ (long) convertedProperties.getDeliveryMode());
}
+ @Test
public void testPriorityConversion()
{
final Header header = new Header();
@@ -229,9 +246,10 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected priority", priority, convertedProperties.getPriority());
+ assertEquals("Unexpected priority", (long) priority, (long) convertedProperties.getPriority());
}
+ @Test
public void testCorrelationIdStringConversion()
{
final String correlationId = "testCorrelationId";
@@ -242,9 +260,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected correlationId", correlationId, convertedProperties.getCorrelationId().toString());
+ assertEquals("Unexpected correlationId",
+ correlationId,
+ convertedProperties.getCorrelationId().toString());
}
+ @Test
public void testCorrelationIdLongStringConversion()
{
final String correlationId = generateLongString();
@@ -263,6 +284,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testCorrelationIdULongConversion()
{
final UnsignedLong correlationId = UnsignedLong.valueOf(-1);
@@ -274,10 +296,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("Unexpected correlationId",
- correlationId.toString(),
- convertedProperties.getCorrelationId().toString());
+ correlationId.toString(),
+ convertedProperties.getCorrelationId().toString());
}
+ @Test
public void testCorrelationIdUUIDConversion()
{
final UUID correlationId = UUID.randomUUID();
@@ -289,10 +312,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("Unexpected correlationId",
- correlationId.toString(),
- convertedProperties.getCorrelationId().toString());
+ correlationId.toString(),
+ convertedProperties.getCorrelationId().toString());
}
+ @Test
public void testCorrelationIdBinaryConversion()
{
final String testCorrelationId = "testCorrelationId";
@@ -304,9 +328,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected correlationId", testCorrelationId, convertedProperties.getCorrelationId().toString());
+ assertEquals("Unexpected correlationId",
+ testCorrelationId,
+ convertedProperties.getCorrelationId().toString());
}
+ @Test
public void testCorrelationIdBinaryConversionWhenNotUtf8()
{
final byte[] testCorrelationId = new byte[]{(byte) 0xc3, 0x28};
@@ -319,9 +346,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertTrue("Unexpected correlationId",
- Arrays.equals(testCorrelationId, convertedProperties.getCorrelationId().getBytes()));
+ Arrays.equals(testCorrelationId, convertedProperties.getCorrelationId().getBytes()));
+
}
+ @Test
public void testReplyToConversionWhenResultExceeds255()
{
final String replyTo = generateLongString() + "/" + generateLongString();
@@ -340,6 +369,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testReplyToConversionWhenQueueIsSpecified() throws IOException
{
final String replyTo = "myTestQueue";
@@ -358,6 +388,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected reply-to", "direct:////" + replyTo, convertedProperties.getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenExchangeIsSpecified() throws IOException
{
final String replyTo = "myTestExchange";
@@ -374,9 +405,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected reply-to", "fanout://" + replyTo + "//", convertedProperties.getReplyToAsString());
+ assertEquals("Unexpected reply-to",
+ "fanout://" + replyTo + "//",
+ convertedProperties.getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecified() throws IOException
{
final String exchangeName = "testExchnageName";
@@ -395,9 +429,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected reply-to", "topic://" + exchangeName + "//?routingkey='" + routingKey + "'", convertedProperties.getReplyToAsString());
+ assertEquals("Unexpected reply-to",
+ "topic://" + exchangeName + "//?routingkey='" + routingKey + "'",
+ convertedProperties.getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecifiedAndGlobalPrefixIsUsed() throws IOException
{
final String exchangeName = "testExchnageName";
@@ -418,9 +455,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected reply-to", "topic://" + exchangeName + "//?routingkey='" + routingKey + "'", convertedProperties.getReplyToAsString());
+ assertEquals("Unexpected reply-to",
+ "topic://" + exchangeName + "//?routingkey='" + routingKey + "'",
+ convertedProperties.getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenReplyToCannotBeResolved() throws IOException
{
final String replyTo = "direct://amq.direct//test?routingkey='test'";
@@ -433,9 +473,12 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertEquals("Unexpected reply-to", "direct:////?routingkey='" + replyTo + "'", convertedProperties.getReplyToAsString());
+ assertEquals("Unexpected reply-to",
+ "direct:////?routingkey='" + replyTo + "'",
+ convertedProperties.getReplyToAsString());
}
+ @Test
public void testTTLConversion()
{
long ttl = 10000;
@@ -451,6 +494,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected expiration", expectedExpiration, convertedProperties.getExpiration());
}
+ @Test
public void testAbsoluteExpiryTimeConversion()
{
long ttl = 10000;
@@ -466,6 +510,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected expiration", expiryTime, convertedProperties.getExpiration());
}
+ @Test
public void testConversionOfAbsoluteExpiryTimeTakesPrecedenceOverTTL()
{
long ttl = 10000;
@@ -493,6 +538,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected expiration", absoluteExpiryTime, convertedProperties.getExpiration());
}
+ @Test
public void testMessageIdStringConversion()
{
final String messageId = "testMessageId";
@@ -506,6 +552,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, convertedProperties.getMessageId().toString());
}
+ @Test
public void testMessageIdLongStringConversion()
{
final String messageId = generateLongString();
@@ -519,6 +566,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertNull("Unexpected messageId", convertedProperties.getMessageId());
}
+ @Test
public void testMessageIdUUIDConversion()
{
final UUID messageId = UUID.randomUUID();
@@ -532,6 +580,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId.toString(), convertedProperties.getMessageId().toString());
}
+ @Test
public void testMessageIdUnsignedLongConversion()
{
final UnsignedLong messageId = UnsignedLong.valueOf(-1);
@@ -545,6 +594,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId.toString(), convertedProperties.getMessageId().toString());
}
+ @Test
public void testMessageIdBinaryConversion()
{
final String messageId = "testMessageId";
@@ -558,6 +608,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected messageId", messageId, convertedProperties.getMessageId().toString());
}
+ @Test
public void testMessageIdByteArrayConversion()
{
final byte[] messageId = "testMessageId".getBytes();
@@ -568,9 +619,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertTrue("Unexpected messageId", Arrays.equals(messageId, convertedProperties.getMessageId().getBytes()));
+ assertTrue("Unexpected messageId",
+ Arrays.equals(messageId, convertedProperties.getMessageId().getBytes()));
}
+ @Test
public void testMessageIdBinaryConversionWhenNonUtf8()
{
final byte[] messageId = new byte[]{(byte) 0xc3, 0x28};
@@ -581,9 +634,11 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- assertTrue("Unexpected messageId", Arrays.equals(messageId, convertedProperties.getMessageId().getBytes()));
+ assertTrue("Unexpected messageId",
+ Arrays.equals(messageId, convertedProperties.getMessageId().getBytes()));
}
+ @Test
public void testCreationTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 10000;
@@ -604,6 +659,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected timestamp", timestamp, convertedProperties.getTimestamp());
}
+ @Test
public void testArrivalTimeConversion()
{
final long arrivalTime = System.currentTimeMillis() - 10000;
@@ -615,6 +671,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected timestamp", arrivalTime, convertedProperties.getTimestamp());
}
+ @Test
public void testUserIdConversion()
{
final String userId = "test-userId";
@@ -628,6 +685,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected user-id", userId, convertedProperties.getUserIdAsString());
}
+ @Test
public void testUserIdConversionWhenLengthExceeds255()
{
final String userId = generateLongString();
@@ -641,6 +699,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertNull("Unexpected user-id", convertedProperties.getUserId());
}
+ @Test
public void testUserIdConversionWhenNonUtf8()
{
final byte[] userId = new byte[]{(byte) 0xc3, 0x28};
@@ -654,6 +713,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertTrue("Unexpected user-id", Arrays.equals(userId, convertedProperties.getUserId().getBytes()));
}
+ @Test
public void testGroupIdConversion()
{
String testGroupId = generateLongString();
@@ -668,6 +728,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected group-id", testGroupId, headers.get("JMSXGroupID"));
}
+ @Test
public void testGroupSequenceConversion()
{
int testGroupSequence = 1;
@@ -683,6 +744,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
+ @Test
public void testApplicationPropertiesConversionWhenKeyLengthExceeds255()
{
Map<String, Object> properties = Collections.singletonMap("testProperty-" + generateLongString(), "testValue");
@@ -700,6 +762,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenExchangeAndRoutingKeyIsSpecified()
{
final String testExchange = "testExchange";
@@ -722,6 +785,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testRoutingKey, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenExchangeIsSpecified()
{
final String testExchange = "testExchange";
@@ -741,6 +805,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", "", messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenExchangeIsSpecifiedAndSubjectIsSet()
{
final String testExchange = "testExchange";
@@ -762,6 +827,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testRoutingKey, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenQueueIsSpecified()
{
final String testQueue = "testQueue";
@@ -781,6 +847,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testQueue, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenGlobalAddressUnrecognized()
{
final String globalAddress = "/testQueue";
@@ -796,6 +863,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", globalAddress, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenGlobalAddressIsKnown()
{
final String globalPrefix = "/testPrefix";
@@ -818,6 +886,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", queueName, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenExchangeLengthExceeds255()
{
final String testExchange = generateLongString();
@@ -839,6 +908,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenRoutingKeyLengthExceeds255()
{
final String testExchange = "testExchange";
@@ -860,6 +930,7 @@ public class PropertyConverter_1_0_to_0_8Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenDestinationIsSpecifiedButDoesNotExists()
{
final String testDestination = "testDestination";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
index 4a71fe2..2c2e96b 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
@@ -20,17 +20,30 @@
*/
package org.apache.qpid.server.store.derby;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase;
import org.apache.qpid.server.virtualhostnode.derby.DerbyVirtualHostNode;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
public class DerbyMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase
{
+ @Before
+ @Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.DERBY)));
+ super.setUp();
+ }
@Override
protected VirtualHostNode createVirtualHostNode(String storeLocation, ConfiguredObjectFactory factory)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
index c366fb4..9c8e5cb 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
@@ -20,16 +20,22 @@
*/
package org.apache.qpid.server.store.derby;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.Map;
+import org.junit.Before;
+
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreQuotaEventsTestBase;
import org.apache.qpid.server.virtualhost.derby.DerbyVirtualHost;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
public class DerbyMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTestBase
{
@@ -43,6 +49,14 @@ public class DerbyMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTes
private static final long UNDERFULL_SIZE = (long) (OVERFULL_SIZE * 0.8);
+ @Before
+ @Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+ super.setUp();
+ }
+
@Override
protected int getNumberOfMessagesToFillStore()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
index 09b7ce1..336da71 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
@@ -28,15 +28,30 @@ import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreTestCase;
import org.apache.qpid.server.virtualhost.derby.DerbyVirtualHost;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
+import static junit.framework.TestCase.assertFalse;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+
public class DerbyMessageStoreTest extends MessageStoreTestCase
{
private String _storeLocation;
@Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.DERBY)));
+ super.setUp();
+ }
+
+ @Override
public void tearDown() throws Exception
{
try
@@ -49,6 +64,7 @@ public class DerbyMessageStoreTest extends MessageStoreTestCase
}
}
+ @Test
public void testOnDelete() throws Exception
{
File location = new File(_storeLocation);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org