You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by va...@apache.org on 2023/06/29 07:56:48 UTC
[qpid-broker-j] branch main updated: QPID-8651: [Broker-J] JUnit 5 tests refactoring for broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 (#189)
This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 7fdfb41753 QPID-8651: [Broker-J] JUnit 5 tests refactoring for broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 (#189)
7fdfb41753 is described below
commit 7fdfb41753b1b8887f6e74c89d8ef76ab3a25300
Author: Daniil Kirilyuk <da...@gmail.com>
AuthorDate: Thu Jun 29 09:56:42 2023 +0200
QPID-8651: [Broker-J] JUnit 5 tests refactoring for broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 (#189)
---
.../v0_8_v1_0/MessageConverter_0_8_to_1_0Test.java | 226 +++----
.../MessageConverter_1_0_to_v0_8Test.java | 697 ++++++++-------------
.../PropertyConverter_0_8_to_1_0Test.java | 377 +++++------
.../PropertyConverter_1_0_to_0_8Test.java | 670 ++++++++------------
4 files changed, 757 insertions(+), 1213 deletions(-)
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_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/MessageConverter_0_8_to_1_0Test.java
index 38b671d213..f9b6b9dccb 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_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/MessageConverter_0_8_to_1_0Test.java
@@ -33,15 +33,15 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -70,14 +70,15 @@ import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.typedmessage.TypedBytesContentWriter;
import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
+@SuppressWarnings({"unchecked"})
+class MessageConverter_0_8_to_1_0Test extends UnitTestBase
{
private final MessageConverter_0_8_to_1_0 _converter = new MessageConverter_0_8_to_1_0();
private final AMQPDescribedTypeRegistry _typeRegistry = AMQPDescribedTypeRegistry.newInstance()
- .registerTransportLayer()
- .registerMessagingLayer()
- .registerTransactionLayer()
- .registerSecurityLayer();
+ .registerTransportLayer()
+ .registerMessagingLayer()
+ .registerTransactionLayer()
+ .registerSecurityLayer();
private final StoredMessage<MessageMetaData> _handle = mock(StoredMessage.class);
@@ -87,7 +88,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
private final BasicContentHeaderProperties _basicContentHeaderProperties = mock(BasicContentHeaderProperties.class);
@BeforeAll
- public void setUp() throws Exception
+ void setUp()
{
when(_handle.getMetaData()).thenReturn(_metaData);
when(_metaData.getMessageHeader()).thenReturn(_header);
@@ -96,214 +97,137 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
when(_contentHeaderBody.getProperties()).thenReturn(_basicContentHeaderProperties);
}
- @Test
- public void testConvertStringMessageBody() throws Exception
- {
- doTestTextMessage("helloworld", "text/plain");
- }
-
- @Test
- public void testConvertEmptyStringMessageBody() throws Exception
- {
- doTestTextMessage(null, "text/plain");
- }
-
- @Test
- public void testConvertStringXmlMessageBody() throws Exception
- {
- doTestTextMessage("<helloworld></helloworld>", "text/xml");
- }
-
- @Test
- public void testConvertEmptyStringXmlMessageBody() throws Exception
- {
- doTestTextMessage(null, "text/xml");
- }
-
- @Test
- public void testConvertEmptyStringApplicationXmlMessageBody() throws Exception
- {
- doTestTextMessage(null, "application/xml");
- }
-
- @Test
- public void testConvertStringWithContentTypeText() throws Exception
- {
- doTestTextMessage("foo","text/foobar");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationXml() throws Exception
- {
- doTestTextMessage("<helloworld></helloworld>","application/xml");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationXmlDtd() throws Exception
- {
- doTestTextMessage("<!DOCTYPE name []>","application/xml-dtd");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationFooXml() throws Exception
- {
- doTestTextMessage("<helloworld></helloworld>","application/foo+xml");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationJson() throws Exception
- {
- doTestTextMessage("[]","application/json");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationFooJson() throws Exception
- {
- doTestTextMessage("[]","application/foo+json");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationJavascript() throws Exception
+ @CsvSource(
{
- doTestTextMessage("var foo","application/javascript");
- }
-
- @Test
- public void testConvertStringWithContentTypeApplicationEcmascript() throws Exception
+ "helloworld,text/plain", "null,text/plain", "<helloworld></helloworld>,text/xml", "null,text/xml",
+ "null,application/xml", "foo,text/foobar", "<helloworld></helloworld>,application/xml",
+ "<!DOCTYPE name []>,application/xml-dtd", "<helloworld></helloworld>,application/foo+xml",
+ "[],application/json", "[],application/foo+json", "var foo,application/javascript",
+ "var foo,application/ecmascript"
+ })
+ @ParameterizedTest
+ void convertStringMessage(final String originalContent, final String mimeType) throws Exception
{
- doTestTextMessage("var foo","application/ecmascript");
+ doTestTextMessage(originalContent, mimeType);
}
@Test
- public void testConvertBytesMessageBody() throws Exception
+ void convertBytesMessageBody() throws Exception
{
doTestBytesMessage("helloworld".getBytes(), "application/octet-stream");
}
@Test
- public void testConvertBytesMessageBodyNoContentType() throws Exception
+ void convertBytesMessageBodyNoContentType() throws Exception
{
final byte[] messageContent = "helloworld".getBytes();
- doTest(messageContent,
- null,
- DataSection.class,
- messageContent,
- null,
- null);
+ doTest(messageContent, null, DataSection.class, messageContent, null, null);
}
@Test
- public void testConvertBytesMessageBodyUnknownContentType() throws Exception
+ void convertBytesMessageBodyUnknownContentType() throws Exception
{
final byte[] messageContent = "helloworld".getBytes();
- doTest(messageContent,
- "my/bytes",
- DataSection.class,
- messageContent,
- Symbol.valueOf("my/bytes"),
- null);
+ doTest(messageContent, "my/bytes", DataSection.class, messageContent, Symbol.valueOf("my/bytes"), null);
}
-
@Test
- public void testConvertEmptyBytesMessageBody() throws Exception
+ void convertEmptyBytesMessageBody() throws Exception
{
doTestBytesMessage(new byte[0], "application/octet-stream");
}
@Test
- public void testConvertJmsStreamMessageBody() throws Exception
+ void convertJmsStreamMessageBody() throws Exception
{
- final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
+ final List<Object> expected = List.of("apple", 43, 31.42D);
final byte[] messageBytes = getJmsStreamMessageBytes(expected);
-
final String mimeType = "jms/stream-message";
+
doTestStreamMessage(messageBytes, mimeType, expected, JmsMessageTypeAnnotation.STREAM_MESSAGE.getType());
}
@Test
- public void testConvertJmsStreamMessageEmptyBody() throws Exception
+ void convertJmsStreamMessageEmptyBody() throws Exception
{
- final List<Object> expected = Collections.emptyList();
+ final List<Object> expected = List.of();
doTestStreamMessage(null, "jms/stream-message", expected, JmsMessageTypeAnnotation.STREAM_MESSAGE.getType());
}
@Test
- public void testConvertAmqpListMessageBody() throws Exception
+ void convertAmqpListMessageBody() throws Exception
{
- final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
+ final List<Object> expected = List.of("apple", 43, 31.42D);
final byte[] messageBytes = new ListToAmqpListConverter().toMimeContent(expected);
-
final String mimeType = "amqp/list";
+
doTestStreamMessage(messageBytes, mimeType, expected, JmsMessageTypeAnnotation.STREAM_MESSAGE.getType());
}
@Test
- public void testConvertAmqpListMessageBodyWithNonJmsContent() throws Exception
+ void convertAmqpListMessageBodyWithNonJmsContent() throws Exception
{
- final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D, Lists.newArrayList("nonJMSList"));
+ final List<Object> expected = List.of("apple", 43, 31.42D, List.of("nonJMSList"));
final byte[] messageBytes = new ListToAmqpListConverter().toMimeContent(expected);
-
final String mimeType = "amqp/list";
+
doTestStreamMessage(messageBytes, mimeType, expected, null);
}
@Test
- public void testConvertJmsMapMessageBody() throws Exception
+ void convertJmsMapMessageBody() throws Exception
{
- final Map<String, Object> expected = Collections.singletonMap("key", "value");
+ final Map<String, Object> expected = Map.of("key", "value");
final byte[] messageBytes = getJmsMapMessageBytes(expected);
doTestMapMessage(messageBytes, "jms/map-message", expected, JmsMessageTypeAnnotation.MAP_MESSAGE.getType());
}
@Test
- public void testConvertJmsMapMessageEmptyBody() throws Exception
+ void convertJmsMapMessageEmptyBody() throws Exception
{
- final Map<String, Object> expected = Collections.emptyMap();
+ final Map<String, Object> expected = Map.of();
doTestMapMessage(null, "jms/map-message", expected, JmsMessageTypeAnnotation.MAP_MESSAGE.getType());
}
@Test
- public void testConvertAmqpMapMessageBody() throws Exception
+ void convertAmqpMapMessageBody() throws Exception
{
- final Map<String, Object> expected = Collections.singletonMap("key", "value");
+ final Map<String, Object> expected = Map.of("key", "value");
final byte[] messageBytes = new MapToAmqpMapConverter().toMimeContent(expected);
doTestMapMessage(messageBytes, "amqp/map", expected, JmsMessageTypeAnnotation.MAP_MESSAGE.getType());
}
@Test
- public void testConvertAmqpMapMessageBodyWithNonJmsContent() throws Exception
+ void convertAmqpMapMessageBodyWithNonJmsContent() throws Exception
{
- final Map<String, Object> expected = Collections.singletonMap("key", Collections.singletonList("nonJmsList"));
+ final Map<String, Object> expected = Map.of("key", List.of("nonJmsList"));
final byte[] messageBytes = new MapToAmqpMapConverter().toMimeContent(expected);
doTestMapMessage(messageBytes, "amqp/map", expected, null);
}
@Test
- public void testConvertObjectStreamMessageBody() throws Exception
+ void convertObjectStreamMessageBody() throws Exception
{
final byte[] messageBytes = getObjectStreamMessageBytes(UUID.randomUUID());
- final byte[] expectedBytes = messageBytes;
- doTestObjectMessage(messageBytes, "application/java-object-stream", expectedBytes);
+ doTestObjectMessage(messageBytes, "application/java-object-stream", messageBytes);
}
@Test
- public void testConvertObjectStream2MessageBody() throws Exception
+ void convertObjectStream2MessageBody() throws Exception
{
final byte[] messageBytes = getObjectStreamMessageBytes(UUID.randomUUID());
- final byte[] expectedBytes = messageBytes;
- doTestObjectMessage(messageBytes, "application/x-java-serialized-object", expectedBytes);
+ doTestObjectMessage(messageBytes, "application/x-java-serialized-object", messageBytes);
}
@Test
- public void testConvertEmptyObjectStreamMessageBody() throws Exception
+ void convertEmptyObjectStreamMessageBody() throws Exception
{
final byte[] messageBytes = null;
final byte[] expectedBytes = getObjectStreamMessageBytes(messageBytes);
@@ -313,50 +237,49 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
}
@Test
- public void testConvertEmptyMessageWithoutContentType() throws Exception
+ void convertEmptyMessageWithoutContentType() throws Exception
{
doTest(null, null, AmqpValueSection.class, null, null, JmsMessageTypeAnnotation.MESSAGE.getType());
}
@Test
- public void testConvertEmptyMessageWithUnknownContentType() throws Exception
+ void convertEmptyMessageWithUnknownContentType() throws Exception
{
doTest(null, "foo/bar", DataSection.class, new byte[0], Symbol.valueOf("foo/bar"), null);
}
@Test
- public void testConvertMessageWithoutContentType() throws Exception
+ void convertMessageWithoutContentType() throws Exception
{
final byte[] expectedContent = "someContent".getBytes(UTF_8);
doTest(expectedContent, null, DataSection.class, expectedContent, null, null);
}
-
private byte[] getObjectStreamMessageBytes(final Serializable o) throws Exception
{
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos))
+ try (final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(bos))
{
oos.writeObject(o);
return bos.toByteArray();
}
}
- private byte[] getJmsStreamMessageBytes(List<Object> objects) throws Exception
+ private byte[] getJmsStreamMessageBytes(final List<Object> objects) throws Exception
{
- TypedBytesContentWriter writer = new TypedBytesContentWriter();
- for (Object o : objects)
+ final TypedBytesContentWriter writer = new TypedBytesContentWriter();
+ for (final Object o : objects)
{
writer.writeObject(o);
}
return getBytes(writer);
}
- private byte[] getJmsMapMessageBytes(Map<String, Object> map) throws Exception
+ private byte[] getJmsMapMessageBytes(final Map<String, Object> map) throws Exception
{
- TypedBytesContentWriter writer = new TypedBytesContentWriter();
+ final TypedBytesContentWriter writer = new TypedBytesContentWriter();
writer.writeIntImpl(map.size());
- for (Map.Entry<String, Object> entry : map.entrySet())
+ for (final Map.Entry<String, Object> entry : map.entrySet())
{
writer.writeNullTerminatedStringImpl(entry.getKey());
writer.writeObject(entry.getValue());
@@ -366,7 +289,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
private byte[] getBytes(final TypedBytesContentWriter writer)
{
- ByteBuffer buf = writer.getData();
+ final ByteBuffer buf = writer.getData();
final byte[] expected = new byte[buf.remaining()];
buf.get(expected);
return expected;
@@ -376,7 +299,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
final int expectedNumberOfSections)
throws Exception
{
- SectionDecoder sectionDecoder = new SectionDecoderImpl(_typeRegistry.getSectionDecoderRegistry());
+ final SectionDecoder sectionDecoder = new SectionDecoderImpl(_typeRegistry.getSectionDecoderRegistry());
final List<EncodingRetainingSection<?>> sections = sectionDecoder.parseAll(content);
assertEquals(expectedNumberOfSections, (long) sections.size(), "Unexpected number of sections");
return sections;
@@ -407,20 +330,19 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
final ArgumentCaptor<Integer> offsetCaptor = ArgumentCaptor.forClass(Integer.class);
final ArgumentCaptor<Integer> sizeCaptor = ArgumentCaptor.forClass(Integer.class);
- when(_handle.getContent(offsetCaptor.capture(),
- sizeCaptor.capture())).then(invocation -> combined.view(offsetCaptor.getValue(),
- sizeCaptor.getValue()));
+ when(_handle.getContent(offsetCaptor.capture(), sizeCaptor.capture()))
+ .then(invocation -> combined.view(offsetCaptor.getValue(), sizeCaptor.getValue()));
}
private Byte getJmsMessageTypeAnnotation(final Message_1_0 convertedMessage)
{
- MessageAnnotationsSection messageAnnotationsSection = convertedMessage.getMessageAnnotationsSection();
+ final MessageAnnotationsSection messageAnnotationsSection = convertedMessage.getMessageAnnotationsSection();
if (messageAnnotationsSection != null)
{
- Map<Symbol, Object> messageAnnotations = messageAnnotationsSection.getValue();
+ final Map<Symbol, Object> messageAnnotations = messageAnnotationsSection.getValue();
if (messageAnnotations != null)
{
- Object annotation = messageAnnotations.get(Symbol.valueOf("x-opt-jms-msg-type"));
+ final Object annotation = messageAnnotations.get(Symbol.valueOf("x-opt-jms-msg-type"));
if (annotation instanceof Byte)
{
return ((Byte) annotation);
@@ -433,7 +355,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
private void doTestTextMessage(final String originalContent, final String mimeType) throws Exception
{
final byte[] contentBytes = originalContent == null ? null : originalContent.getBytes(UTF_8);
- String expectedContent = originalContent == null ? "" : originalContent;
+ final String expectedContent = originalContent == null ? "" : originalContent;
doTest(contentBytes,
mimeType,
AmqpValueSection.class,
@@ -442,7 +364,6 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
JmsMessageTypeAnnotation.TEXT_MESSAGE.getType());
}
-
private void doTestMapMessage(final byte[] messageBytes,
final String mimeType,
final Map<String, Object> expected,
@@ -471,8 +392,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
private void doTestObjectMessage(final byte[] messageBytes,
final String mimeType,
- final byte[] expectedBytes)
- throws Exception
+ final byte[] expectedBytes) throws Exception
{
doTest(messageBytes,
mimeType,
@@ -493,8 +413,8 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
final Message_1_0 convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- List<EncodingRetainingSection<?>> sections = getEncodingRetainingSections(content, 1);
- EncodingRetainingSection<?> encodingRetainingSection = sections.get(0);
+ final List<EncodingRetainingSection<?>> sections = getEncodingRetainingSections(content, 1);
+ final EncodingRetainingSection<?> encodingRetainingSection = sections.get(0);
assertEquals(expectedBodySection, encodingRetainingSection.getClass(), "Unexpected section type");
if (expectedContent instanceof byte[])
@@ -507,7 +427,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
assertEquals(expectedContent, encodingRetainingSection.getValue(), "Unexpected content");
}
- Symbol contentType = getContentType(convertedMessage);
+ final Symbol contentType = getContentType(convertedMessage);
if (expectedContentType == null)
{
assertNull(contentType, "Content type should be null");
@@ -517,7 +437,7 @@ public class MessageConverter_0_8_to_1_0Test extends UnitTestBase
assertEquals(expectedContentType, contentType, "Unexpected content type");
}
- Byte jmsMessageTypeAnnotation = getJmsMessageTypeAnnotation(convertedMessage);
+ final Byte jmsMessageTypeAnnotation = getJmsMessageTypeAnnotation(convertedMessage);
if (expectedJmsTypeAnnotation == null)
{
assertNull(jmsMessageTypeAnnotation, "Unexpected annotation 'x-opt-jms-msg-type'");
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 64b650ef42..ab6f4aa8ca 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
@@ -24,7 +24,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -33,7 +33,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -44,6 +43,8 @@ import com.google.common.io.ByteStreams;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -76,51 +77,49 @@ import org.apache.qpid.server.typedmessage.mimecontentconverter.ListToJmsStreamM
import org.apache.qpid.server.typedmessage.mimecontentconverter.MapToJmsMapMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
+@SuppressWarnings({"rawtypes", "unchecked"})
+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));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 0));
private static final MessageAnnotations OBJECT_MESSAGE_MESSAGE_ANNOTATION =
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 1));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 1));
private static final MessageAnnotations MAP_MESSAGE_MESSAGE_ANNOTATION =
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 2));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 2));
private static final MessageAnnotations BYTE_MESSAGE_MESSAGE_ANNOTATION =
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 3));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 3));
private static final MessageAnnotations STREAM_MESSAGE_MESSAGE_ANNOTATION =
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 4));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 4));
private static final MessageAnnotations TEXT_MESSAGE_MESSAGE_ANNOTATION =
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 5));
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 5));
+ private static final String OCTET_STREAM = "application/octet-stream";
+ private static final String OBJECT_STREAM = "application/java-object-stream";
private MessageConverter_1_0_to_v0_8 _converter;
@BeforeAll
- public void setUp()
+ void setUp()
{
_converter = new MessageConverter_1_0_to_v0_8();
}
@Test
- public void testAmqpValueWithNullWithTextMessageAnnotation()
+ void amqpValueWithNullWithTextMessageAnnotation()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage =
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("text/plain", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
-
}
@Test
- public void testAmqpValueWithNullWithMessageAnnotation()
+ void amqpValueWithNullWithMessageAnnotation()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage =
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
createTestMessage(MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -128,58 +127,49 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithNullWithObjectMessageAnnotation() throws Exception
+ void amqpValueWithNullWithObjectMessageAnnotation() throws Exception
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(getObjectBytes(null), getBytes(content), "Unexpected content size");
}
@Test
- public void testAmqpValueWithNullWithMapMessageAnnotation() throws Exception
+ void amqpValueWithNullWithMapMessageAnnotation() throws Exception
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
+ createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()), getBytes(content),
+ assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Map.of()), getBytes(content),
"Unexpected content size");
}
@Test
- public void testAmqpValueWithNullWithBytesMessageAnnotation()
+ void amqpValueWithNullWithBytesMessageAnnotation()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
+ createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testAmqpValueWithNullWithStreamMessageAnnotation()
+ void amqpValueWithNullWithStreamMessageAnnotation()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
+ createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -187,15 +177,12 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithNullWithUnknownMessageAnnotation()
+ void amqpValueWithNullWithUnknownMessageAnnotation()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage =
- createTestMessage(new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"),
- (byte) 11)),
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage =
+ createTestMessage(new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 11)),
amqpValue.createEncodingRetainingSection());
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -203,65 +190,52 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithNullWithContentTypeApplicationOctetStream()
+ void amqpValueWithNullWithContentTypeApplicationOctetStream()
{
- Properties properties = new Properties();
- properties.setContentType(Symbol.valueOf("application/octet-stream"));
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
-
+ final Properties properties = new Properties();
+ properties.setContentType(Symbol.valueOf(OCTET_STREAM));
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testAmqpValueWithNullWithObjectMessageContentType() throws Exception
+ void amqpValueWithNullWithObjectMessageContentType() throws Exception
{
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("application/x-java-serialized-object"));
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
-
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(getObjectBytes(null).length, (long) convertedMessage.getMessageMetaData().getContentSize(),
"Unexpected content size");
}
@Test
- public void testAmqpValueWithNullWithJmsMapContentType() throws Exception
+ void amqpValueWithNullWithJmsMapContentType() throws Exception
{
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("jms/map-message"));
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage = createTestMessage(properties, amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
-
- assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()), getBytes(content),
+ assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Map.of()), getBytes(content),
"Unexpected content size");
}
@Test
- public void testAmqpValueWithNull()
+ void amqpValueWithNull()
{
- final Object expected = null;
- final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final AmqpValue amqpValue = new AmqpValue(null);
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -269,50 +243,46 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithString() throws Exception
+ void amqpValueWithString() throws Exception
{
final String expected = "testContent";
final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("text/plain", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expected, new String(getBytes(content), UTF_8), "Unexpected content");
}
@Test
- public void testAmqpValueWithStringWithTextMessageAnnotation() throws Exception
+ void amqpValueWithStringWithTextMessageAnnotation() throws Exception
{
final String expected = "testContent";
final AmqpValue amqpValue = new AmqpValue(expected);
- Message_1_0 sourceMessage =
+ final Message_1_0 sourceMessage =
createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, amqpValue.createEncodingRetainingSection());
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("text/plain", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expected, new String(getBytes(content), UTF_8), "Unexpected content");
}
@Test
- public void testAmqpValueWithMap() throws Exception
+ void amqpValueWithMap() throws Exception
{
final Map<String, Object> originalMap = new LinkedHashMap<>();
originalMap.put("binaryEntry", new Binary(new byte[]{0x00, (byte) 0xFF}));
originalMap.put("intEntry", 42);
originalMap.put("nullEntry", null);
final AmqpValue amqpValue = new AmqpValue(originalMap);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+ final Map<String, Object> convertedMap = new JmsMapMessageToMap().toObject(getBytes(content));
- Map<String, Object> convertedMap = new JmsMapMessageToMap().toObject(getBytes(content));
+ assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalMap.size(), (long) convertedMap.size(), "Unexpected size");
assertArrayEquals(((Binary) originalMap.get("binaryEntry")).getArray(), (byte[]) convertedMap.get("binaryEntry"),
"Unexpected binary entry");
@@ -321,20 +291,16 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithMapContainingMap() throws Exception
+ void amqpValueWithMapContainingMap() throws Exception
{
- final Map<String, Object> originalMap =
- Collections.singletonMap("testMap", Collections.singletonMap("innerKey", "testValue"));
-
+ final Map<String, Object> originalMap = Map.of("testMap", Map.of("innerKey", "testValue"));
final AmqpValue amqpValue = new AmqpValue(originalMap);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("amqp/map", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+ final Map<String, Object> convertedMap = new AmqpMapToMapConverter().toObject(getBytes(content));
- Map<String, Object> convertedMap = new AmqpMapToMapConverter().toObject(getBytes(content));
+ assertEquals("amqp/map", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalMap.size(), (long) convertedMap.size(), "Unexpected size");
assertEquals(new HashMap((Map<String, Object>) originalMap.get("testMap")),
new HashMap((Map<String, Object>) convertedMap.get("testMap")),
@@ -342,39 +308,30 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithMapContainingNonFieldTableCompliantEntries()
+ void amqpValueWithMapContainingNonFieldTableCompliantEntries()
{
- final AmqpValue amqpValue = new AmqpValue(Collections.<Object, Object>singletonMap(13, 42));
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
+ final AmqpValue amqpValue = new AmqpValue(Map.of(13, 42));
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
- try
- {
- _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- fail("expected exception not thrown.");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _converter.convert(sourceMessage, mock(NamedAddressSpace.class)),
+ "Expected exception not thrown");
}
@Test
- public void testAmqpValueWithList() throws Exception
+ void amqpValueWithList() throws Exception
{
final List<Object> originalList = new ArrayList<>();
originalList.add(new Binary(new byte[]{0x00, (byte) 0xFF}));
originalList.add(42);
originalList.add(null);
final AmqpValue amqpValue = new AmqpValue(originalList);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+ final List<Object> convertedList = new JmsStreamMessageToList().toObject(getBytes(content));
- List<Object> convertedList = new JmsStreamMessageToList().toObject(getBytes(content));
+ assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalList.size(), (long) convertedList.size(), "Unexpected size");
assertArrayEquals(((Binary) originalList.get(0)).getArray(), (byte[]) convertedList.get(0), "Unexpected binary item");
assertEquals(originalList.get(1), convertedList.get(1), "Unexpected int item");
@@ -382,18 +339,16 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithListContainingMap() throws Exception
+ void amqpValueWithListContainingMap() throws Exception
{
- final List<Object> originalList = Collections.singletonList(Collections.singletonMap("testKey", "testValue"));
+ final List<Object> originalList = List.of(Map.of("testKey", "testValue"));
final AmqpValue amqpValue = new AmqpValue(originalList);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("amqp/list", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+ final List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
- List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
+ assertEquals("amqp/list", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalList.size(), (long) convertedList.size(), "Unexpected size");
assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
new HashMap<String, Object>((Map) convertedList.get(0)),
@@ -401,71 +356,56 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpValueWithListContainingUnsupportedType()
+ void amqpValueWithListContainingUnsupportedType()
{
- final List<Object> originalList = Collections.singletonList(new Source());
+ final List<Object> originalList = List.of(new Source());
final AmqpValue amqpValue = new AmqpValue(originalList);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
- try
- {
- _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- fail("expected exception not thrown.");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _converter.convert(sourceMessage, mock(NamedAddressSpace.class)),
+ "Expected exception not thrown");
}
@Test
- public void testAmqpValueWithUnsupportedType()
+ void amqpValueWithUnsupportedType()
{
final Integer originalValue = 42;
final AmqpValue amqpValue = new AmqpValue(originalValue);
- Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
+ final Message_1_0 sourceMessage = createTestMessage(amqpValue.createEncodingRetainingSection());
- try
- {
- _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- fail("expected exception not thrown.");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _converter.convert(sourceMessage, mock(NamedAddressSpace.class)),
+ "Expected exception not thrown");
}
@Test
- public void testAmqpSequenceWithSimpleTypes() throws Exception
+ void amqpSequenceWithSimpleTypes() throws Exception
{
final List<Integer> expected = new ArrayList<>();
expected.add(37);
expected.add(42);
final AmqpSequence amqpSequence = new AmqpSequence(expected);
- Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(),
"Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expected, new JmsStreamMessageToList().toObject(getBytes(content)), "Unexpected content");
}
@Test
- public void testAmqpSequenceWithMap() throws Exception
+ void amqpSequenceWithMap() throws Exception
{
- final List<Object> originalList = Collections.singletonList(Collections.singletonMap("testKey", "testValue"));
+ final List<Object> originalList = List.of(Map.of("testKey", "testValue"));
final AmqpSequence amqpSequence = new AmqpSequence(originalList);
- Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("amqp/list", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+ final List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
- List<Object> convertedList = new AmqpListToListConverter().toObject(getBytes(content));
+ assertEquals("amqp/list", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalList.size(), (long) convertedList.size(), "Unexpected size");
assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
new HashMap<String, Object>((Map) convertedList.get(0)),
@@ -473,347 +413,272 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testAmqpSequenceWithUnsupportedType()
+ void amqpSequenceWithUnsupportedType()
{
- final List<Object> originalList = Collections.singletonList(new Source());
+ final List<Object> originalList = List.of(new Source());
final AmqpSequence amqpSequence = new AmqpSequence(originalList);
- Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
+ final Message_1_0 sourceMessage = createTestMessage(amqpSequence.createEncodingRetainingSection());
- try
- {
- _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- fail("expected exception not thrown.");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _converter.convert(sourceMessage, mock(NamedAddressSpace.class)),
+ "Expected exception not thrown");
}
@Test
- public void testDataWithMessageAnnotation() throws Exception
+ void dataWithMessageAnnotation() throws Exception
{
- doTestDataWithAnnotation("helloworld".getBytes(UTF_8), MESSAGE_MESSAGE_ANNOTATION, "application/octet-stream");
+ doTestDataWithAnnotation("helloworld".getBytes(UTF_8), MESSAGE_MESSAGE_ANNOTATION, OCTET_STREAM);
}
@Test
- public void testDataWithObjectMessageAnnotation() throws Exception
+ void dataWithObjectMessageAnnotation() throws Exception
{
- byte[] bytes = "helloworld".getBytes(UTF_8);
+ final byte[] bytes = "helloworld".getBytes(UTF_8);
final byte[] expected = getObjectBytes(bytes);
- doTestDataWithAnnotation(expected, OBJECT_MESSAGE_MESSAGE_ANNOTATION, "application/java-object-stream");
+ doTestDataWithAnnotation(expected, OBJECT_MESSAGE_MESSAGE_ANNOTATION, OBJECT_STREAM);
}
@Test
- public void testDataWithMapMessageAnnotation() throws Exception
+ void dataWithMapMessageAnnotation() throws Exception
{
- doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
- MAP_MESSAGE_MESSAGE_ANNOTATION,
- "application/octet-stream");
+ doTestDataWithAnnotation("helloworld".getBytes(UTF_8), MAP_MESSAGE_MESSAGE_ANNOTATION, OCTET_STREAM);
}
@Test
- public void testDataWithMapMessageAnnotationAndContentTypeJmsMapMessage() throws Exception
+ void dataWithMapMessageAnnotationAndContentTypeJmsMapMessage() throws Exception
{
- Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
- byte[] data = new MapToJmsMapMessage().toMimeContent(originalMap);
- String expectedMimeType = "jms/map-message";
+ final Map<String, Object> originalMap = Map.of("testKey", "testValue");
+ final byte[] data = new MapToJmsMapMessage().toMimeContent(originalMap);
+ final String expectedMimeType = "jms/map-message";
final Data value = new Data(new Binary(data));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf(expectedMimeType));
- Message_1_0 sourceMessage = createTestMessage(properties,
- MAP_MESSAGE_MESSAGE_ANNOTATION,
- value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage =
+ createTestMessage(properties, MAP_MESSAGE_MESSAGE_ANNOTATION, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expectedMimeType, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(data, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithMapMessageAnnotationAndContentTypeAmqpMap() throws Exception
+ void dataWithMapMessageAnnotationAndContentTypeAmqpMap() throws Exception
{
- Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
- byte[] data = new MapToAmqpMapConverter().toMimeContent(originalMap);
- String expectedMimeType = "amqp/map";
+ final Map<String, Object> originalMap = Map.of("testKey", "testValue");
+ final byte[] data = new MapToAmqpMapConverter().toMimeContent(originalMap);
+ final String expectedMimeType = "amqp/map";
final Data value = new Data(new Binary(data));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf(expectedMimeType));
- Message_1_0 sourceMessage = createTestMessage(properties,
- MAP_MESSAGE_MESSAGE_ANNOTATION,
- value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage =
+ createTestMessage(properties, MAP_MESSAGE_MESSAGE_ANNOTATION, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expectedMimeType, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(data, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithBytesMessageAnnotation() throws Exception
+ void dataWithBytesMessageAnnotation() throws Exception
{
- doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
- BYTE_MESSAGE_MESSAGE_ANNOTATION,
- "application/octet-stream");
+ doTestDataWithAnnotation("helloworld".getBytes(UTF_8), BYTE_MESSAGE_MESSAGE_ANNOTATION, OCTET_STREAM);
}
@Test
- public void testDataWithStreamMessageAnnotation() throws Exception
+ void dataWithStreamMessageAnnotation() throws Exception
{
- doTestDataWithAnnotation("helloworld".getBytes(UTF_8), STREAM_MESSAGE_MESSAGE_ANNOTATION,
- "application/octet-stream");
+ doTestDataWithAnnotation("helloworld".getBytes(UTF_8), STREAM_MESSAGE_MESSAGE_ANNOTATION, OCTET_STREAM);
}
@Test
- public void testDataWithStreamMessageAnnotationAndContentTypeJmsStreamMessage() throws Exception
+ void dataWithStreamMessageAnnotationAndContentTypeJmsStreamMessage() throws Exception
{
- List<Object> originalList = Collections.singletonList("testValue");
- byte[] data = new ListToJmsStreamMessage().toMimeContent(originalList);
- String expectedMimeType = "jms/stream-message";
+ final List<Object> originalList = List.of("testValue");
+ final byte[] data = new ListToJmsStreamMessage().toMimeContent(originalList);
+ final String expectedMimeType = "jms/stream-message";
final Data value = new Data(new Binary(data));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf(expectedMimeType));
- Message_1_0 sourceMessage = createTestMessage(properties,
- STREAM_MESSAGE_MESSAGE_ANNOTATION,
- value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage =
+ createTestMessage(properties, STREAM_MESSAGE_MESSAGE_ANNOTATION, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expectedMimeType, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(data, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithStreamMessageAnnotationAndContentTypeAmqpList() throws Exception
+ void dataWithStreamMessageAnnotationAndContentTypeAmqpList() throws Exception
{
- List<Object> originalList = Collections.singletonList("testValue");
- byte[] data = new ListToAmqpListConverter().toMimeContent(originalList);
- String expectedMimeType = "amqp/list";
+ final List<Object> originalList = List.of("testValue");
+ final byte[] data = new ListToAmqpListConverter().toMimeContent(originalList);
+ final String expectedMimeType = "amqp/list";
final Data value = new Data(new Binary(data));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf(expectedMimeType));
- Message_1_0 sourceMessage = createTestMessage(properties,
- STREAM_MESSAGE_MESSAGE_ANNOTATION,
- value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage =
+ createTestMessage(properties, STREAM_MESSAGE_MESSAGE_ANNOTATION, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals(expectedMimeType, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(data, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithTextMessageAnnotation() throws Exception
+ void dataWithTextMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8), TEXT_MESSAGE_MESSAGE_ANNOTATION, "text/plain");
}
@Test
- public void testDataWithUnsupportedMessageAnnotation() throws Exception
+ void dataWithUnsupportedMessageAnnotation() throws Exception
{
doTestDataWithAnnotation("helloworld".getBytes(UTF_8),
- new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"),
- (byte) 11)),
- "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");
+ new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"), (byte) 11)),
+ OCTET_STREAM);
}
- @Test
- public void testDataWithContentTypeApplicationJson() throws Exception
+ @ParameterizedTest
+ @ValueSource(strings =
{
- doTestConvertOfDataSectionForTextualType("application/json");
- }
-
- @Test
- public void testDataWithContentTypeApplicationFooJson() throws Exception
+ "text/foobar", "application/xml", "application/xml-dtd", "application/foo+xml", "application/json",
+ "application/foo+json", "application/javascript", "application/ecmascript"
+ })
+ void dataWithContentTypes(final String contentType) throws Exception
{
- doTestConvertOfDataSectionForTextualType("application/foo+json");
+ doTestConvertOfDataSectionForTextualType(contentType);
}
@Test
- public void testDataWithContentTypeApplicationJavascript() throws Exception
+ void dataWithContentTypeAmqpMap() 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");
- byte[] bytes = new MapToAmqpMapConverter().toMimeContent(originalMap);
-
+ final Map<String, Object> originalMap = Map.of("testKey", "testValue");
+ final byte[] bytes = new MapToAmqpMapConverter().toMimeContent(originalMap);
final Data value = new Data(new Binary(bytes));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("amqp/map"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("amqp/map", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(bytes, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithContentTypeJmsMapMessage() throws Exception
+ void dataWithContentTypeJmsMapMessage() throws Exception
{
- Map<String, Object> originalMap = Collections.singletonMap("testKey", "testValue");
- byte[] bytes = new MapToJmsMapMessage().toMimeContent(originalMap);
-
+ final Map<String, Object> originalMap = Map.of("testKey", "testValue");
+ final byte[] bytes = new MapToJmsMapMessage().toMimeContent(originalMap);
final Data value = new Data(new Binary(bytes));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("jms/map-message"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(bytes, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithContentTypeAmqpList() throws Exception
+ void dataWithContentTypeAmqpList() throws Exception
{
- List<Object> originalMap = Collections.singletonList("testValue");
- byte[] bytes = new ListToAmqpListConverter().toMimeContent(originalMap);
-
+ final List<Object> originalMap = List.of("testValue");
+ final byte[] bytes = new ListToAmqpListConverter().toMimeContent(originalMap);
final Data value = new Data(new Binary(bytes));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("amqp/list"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("amqp/list", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(bytes, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithContentTypeJmsStreamMessage() throws Exception
+ void dataWithContentTypeJmsStreamMessage() throws Exception
{
- List<Object> originalMap = Collections.singletonList("testValue");
- byte[] bytes = new ListToJmsStreamMessage().toMimeContent(originalMap);
-
+ final List<Object> originalMap = List.of("testValue");
+ final byte[] bytes = new ListToJmsStreamMessage().toMimeContent(originalMap);
final Data value = new Data(new Binary(bytes));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("jms/stream-message"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertArrayEquals(bytes, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithContentTypeJavaSerializedObject() throws Exception
+ void dataWithContentTypeJavaSerializedObject() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
final Data value = new Data(new Binary(expected));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("application/x-java-serialized-object"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(expected, getBytes(content), "Unexpected content");
}
-
@Test
- public void testDataWithContentTypeJavaObjectStream() throws Exception
+ void dataWithContentTypeJavaObjectStream() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
final Data value = new Data(new Binary(expected));
- Properties properties = new Properties();
- properties.setContentType(Symbol.valueOf("application/java-object-stream"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Properties properties = new Properties();
+ properties.setContentType(Symbol.valueOf(OBJECT_STREAM));
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(expected, getBytes(content), "Unexpected content");
}
@Test
- public void testDataWithContentTypeOther() throws Exception
+ void dataWithContentTypeOther() throws Exception
{
final byte[] expected = "helloworld".getBytes(UTF_8);
final Data value = new Data(new Binary(expected));
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("application/bin"));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(expected, getBytes(content), "Unexpected content");
}
@Test
- public void testData() throws Exception
+ void data() throws Exception
{
final byte[] expected = getObjectBytes("helloworld".getBytes(UTF_8));
final Data value = new Data(new Binary(expected));
final Message_1_0 sourceMessage = createTestMessage(value.createEncodingRetainingSection());
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
+
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(expected, getBytes(content), "Unexpected content");
}
@Test
- public void testNoBodyWithMessageAnnotation()
+ void noBodyWithMessageAnnotation()
{
- Message_1_0 sourceMessage = createTestMessage(MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -821,65 +686,53 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testNoBodyWithObjectMessageAnnotation() throws Exception
+ void noBodyWithObjectMessageAnnotation() throws Exception
{
- Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertArrayEquals(getObjectBytes(null), getBytes(content), "Unexpected content size");
}
@Test
- public void testNoBodyWithMapMessageAnnotation() throws Exception
+ void noBodyWithMapMessageAnnotation() throws Exception
{
- Message_1_0 sourceMessage = createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(MAP_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(),
"Unexpected mime type");
- assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()), getBytes(content),
+ assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Map.of()), getBytes(content),
"Unexpected content size");
}
@Test
- public void testNoBodyWithBytesMessageAnnotation()
+ void noBodyWithBytesMessageAnnotation()
{
- Message_1_0 sourceMessage = createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(BYTE_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
- assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(),
- "Unexpected content size");
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
+ assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testNoBodyWithStreamMessageAnnotation()
+ void noBodyWithStreamMessageAnnotation()
{
- Message_1_0 sourceMessage = createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(STREAM_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
- assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(),
- "Unexpected content size");
+ assertEquals("jms/stream-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
+ assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testNoBodyWithTextMessageAnnotation()
+ void noBodyWithTextMessageAnnotation()
{
- Message_1_0 sourceMessage = createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, null);
-
+ final Message_1_0 sourceMessage = createTestMessage(TEXT_MESSAGE_MESSAGE_ANNOTATION, null);
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertEquals("text/plain", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -887,24 +740,21 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testNoBodyWithUnknownMessageAnnotation()
+ void noBodyWithUnknownMessageAnnotation()
{
- Message_1_0 sourceMessage =
- createTestMessage(new MessageAnnotations(Collections.singletonMap(Symbol.valueOf("x-opt-jms-msg-type"),
+ final Message_1_0 sourceMessage =
+ createTestMessage(new MessageAnnotations(Map.of(Symbol.valueOf("x-opt-jms-msg-type"),
(byte) 11)), null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(),
- "Unexpected content size");
+ assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testNoBody()
+ void noBody()
{
final Message_1_0 sourceMessage = createTestMessage(null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
assertNull(convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
@@ -912,65 +762,52 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
}
@Test
- public void testNoBodyWithContentTypeApplicationOctetStream()
+ void noBodyWithContentTypeApplicationOctetStream()
{
- Properties properties = new Properties();
- properties.setContentType(Symbol.valueOf("application/octet-stream"));
+ final Properties properties = new Properties();
+ properties.setContentType(Symbol.valueOf(OCTET_STREAM));
final Message_1_0 sourceMessage = createTestMessage(properties, null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/octet-stream", convertedMessage.getMessageHeader() .getMimeType(),
- "Unexpected mime type");
- assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(),
- "Unexpected content size");
+ assertEquals(OCTET_STREAM, convertedMessage.getMessageHeader() .getMimeType(), "Unexpected mime type");
+ assertEquals(0, (long) convertedMessage.getMessageMetaData().getContentSize(), "Unexpected content size");
}
@Test
- public void testNoBodyWithObjectMessageContentType() throws Exception
+ void noBodyWithObjectMessageContentType() throws Exception
{
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("application/x-java-serialized-object"));
final Message_1_0 sourceMessage = createTestMessage(properties, null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
-
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(getObjectBytes(null).length, (long) convertedMessage.getMessageMetaData().getContentSize(),
"Unexpected content size");
}
@Test
- public void testNoBodyWithJmsMapContentType() throws Exception
+ void noBodyWithJmsMapContentType() throws Exception
{
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf("jms/map-message"));
final Message_1_0 sourceMessage = createTestMessage(properties, null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
-
- assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Collections.emptyMap()), getBytes(content),
- "Unexpected content size");
+ assertEquals("jms/map-message", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
+ assertArrayEquals(new MapToJmsMapMessage().toMimeContent(Map.of()), getBytes(content), "Unexpected content size");
}
@Test
- public void testMessageAnnotationTakesPrecedenceOverContentType() throws Exception
+ void messageAnnotationTakesPrecedenceOverContentType() throws Exception
{
final Properties properties = new Properties();
- properties.setContentType(Symbol.valueOf("application/octet-stream"));
+ properties.setContentType(Symbol.valueOf(OCTET_STREAM));
final Message_1_0 sourceMessage = createTestMessage(OBJECT_MESSAGE_MESSAGE_ANNOTATION, null);
-
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
- assertEquals("application/java-object-stream", convertedMessage.getMessageHeader().getMimeType(),
- "Unexpected mime type");
+ assertEquals(OBJECT_STREAM, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(getObjectBytes(null).length, (long) convertedMessage.getMessageMetaData().getContentSize(),
"Unexpected content size");
}
@@ -981,20 +818,18 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final Data value = new Data(new Binary(expected.getBytes(UTF_8)));
final Properties properties = new Properties();
properties.setContentType(Symbol.valueOf(contentType));
- Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(properties, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
-
final QpidByteBuffer content = convertedMessage.getContent(0, (int) convertedMessage.getSize());
- assertEquals(expected, new String(getBytes(content), UTF_8), "Unexpected content");
+ assertEquals(expected, new String(getBytes(content), UTF_8), "Unexpected content");
assertEquals("text/plain", convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
}
private byte[] getBytes(final QpidByteBuffer content) throws Exception
{
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
- InputStream contentInputStream = content.asInputStream())
+ try (final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ final InputStream contentInputStream = content.asInputStream())
{
ByteStreams.copy(contentInputStream, bos);
content.dispose();
@@ -1010,10 +845,10 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
private Message_1_0 createTestMessage(final Properties properties, final EncodingRetainingSection section)
{
return createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
properties,
- new ApplicationProperties(Collections.emptyMap()),
+ new ApplicationProperties(Map.of()),
0,
section);
}
@@ -1023,10 +858,10 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final EncodingRetainingSection section)
{
return createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
messageAnnotations,
properties,
- new ApplicationProperties(Collections.emptyMap()),
+ new ApplicationProperties(Map.of()),
0,
section);
}
@@ -1035,10 +870,10 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final EncodingRetainingSection section)
{
return createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
messageAnnotations,
new Properties(),
- new ApplicationProperties(Collections.emptyMap()),
+ new ApplicationProperties(Map.of()),
0,
section);
}
@@ -1052,12 +887,12 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final EncodingRetainingSection section)
{
final StoredMessage<MessageMetaData_1_0> storedMessage = mock(StoredMessage.class);
- MessageMetaData_1_0 metaData = new MessageMetaData_1_0(header.createEncodingRetainingSection(),
+ final MessageMetaData_1_0 metaData = new MessageMetaData_1_0(header.createEncodingRetainingSection(),
deliveryAnnotations.createEncodingRetainingSection(),
messageAnnotations.createEncodingRetainingSection(),
properties.createEncodingRetainingSection(),
applicationProperties.createEncodingRetainingSection(),
- new Footer(Collections.emptyMap()).createEncodingRetainingSection(),
+ new Footer(Map.of()).createEncodingRetainingSection(),
arrivalTime,
0);
when(storedMessage.getMetaData()).thenReturn(metaData);
@@ -1070,9 +905,8 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final ArgumentCaptor<Integer> offsetCaptor = ArgumentCaptor.forClass(Integer.class);
final ArgumentCaptor<Integer> sizeCaptor = ArgumentCaptor.forClass(Integer.class);
- when(storedMessage.getContent(offsetCaptor.capture(),
- sizeCaptor.capture())).then(invocation -> combined.view(offsetCaptor.getValue(),
- sizeCaptor.getValue()));
+ when(storedMessage.getContent(offsetCaptor.capture(), sizeCaptor.capture()))
+ .then(invocation -> combined.view(offsetCaptor.getValue(), sizeCaptor.getValue()));
}
else
{
@@ -1084,8 +918,8 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
private byte[] getObjectBytes(final Object object) throws IOException
{
final byte[] expected;
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos))
+ try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos))
{
oos.writeObject(object);
expected = baos.toByteArray();
@@ -1098,12 +932,11 @@ public class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
final String expectedMimeType) throws Exception
{
final Data value = new Data(new Binary(data));
- Message_1_0 sourceMessage = createTestMessage(messageAnnotations, value.createEncodingRetainingSection());
-
+ final Message_1_0 sourceMessage = createTestMessage(messageAnnotations, value.createEncodingRetainingSection());
final AMQMessage convertedMessage = _converter.convert(sourceMessage, mock(NamedAddressSpace.class));
+ final QpidByteBuffer content = convertedMessage.getContent();
assertEquals(expectedMimeType, convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
- final QpidByteBuffer content = convertedMessage.getContent();
assertArrayEquals(data, getBytes(content), "Unexpected content");
}
}
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 84118bb255..2766e5640e 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
@@ -24,18 +24,20 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -53,461 +55,382 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_0_8_to_1_0Test extends UnitTestBase
+class PropertyConverter_0_8_to_1_0Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_0_8_to_1_0 _messageConverter;
@BeforeAll
- public void setUp()
+ void setUp()
{
_namedAddressSpace = mock(NamedAddressSpace.class);
_messageConverter = new MessageConverter_0_8_to_1_0();
}
- @Test
- public void testContentTypeConversion()
+ @ParameterizedTest
+ @CsvSource(
{
- String contentType = "test-content-type";
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
- basicContentHeaderProperties.setContentType(contentType);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
- final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
- assertEquals(contentType, properties.getContentType().toString(), "Unexpected content type");
- }
-
- @Test
- public void testContentTypeJavaObjectStreamConversion()
+ "test-content-type,test-content-type", "application/java-object-stream,application/x-java-serialized-object"
+ })
+ void contentTypesConversion(final String contentType, final String expectedContentType)
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
- basicContentHeaderProperties.setContentType("application/java-object-stream");
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ basicContentHeaderProperties.setContentType(contentType);
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
- assertEquals("application/x-java-serialized-object", properties.getContentType().toString(),
- "Unexpected content type");
-
+ assertEquals(expectedContentType, properties.getContentType().toString(), "Unexpected content type");
}
@Test
- public void testContentEncodingConversion()
+ void contentEncodingConversion()
{
- String contentEncoding = "my-test-encoding";
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final String contentEncoding = "my-test-encoding";
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setEncoding(contentEncoding);
- AMQMessage message = createTestMessage(basicContentHeaderProperties, new byte[]{(byte) 1}, 0);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties, new byte[]{(byte) 1}, 0);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(contentEncoding, properties.getContentEncoding().toString(), "Unexpected content encoding");
}
@Test
- public void testHeaderConversion()
+ void headerConversion()
{
- Map<String, Object> headers = new HashMap<>();
- headers.put("testProperty1", "testProperty1Value");
- headers.put("intProperty", 1);
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final Map<String, Object> headers = Map.of("testProperty1", "testProperty1Value", "intProperty", 1);
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
- Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertEquals(headers, new HashMap<>(applicationProperties), "Unexpected applicationProperties");
}
@Test
- public void testHeaderConversionWhenQpidSubjectIsPresent()
+ void headerConversionWhenQpidSubjectIsPresent()
{
- String testSubject = "testSubject";
- Map<String, Object> headers = new HashMap<>();
- headers.put("testProperty1", "testProperty1Value");
- headers.put("qpid.subject", testSubject);
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final String testSubject = "testSubject";
+ final Map<String, Object> headers = Map.of("testProperty1", "testProperty1Value", "qpid.subject", testSubject);
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(testSubject, properties.getSubject(), "Unexpected subject");
- Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertFalse(applicationProperties.containsKey("qpid.subject"), "Unexpected subject in application properties");
-
}
@Test
- public void testPersistentDeliveryModeConversion()
+ void persistentDeliveryModeConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setDeliveryMode(BasicContentHeaderProperties.PERSISTENT);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Header header = convertedMessage.getHeaderSection().getValue();
- Header header = convertedMessage.getHeaderSection().getValue();
assertTrue(header.getDurable(), "Unexpected durable header");
}
@Test
- public void testNonPersistentDeliveryModeConversion()
+ void nonPersistentDeliveryModeConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setDeliveryMode(BasicContentHeaderProperties.NON_PERSISTENT);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Header header = convertedMessage.getHeaderSection().getValue();
- Header header = convertedMessage.getHeaderSection().getValue();
assertFalse(header.getDurable(), "Unexpected durable header");
}
@Test
- public void testPriorityConversion()
+ void priorityConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final byte priority = 5;
basicContentHeaderProperties.setPriority(priority);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Header header = convertedMessage.getHeaderSection().getValue();
- Header header = convertedMessage.getHeaderSection().getValue();
assertEquals(priority, (long) header.getPriority().byteValue(), "Unexpected priority");
}
@Test
- public void testCorrelationIdConversion()
+ void correlationIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String correlationId = "testCorrelationId";
basicContentHeaderProperties.setCorrelationId(AMQShortString.valueOf(correlationId));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(correlationId, properties.getCorrelationId(), "Unexpected correlationId");
}
@Test
- public void testCorrelationUuidIdConversion()
+ void correlationUuidIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
- UUID correlationId = UUID.randomUUID();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final UUID correlationId = UUID.randomUUID();
basicContentHeaderProperties.setCorrelationId(AMQShortString.valueOf("ID:" + correlationId));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(correlationId, properties.getCorrelationId(), "Unexpected correlationId");
}
@Test
- public void testReplyToConversionWhenBindingURLFormatIsUsed()
+ void replyToConversionWhenBindingURLFormatIsUsed()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String replyTo = "direct://amq.direct/destination_name/queue_name?routingkey='test_routing_key'";
basicContentHeaderProperties.setReplyTo(replyTo);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("amq.direct/test_routing_key", properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenBindingURLFormatIsUsed2()
+ void replyToConversionWhenBindingURLFormatIsUsed2()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String replyTo = "direct://amq.direct//queue_name";
basicContentHeaderProperties.setReplyTo(replyTo);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("amq.direct/queue_name", properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenBindingURLFormatIsUsed3()
+ void replyToConversionWhenBindingURLFormatIsUsed3()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String replyTo = "direct:////queue_name";
basicContentHeaderProperties.setReplyTo(replyTo);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("queue_name", properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenBindingURLFormatIsUsed4()
+ void replyToConversionWhenBindingURLFormatIsUsed4()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String replyTo = "direct:////?routingkey='test_routing_key'";
basicContentHeaderProperties.setReplyTo(replyTo);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("test_routing_key", properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenNonBindingURLFormatIsUsed()
+ void replyToConversionWhenNonBindingURLFormatIsUsed()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
-
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String replyTo = "test";
basicContentHeaderProperties.setReplyTo(replyTo);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals("test", properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testExpirationConversion()
+ void expirationConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
- long timestamp = System.currentTimeMillis();
- int ttl = 100000;
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final long timestamp = System.currentTimeMillis();
+ final int ttl = 100000;
final long expiration = timestamp + ttl;
basicContentHeaderProperties.setExpiration(expiration);
-
- AMQMessage message = createTestMessage(basicContentHeaderProperties, timestamp);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties, timestamp);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Header header = convertedMessage.getHeaderSection().getValue();
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Header header = convertedMessage.getHeaderSection().getValue();
assertEquals(ttl, header.getTtl().longValue(), "Unexpected TTL");
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertNull(properties.getAbsoluteExpiryTime(), "Unexpected expiration");
}
@Test
- public void testMessageIdConversion()
+ void messageIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String messageId = "testMessageId";
basicContentHeaderProperties.setMessageId(messageId);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(messageId, properties.getMessageId(), "Unexpected messageId");
}
@Test
- public void testMessageUuidConversion()
+ void messageUuidConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final UUID messageId = UUID.randomUUID();
basicContentHeaderProperties.setMessageId("ID:" + messageId);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(messageId, properties.getMessageId(), "Unexpected messageId");
}
@Test
- public void testTimestampConversion()
+ void timestampConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final long timestamp = System.currentTimeMillis() - 10000;
basicContentHeaderProperties.setTimestamp(timestamp);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(timestamp, properties.getCreationTime().getTime(), "Unexpected creation timestamp");
}
@Test
- public void testArrivalTimeConversion()
+ void arrivalTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 10000;
- AMQMessage message = createTestMessage(new BasicContentHeaderProperties(), null, timestamp);
-
+ final AMQMessage message = createTestMessage(new BasicContentHeaderProperties(), null, timestamp);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(timestamp, properties.getCreationTime().getTime(), "Unexpected creation timestamp");
}
@Test
- public void testTypeConversion()
+ void typeConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String type = "test-type";
basicContentHeaderProperties.setType(type);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(type, properties.getSubject(), "Unexpected subject");
}
@Test
- public void testUserIdConversion()
+ void userIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
final String userId = "test-userId";
basicContentHeaderProperties.setUserId(userId);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
- Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(userId, new String(properties.getUserId().getArray(), UTF_8), "Unexpected user-id");
}
@Test
- public void testHeaderJMSXGroupIdConversion()
+ void headerJMSXGroupIdConversion()
{
- Map<String, Object> headers = new HashMap<>();
- String testGroupId = "testGroupId";
- headers.put("JMSXGroupID", testGroupId);
- headers.put("intProperty", 1);
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final String testGroupId = "testGroupId";
+ final Map<String, Object> headers = Map.of("JMSXGroupID", testGroupId, "intProperty", 1);
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertEquals(testGroupId, properties.getGroupId(), "Unexpected group-id");
-
- Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
- assertFalse(applicationProperties.containsKey("JMSXGroupID"),
- "Unexpected JMSXGroupID in application properties");
+ assertFalse(applicationProperties.containsKey("JMSXGroupID"), "Unexpected JMSXGroupID in application properties");
}
@Test
- public void testHeaderJMSXGroupSeqConversion()
+ void headerJMSXGroupSeqConversion()
{
- Map<String, Object> headers = new HashMap<>();
- int testGroupSequenceNumber = 1;
- headers.put("JMSXGroupSeq", testGroupSequenceNumber);
- headers.put("intProperty", 1);
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final int testGroupSequenceNumber = 1;
+ final Map<String, Object> headers = Map.of("JMSXGroupSeq", testGroupSequenceNumber, "intProperty", 1);
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertEquals(testGroupSequenceNumber, (long) properties.getGroupSequence().intValue(), "Unexpected group-sequence");
-
-
- Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
- assertFalse(applicationProperties.containsKey("JMSXGroupSeq"),
- "Unexpected JMSXGroupSeq in application properties");
+ assertFalse(applicationProperties.containsKey("JMSXGroupSeq"), "Unexpected JMSXGroupSeq in application properties");
}
@Test
- public void testHeaderJMSXGroupSeqConversionWhenWrongType()
+ void headerJMSXGroupSeqConversionWhenWrongType()
{
- Map<String, Object> headers = new HashMap<>();
- short testGroupSequenceNumber = (short) 1;
- headers.put("JMSXGroupSeq", testGroupSequenceNumber);
- headers.put("intProperty", 1);
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final short testGroupSequenceNumber = (short) 1;
+ final Map<String, Object> headers = Map.of("JMSXGroupSeq", testGroupSequenceNumber, "intProperty", 1);
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
assertNull(properties.getGroupSequence(), "Unexpected group-sequence");
-
- Map<String, Object> applicationProperties = convertedMessage.getApplicationPropertiesSection().getValue();
-
- assertTrue(applicationProperties.containsKey("JMSXGroupSeq"),
- "JMSXGroupSeq was removed from application properties");
+ assertTrue(applicationProperties.containsKey("JMSXGroupSeq"), "JMSXGroupSeq was removed from application properties");
}
@Test
- public void testHeaderWithFiledTableValueConversionFails()
+ void headerWithFiledTableValueConversionFails()
{
- Map<String, Object> headers = Collections.singletonMap("mapHeader", Collections.emptyMap());
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final Map<String, Object> headers = Map.of("mapHeader", Map.of());
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Exception is expected");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Exception is expected");
}
@Test
- public void testHeaderWithFieldArrayValueConversionFails()
+ void headerWithFieldArrayValueConversionFails()
{
- Map<String, Object> headers = Collections.singletonMap("listHeader", Collections.emptyList());
- BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
+ final Map<String, Object> headers = Map.of("listHeader", List.of());
+ final BasicContentHeaderProperties basicContentHeaderProperties = new BasicContentHeaderProperties();
basicContentHeaderProperties.setHeaders(FieldTable.convertToFieldTable(headers));
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
+ final AMQMessage message = createTestMessage(basicContentHeaderProperties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Exception is expected");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Exception is expected");
}
@Test
- public void testExchangeRoutingKeyConversion()
+ void exchangeRoutingKeyConversion()
{
final String testExchange = "testExchange";
final String testRoutingKey = "testRoutingKey";
- AMQMessage message = createTestMessage(new BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new BasicContentHeaderProperties());
message.getMessagePublishInfo().setExchange(AMQShortString.valueOf(testExchange));
message.getMessagePublishInfo().setRoutingKey(AMQShortString.valueOf(testRoutingKey));
-
final Message_1_0 convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- Properties properties = convertedMessage.getPropertiesSection().getValue();
+ final Properties properties = convertedMessage.getPropertiesSection().getValue();
assertEquals(testExchange + "/" + testRoutingKey, properties.getTo(), "Unexpected to");
}
@@ -518,21 +441,21 @@ public class PropertyConverter_0_8_to_1_0Test extends UnitTestBase
}
private AMQMessage createTestMessage(final BasicContentHeaderProperties basicContentHeaderProperties,
- long arrivalTime)
+ final long arrivalTime)
{
return createTestMessage(basicContentHeaderProperties, null, arrivalTime);
}
private AMQMessage createTestMessage(final BasicContentHeaderProperties basicContentHeaderProperties,
- final byte[] content, final long arrivalTime)
+ final byte[] content,
+ final long arrivalTime)
{
final ContentHeaderBody contentHeaderBody = mock(ContentHeaderBody.class);
when(contentHeaderBody.getProperties()).thenReturn(basicContentHeaderProperties);
final StoredMessage<MessageMetaData> storedMessage = mock(StoredMessage.class);
- when(storedMessage.getMetaData()).thenReturn(new MessageMetaData(new MessagePublishInfo(),
- contentHeaderBody,
- arrivalTime));
+ when(storedMessage.getMetaData())
+ .thenReturn(new MessageMetaData(new MessagePublishInfo(), contentHeaderBody, arrivalTime));
if (content != null)
{
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 aa7154d914..ab9bbb359f 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
@@ -23,7 +23,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
@@ -32,7 +32,6 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -67,13 +66,14 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
+@SuppressWarnings({"unchecked"})
+class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_1_0_to_v0_8 _messageConverter;
@BeforeAll
- public void setUp()
+ void setUp()
{
_namedAddressSpace = mock(NamedAddressSpace.class);
when(_namedAddressSpace.getLocalAddress(anyString())).then(returnsFirstArg());
@@ -81,684 +81,591 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testContentEncodingConversion()
+ void contentEncodingConversion()
{
-
- String contentEncoding = "my-test-encoding";
+ final String contentEncoding = "my-test-encoding";
final Properties properties = new Properties();
properties.setContentEncoding(Symbol.valueOf(contentEncoding));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(contentEncoding, convertedProperties.getEncoding().toString(), "Unexpected content encoding");
-
}
@Test
- public void testContentEncodingConversionWhenLengthExceeds255()
+ void contentEncodingConversionWhenLengthExceeds255()
{
-
- String contentEncoding = generateLongString();
+ final String contentEncoding = generateLongString();
final Properties properties = new Properties();
properties.setContentEncoding(Symbol.valueOf(contentEncoding));
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("expected exception not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Expected exception not thrown");
}
@Test
- public void testApplicationPropertiesConversion()
+ void applicationPropertiesConversion()
{
- Map<String, Object> properties = new HashMap<>();
- properties.put("testProperty1", "testProperty1Value");
- properties.put("intProperty", 1);
- ApplicationProperties applicationProperties = new ApplicationProperties(properties);
- Message_1_0 message = createTestMessage(applicationProperties);
-
+ final Map<String, Object> properties = Map.of("testProperty1", "testProperty1Value", "intProperty", 1);
+ final ApplicationProperties applicationProperties = new ApplicationProperties(properties);
+ final Message_1_0 message = createTestMessage(applicationProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
+
assertEquals(properties, new HashMap<>(headers), "Unexpected headers");
}
@Test
- public void testApplicationPropertiesConversionWithUuid()
+ void applicationPropertiesConversionWithUuid()
{
- Map<String, Object> properties = new HashMap<>();
final String key = "uuidProperty";
- properties.put(key, UUID.randomUUID());
- ApplicationProperties applicationProperties = new ApplicationProperties(properties);
- Message_1_0 message = createTestMessage(applicationProperties);
-
+ final Map<String, Object> properties = Map.of(key, UUID.randomUUID());
+ final ApplicationProperties applicationProperties = new ApplicationProperties(properties);
+ final Message_1_0 message = createTestMessage(applicationProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
+
assertEquals(properties.size(), (long) headers.size(), "Unexpected headers size");
assertEquals(properties.get(key), UUID.fromString((String) headers.get(key)), "Unexpected headers");
}
@Test
- public void testApplicationPropertiesConversionWithDate()
+ void applicationPropertiesConversionWithDate()
{
- Map<String, Object> properties = new HashMap<>();
final String key = "dateProperty";
- properties.put(key, new Date());
- ApplicationProperties applicationProperties = new ApplicationProperties(properties);
- Message_1_0 message = createTestMessage(applicationProperties);
-
+ final Map<String, Object> properties = Map.of(key, new Date());
+ final ApplicationProperties applicationProperties = new ApplicationProperties(properties);
+ final Message_1_0 message = createTestMessage(applicationProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
+
assertEquals(properties.size(), (long) headers.size(), "Unexpected headers size");
assertEquals(properties.get(key), new Date((Long) headers.get(key)), "Unexpected headers");
}
@Test
- public void testSubjectConversion()
+ void subjectConversion()
{
final String subject = "testSubject";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setSubject(subject);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
+ final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
+
assertEquals(subject, headers.get("qpid.subject"), "Unexpected qpid.subject is missing from headers");
assertEquals(subject, convertedProperties.getType().toString(), "Unexpected type");
- final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals(subject, messagePublishInfo.getRoutingKey().toString(), "Unexpected routing-key");
}
@Test
- public void testSubjectConversionWhenSubjectExceeds255()
+ void subjectConversionWhenSubjectExceeds255()
{
final String subject = generateLongString();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setSubject(subject);
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Expected conversion exception");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Expected conversion exception");
}
@Test
- public void testDurableConversion()
+ void durableConversion()
{
final Header header = new Header();
header.setDurable(true);
- Message_1_0 message = createTestMessage(header);
-
+ final Message_1_0 message = createTestMessage(header);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(BasicContentHeaderProperties.PERSISTENT, (long) convertedProperties.getDeliveryMode(),
"Unexpected deliveryMode");
}
@Test
- public void testNonDurableConversion()
+ void nonDurableConversion()
{
final Header header = new Header();
header.setDurable(false);
- Message_1_0 message = createTestMessage(header);
-
+ final Message_1_0 message = createTestMessage(header);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(BasicContentHeaderProperties.NON_PERSISTENT, (long) convertedProperties.getDeliveryMode(),
"Unexpected deliveryMode");
}
@Test
- public void testPriorityConversion()
+ void priorityConversion()
{
final Header header = new Header();
final byte priority = (byte) 7;
header.setPriority(UnsignedByte.valueOf(priority));
- Message_1_0 message = createTestMessage(header);
-
+ final Message_1_0 message = createTestMessage(header);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(priority, (long) convertedProperties.getPriority(), "Unexpected priority");
}
@Test
- public void testCorrelationIdStringConversion()
+ void correlationIdStringConversion()
{
final String correlationId = "testCorrelationId";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(correlationId, convertedProperties.getCorrelationId().toString(), "Unexpected correlationId");
}
@Test
- public void testCorrelationIdLongStringConversion()
+ void correlationIdLongStringConversion()
{
final String correlationId = generateLongString();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Expected exception not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Expected exception not thrown");
}
@Test
- public void testCorrelationIdULongConversion()
+ void correlationIdULongConversion()
{
final UnsignedLong correlationId = UnsignedLong.valueOf(-1);
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(correlationId.toString(), convertedProperties.getCorrelationId().toString(), "Unexpected correlationId");
}
@Test
- public void testCorrelationIdUUIDConversion()
+ void correlationIdUUIDConversion()
{
final UUID correlationId = UUID.randomUUID();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(correlationId.toString(), convertedProperties.getCorrelationId().toString(), "Unexpected correlationId");
}
@Test
- public void testCorrelationIdBinaryConversion()
+ void correlationIdBinaryConversion()
{
final String testCorrelationId = "testCorrelationId";
final Binary correlationId = new Binary(testCorrelationId.getBytes(UTF_8));
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(testCorrelationId, convertedProperties.getCorrelationId().toString(), "Unexpected correlationId");
}
@Test
- public void testCorrelationIdBinaryConversionWhenNotUtf8()
+ void correlationIdBinaryConversionWhenNotUtf8()
{
final byte[] testCorrelationId = new byte[]{(byte) 0xc3, 0x28};
final Binary correlationId = new Binary(testCorrelationId);
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCorrelationId(correlationId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(testCorrelationId, convertedProperties.getCorrelationId().getBytes(), "Unexpected correlationId");
-
}
@Test
- public void testReplyToConversionWhenResultExceeds255()
+ void replyToConversionWhenResultExceeds255()
{
final String replyTo = generateLongString() + "/" + generateLongString();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("expected exception not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Expected exception not thrown");
}
@Test
- public void testReplyToConversionWhenQueueIsSpecified()
+ void replyToConversionWhenQueueIsSpecified()
{
final String replyTo = "myTestQueue";
- final Queue queue = mock(Queue.class);
+ final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(replyTo);
doReturn(queue).when(_namedAddressSpace).getAttainedMessageDestination(eq(replyTo), anyBoolean());
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("direct:////" + replyTo, convertedProperties.getReplyToAsString(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenExchangeIsSpecified()
+ void replyToConversionWhenExchangeIsSpecified()
{
final String replyTo = "myTestExchange";
- final Exchange exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(replyTo);
when(exchange.getType()).thenReturn(ExchangeDefaults.FANOUT_EXCHANGE_CLASS);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(replyTo), anyBoolean());
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("fanout://" + replyTo + "//", convertedProperties.getReplyToAsString(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecified()
+ void replyToConversionWhenExchangeAndRoutingKeyAreSpecified()
{
final String exchangeName = "testExchnageName";
final String routingKey = "testRoutingKey";
final String replyTo = String.format("%s/%s", exchangeName, routingKey);
- final Exchange exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(exchangeName);
when(exchange.getType()).thenReturn(ExchangeDefaults.TOPIC_EXCHANGE_CLASS);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(exchangeName), anyBoolean());
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("topic://" + exchangeName + "//?routingkey='" + routingKey + "'", convertedProperties.getReplyToAsString(),
"Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecifiedAndGlobalPrefixIsUsed()
+ void replyToConversionWhenExchangeAndRoutingKeyAreSpecifiedAndGlobalPrefixIsUsed()
{
final String exchangeName = "testExchnageName";
final String routingKey = "testRoutingKey";
final String globalPrefix = "/testPrefix";
final String replyTo = String.format("%s/%s/%s", globalPrefix, exchangeName, routingKey);
when(_namedAddressSpace.getLocalAddress(replyTo)).thenReturn(exchangeName + "/" + routingKey);
- final Exchange exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(exchangeName);
when(exchange.getType()).thenReturn(ExchangeDefaults.TOPIC_EXCHANGE_CLASS);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(exchangeName), anyBoolean());
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("topic://" + exchangeName + "//?routingkey='" + routingKey + "'", convertedProperties.getReplyToAsString(),
"Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenReplyToCannotBeResolved()
+ void replyToConversionWhenReplyToCannotBeResolved()
{
final String replyTo = "direct://amq.direct//test?routingkey='test'";
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setReplyTo(replyTo);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals("direct:////?routingkey='" + replyTo + "'", convertedProperties.getReplyToAsString(),
"Unexpected reply-to");
}
@Test
- public void testTTLConversion()
+ void TTLConversion()
{
- long ttl = 10000;
- long arrivalTime = System.currentTimeMillis();
- long expectedExpiration = arrivalTime + ttl;
- Header header = new Header();
+ final long ttl = 10000;
+ final long arrivalTime = System.currentTimeMillis();
+ final long expectedExpiration = arrivalTime + ttl;
+ final Header header = new Header();
header.setTtl(UnsignedInteger.valueOf(ttl));
- Message_1_0 message = createTestMessage(header, arrivalTime);
-
+ final Message_1_0 message = createTestMessage(header, arrivalTime);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(expectedExpiration, convertedProperties.getExpiration(), "Unexpected expiration");
}
@Test
- public void testAbsoluteExpiryTimeConversion()
+ void absoluteExpiryTimeConversion()
{
- long ttl = 10000;
- long arrivalTime = System.currentTimeMillis();
- long expiryTime = arrivalTime + ttl;
- Properties properties = new Properties();
+ final long ttl = 10000;
+ final long arrivalTime = System.currentTimeMillis();
+ final long expiryTime = arrivalTime + ttl;
+ final Properties properties = new Properties();
properties.setAbsoluteExpiryTime(new Date(expiryTime));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(expiryTime, convertedProperties.getExpiration(), "Unexpected expiration");
}
@Test
- public void testConversionOfAbsoluteExpiryTimeTakesPrecedenceOverTTL()
+ void conversionOfAbsoluteExpiryTimeTakesPrecedenceOverTTL()
{
- long ttl = 10000;
+ final long ttl = 10000;
final long time = System.currentTimeMillis();
- long absoluteExpiryTime = time + ttl;
- long arrivalTime = time + 1;
-
- Header header = new Header();
+ final long absoluteExpiryTime = time + ttl;
+ final long arrivalTime = time + 1;
+ final Header header = new Header();
header.setTtl(UnsignedInteger.valueOf(ttl));
-
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setAbsoluteExpiryTime(new Date(absoluteExpiryTime));
-
- Message_1_0 message = createTestMessage(header,
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
- properties,
- new ApplicationProperties(Collections.emptyMap()),
- arrivalTime
- );
-
+ final Message_1_0 message = createTestMessage(header,
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
+ properties,
+ new ApplicationProperties(Map.of()),
+ arrivalTime);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(absoluteExpiryTime, convertedProperties.getExpiration(), "Unexpected expiration");
}
@Test
- public void testMessageIdStringConversion()
+ void messageIdStringConversion()
{
final String messageId = "testMessageId";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(messageId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(messageId, convertedProperties.getMessageId().toString(), "Unexpected messageId");
}
@Test
- public void testMessageIdLongStringConversion()
+ void messageIdLongStringConversion()
{
final String messageId = generateLongString();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(messageId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertNull(convertedProperties.getMessageId(), "Unexpected messageId");
}
@Test
- public void testMessageIdUUIDConversion()
+ void messageIdUUIDConversion()
{
final UUID messageId = UUID.randomUUID();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(messageId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(messageId.toString(), convertedProperties.getMessageId().toString(), "Unexpected messageId");
}
@Test
- public void testMessageIdUnsignedLongConversion()
+ void messageIdUnsignedLongConversion()
{
final UnsignedLong messageId = UnsignedLong.valueOf(-1);
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(messageId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(messageId.toString(), convertedProperties.getMessageId().toString(), "Unexpected messageId");
}
@Test
- public void testMessageIdBinaryConversion()
+ void messageIdBinaryConversion()
{
final String messageId = "testMessageId";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(new Binary(messageId.getBytes()));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(messageId, convertedProperties.getMessageId().toString(), "Unexpected messageId");
}
@Test
- public void testMessageIdByteArrayConversion()
+ void messageIdByteArrayConversion()
{
final byte[] messageId = "testMessageId".getBytes();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(messageId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(messageId, convertedProperties.getMessageId().getBytes(), "Unexpected messageId");
}
@Test
- public void testMessageIdBinaryConversionWhenNonUtf8()
+ void messageIdBinaryConversionWhenNonUtf8()
{
final byte[] messageId = new byte[]{(byte) 0xc3, 0x28};
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setMessageId(new Binary(messageId));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(messageId, convertedProperties.getMessageId().getBytes(), "Unexpected messageId");
}
@Test
- public void testCreationTimeConversion()
+ void creationTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 10000;
final long arrivalTime = timestamp + 1;
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setCreationTime(new Date(timestamp));
- Message_1_0 message = createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
- properties,
- new ApplicationProperties(Collections.emptyMap()),
- arrivalTime
- );
-
+ final Message_1_0 message = createTestMessage(new Header(),
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
+ properties,
+ new ApplicationProperties(Map.of()),
+ arrivalTime);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(timestamp, convertedProperties.getTimestamp(), "Unexpected timestamp");
}
@Test
- public void testArrivalTimeConversion()
+ void arrivalTimeConversion()
{
final long arrivalTime = System.currentTimeMillis() - 10000;
- Message_1_0 message = createTestMessage(new Header(), arrivalTime);
-
+ final Message_1_0 message = createTestMessage(new Header(), arrivalTime);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(arrivalTime, convertedProperties.getTimestamp(), "Unexpected timestamp");
}
@Test
- public void testUserIdConversion()
+ void userIdConversion()
{
final String userId = "test-userId";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setUserId(new Binary(userId.getBytes()));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertEquals(userId, convertedProperties.getUserIdAsString(), "Unexpected user-id");
}
@Test
- public void testUserIdConversionWhenLengthExceeds255()
+ void userIdConversionWhenLengthExceeds255()
{
final String userId = generateLongString();
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setUserId(new Binary(userId.getBytes()));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertNull(convertedProperties.getUserId(), "Unexpected user-id");
}
@Test
- public void testUserIdConversionWhenNonUtf8()
+ void userIdConversionWhenNonUtf8()
{
final byte[] userId = new byte[]{(byte) 0xc3, 0x28};
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setUserId(new Binary(userId));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(userId, convertedProperties.getUserId().getBytes(), "Unexpected user-id");
}
@Test
- public void testGroupIdConversion()
+ void groupIdConversion()
{
- String testGroupId = generateLongString();
- Properties properties = new Properties();
+ final String testGroupId = generateLongString();
+ final Properties properties = new Properties();
properties.setGroupId(testGroupId);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- Map<String, Object> headers = convertedProperties.getHeadersAsMap();
assertEquals(testGroupId, headers.get("JMSXGroupID"), "Unexpected group-id");
}
@Test
- public void testGroupSequenceConversion()
+ void groupSequenceConversion()
{
- int testGroupSequence = 1;
- Properties properties = new Properties();
+ final int testGroupSequence = 1;
+ final Properties properties = new Properties();
properties.setGroupSequence(UnsignedInteger.valueOf(testGroupSequence));
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
+ final BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
+ final Map<String, Object> headers = convertedProperties.getHeadersAsMap();
- BasicContentHeaderProperties convertedProperties = convertedMessage.getContentHeaderBody().getProperties();
- Map<String, Object> headers = convertedProperties.getHeadersAsMap();
assertEquals(testGroupSequence, headers.get("JMSXGroupSeq"), "Unexpected group-id");
}
-
@Test
- public void testApplicationPropertiesConversionWhenKeyLengthExceeds255()
+ void applicationPropertiesConversionWhenKeyLengthExceeds255()
{
- Map<String, Object> properties = Collections.singletonMap("testProperty-" + generateLongString(), "testValue");
- ApplicationProperties applicationProperties = new ApplicationProperties(properties);
- Message_1_0 message = createTestMessage(applicationProperties);
+ final Map<String, Object> properties = Map.of("testProperty-" + generateLongString(), "testValue");
+ final ApplicationProperties applicationProperties = new ApplicationProperties(properties);
+ final Message_1_0 message = createTestMessage(applicationProperties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Exception is expected");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Exception is expected");
}
@Test
- public void testToConversionWhenExchangeAndRoutingKeyIsSpecified()
+ void toConversionWhenExchangeAndRoutingKeyIsSpecified()
{
final String testExchange = "testExchange";
final String testRoutingKey = "testRoutingKey";
-
- String to = testExchange + "/" + testRoutingKey;
- Properties properties = new Properties();
+ final String to = testExchange + "/" + testRoutingKey;
+ final Properties properties = new Properties();
properties.setTo(to);
- Message_1_0 message = createTestMessage(properties);
-
- Exchange<?> exchange = mock(Exchange.class);
+ final Message_1_0 message = createTestMessage(properties);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(testExchange);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(testExchange), anyBoolean());
-
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals(testExchange, messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -766,19 +673,16 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenExchangeIsSpecified()
+ void toConversionWhenExchangeIsSpecified()
{
final String testExchange = "testExchange";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(testExchange);
- Message_1_0 message = createTestMessage(properties);
-
- final Exchange exchange = mock(Exchange.class);
+ final Message_1_0 message = createTestMessage(properties);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(testExchange);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(testExchange), anyBoolean());
-
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals(testExchange, messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -786,21 +690,18 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenExchangeIsSpecifiedAndSubjectIsSet()
+ void toConversionWhenExchangeIsSpecifiedAndSubjectIsSet()
{
final String testExchange = "testExchange";
final String testRoutingKey = "testRoutingKey";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(testExchange);
properties.setSubject(testRoutingKey);
- Message_1_0 message = createTestMessage(properties);
-
- final Exchange exchange = mock(Exchange.class);
+ final Message_1_0 message = createTestMessage(properties);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(testExchange);
doReturn(exchange).when(_namedAddressSpace).getAttainedMessageDestination(eq(testExchange),anyBoolean());
-
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals(testExchange, messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -808,19 +709,16 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenQueueIsSpecified()
+ void toConversionWhenQueueIsSpecified()
{
final String testQueue = "testQueue";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(testQueue);
- Message_1_0 message = createTestMessage(properties);
-
- final Queue queue = mock(Queue.class);
+ final Message_1_0 message = createTestMessage(properties);
+ final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(testQueue);
doReturn(queue).when(_namedAddressSpace).getAttainedMessageDestination(eq(testQueue), anyBoolean());
-
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals("", messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -828,15 +726,13 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenGlobalAddressUnrecognized()
+ void toConversionWhenGlobalAddressUnrecognized()
{
final String globalAddress = "/testQueue";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(globalAddress);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals("", messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -844,22 +740,19 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenGlobalAddressIsKnown()
+ void toConversionWhenGlobalAddressIsKnown()
{
final String globalPrefix = "/testPrefix";
final String queueName = "testQueue";
final String globalAddress = globalPrefix + "/" + queueName;
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(globalAddress);
- Message_1_0 message = createTestMessage(properties);
-
- Queue<?> queue = mock(Queue.class);
+ final Message_1_0 message = createTestMessage(properties);
+ final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(queueName);
doReturn(queue).when(_namedAddressSpace).getAttainedMessageDestination(eq(queueName), anyBoolean());
when(_namedAddressSpace.getLocalAddress(globalAddress)).thenReturn(queueName);
-
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals("", messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -867,59 +760,43 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
}
@Test
- public void testToConversionWhenExchangeLengthExceeds255()
+ void toConversionWhenExchangeLengthExceeds255()
{
final String testExchange = generateLongString();
final String testRoutingKey = "testRoutingKey";
-
- String to = testExchange + "/" + testRoutingKey;
- Properties properties = new Properties();
+ final String to = testExchange + "/" + testRoutingKey;
+ final Properties properties = new Properties();
properties.setTo(to);
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Exception is not thrown");
}
@Test
- public void testToConversionWhenRoutingKeyLengthExceeds255()
+ void toConversionWhenRoutingKeyLengthExceeds255()
{
final String testExchange = "testExchange";
final String testRoutingKey = generateLongString();
-
- String to = testExchange + "/" + testRoutingKey;
- Properties properties = new Properties();
+ final String to = testExchange + "/" + testRoutingKey;
+ final Properties properties = new Properties();
properties.setTo(to);
- Message_1_0 message = createTestMessage(properties);
+ final Message_1_0 message = createTestMessage(properties);
- try
- {
- _messageConverter.convert(message, _namedAddressSpace);
- fail("Exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _namedAddressSpace),
+ "Exception is not thrown");
}
@Test
- public void testToConversionWhenDestinationIsSpecifiedButDoesNotExists()
+ void toConversionWhenDestinationIsSpecifiedButDoesNotExists()
{
final String testDestination = "testDestination";
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setTo(testDestination);
- Message_1_0 message = createTestMessage(properties);
-
+ final Message_1_0 message = createTestMessage(properties);
final AMQMessage convertedMessage = _messageConverter.convert(message, _namedAddressSpace);
-
final MessagePublishInfo messagePublishInfo = convertedMessage.getMessagePublishInfo();
assertEquals("", messagePublishInfo.getExchange().toString(), "Unexpected exchange");
@@ -931,37 +808,34 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
return createTestMessage(header, 0);
}
- private Message_1_0 createTestMessage(final Header header, long arrivalTime)
+ private Message_1_0 createTestMessage(final Header header, final long arrivalTime)
{
return createTestMessage(header,
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
new Properties(),
- new ApplicationProperties(Collections.emptyMap()),
- arrivalTime
- );
+ new ApplicationProperties(Map.of()),
+ arrivalTime);
}
private Message_1_0 createTestMessage(final Properties properties)
{
return createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
properties,
- new ApplicationProperties(Collections.emptyMap()),
- 0
- );
+ new ApplicationProperties(Map.of()),
+ 0);
}
private Message_1_0 createTestMessage(final ApplicationProperties applicationProperties)
{
return createTestMessage(new Header(),
- new DeliveryAnnotations(Collections.emptyMap()),
- new MessageAnnotations(Collections.emptyMap()),
+ new DeliveryAnnotations(Map.of()),
+ new MessageAnnotations(Map.of()),
new Properties(),
applicationProperties,
- 0
- );
+ 0);
}
private Message_1_0 createTestMessage(final Header header,
@@ -974,26 +848,20 @@ public class PropertyConverter_1_0_to_0_8Test extends UnitTestBase
final StoredMessage<MessageMetaData_1_0> storedMessage = mock(StoredMessage.class);
when(storedMessage.getContentSize()).thenReturn(0);
when(storedMessage.getContent(0, 0)).thenReturn(QpidByteBuffer.emptyQpidByteBuffer());
- MessageMetaData_1_0 metaData = new MessageMetaData_1_0(header.createEncodingRetainingSection(),
- deliveryAnnotations.createEncodingRetainingSection(),
- messageAnnotations.createEncodingRetainingSection(),
- properties.createEncodingRetainingSection(),
- applicationProperties.createEncodingRetainingSection(),
- new Footer(Collections.emptyMap()).createEncodingRetainingSection(),
- arrivalTime,
- 0);
+ final MessageMetaData_1_0 metaData = new MessageMetaData_1_0(header.createEncodingRetainingSection(),
+ deliveryAnnotations.createEncodingRetainingSection(),
+ messageAnnotations.createEncodingRetainingSection(),
+ properties.createEncodingRetainingSection(),
+ applicationProperties.createEncodingRetainingSection(),
+ new Footer(Map.of()).createEncodingRetainingSection(),
+ arrivalTime,
+ 0);
when(storedMessage.getMetaData()).thenReturn(metaData);
return new Message_1_0(storedMessage);
}
private String generateLongString()
{
- StringBuilder buffer = new StringBuilder();
- for (int i = 0; i < AMQShortString.MAX_LENGTH + 1; i++)
- {
- buffer.append('x');
- }
-
- return buffer.toString();
+ return "x".repeat(AMQShortString.MAX_LENGTH + 1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org