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 d0a9e30054 QPID-8650: [Broker-J] JUnit 5 tests refactoring for
broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 (#188)
d0a9e30054 is described below
commit d0a9e3005402af658b109a6163b0670ee92dd7d4
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Thu Jun 29 09:53:00 2023 +0200
QPID-8650: [Broker-J] JUnit 5 tests refactoring for
broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 (#188)
---
.../PropertyConverter_0_10_to_0_8Test.java | 365 +++++++++------------
.../PropertyConverter_0_8_to_0_10Test.java | 272 +++++++--------
2 files changed, 267 insertions(+), 370 deletions(-)
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_10_to_0_8Test.java
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_10_to_0_8Test.java
index 6ff1170fea..b47e8fc945 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_10_to_0_8Test.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_10_to_0_8Test.java
@@ -25,12 +25,10 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
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.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -43,6 +41,7 @@ import
org.apache.qpid.server.protocol.converter.MessageConversionException;
import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage;
import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Header;
import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryMode;
import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryPriority;
import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
@@ -54,533 +53,473 @@ import
org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_0_10_to_0_8Test extends UnitTestBase
+@SuppressWarnings("unchecked")
+class PropertyConverter_0_10_to_0_8Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_0_10_to_0_8 _messageConverter;
@BeforeAll
- public void setUp()
+ void setUp()
{
_namedAddressSpace = mock(NamedAddressSpace.class);
_messageConverter = new MessageConverter_0_10_to_0_8();
}
@Test
- public void testContentTypeConversion()
+ void contentTypeConversion()
{
- String contentType = "test-content-type";
-
+ final String contentType = "test-content-type";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setContentType(contentType);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(contentType, properties.getContentType().toString(),
"Unexpected content type");
}
@Test
- public void testContentEncodingConversion()
+ void contentEncodingConversion()
{
- String contentEncoding = "my-test-encoding";
+ final String contentEncoding = "my-test-encoding";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setContentEncoding(contentEncoding);
- MessageTransferMessage message = createTestMessage(new
DeliveryProperties(), messageProperties, new byte[]{(byte)1}, 0);
-
+ final MessageTransferMessage message =
+ createTestMessage(new DeliveryProperties(), messageProperties,
new byte[]{(byte)1}, 0);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(contentEncoding, properties.getEncoding().toString(),
"Unexpected content encoding");
}
@Test
- public void testApplicationHeadersConversion()
+ void applicationHeadersConversion()
{
- Map<String, Object> headers = new HashMap<>();
- headers.put("testProperty1", "testProperty1Value");
- headers.put("intProperty", 1);
+ final Map<String, Object> headers = Map.of("testProperty1",
"testProperty1Value", "intProperty", 1);
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setApplicationHeaders(headers);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
- assertEquals(headers, new HashMap<>(applicationProperties),
"Unexpected headers");
+ assertEquals(headers, Map.copyOf(applicationProperties), "Unexpected
headers");
}
@Test
- public void testApplicationHeadersConversionWhenQpidSubjectIsPresent()
+ void applicationHeadersConversionWhenQpidSubjectIsPresent()
{
- String testSubject = "testSubject";
- Map<String, Object> headers = new HashMap<>();
- headers.put("qpid.subject", testSubject);
+ final String testSubject = "testSubject";
+ final Map<String, Object> headers = Map.of("qpid.subject",
testSubject);
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setApplicationHeaders(headers);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
- assertEquals(testSubject, applicationProperties.get("qpid.subject"),
- "Unexpected subject in application properties");
-
+ assertEquals(testSubject, applicationProperties.get("qpid.subject"),
"Unexpected subject in application properties");
}
@Test
- public void testPersistentDeliveryModeConversion()
+ void persistentDeliveryModeConversion()
{
- MessageDeliveryMode deliveryMode = MessageDeliveryMode.PERSISTENT;
+ final MessageDeliveryMode deliveryMode =
MessageDeliveryMode.PERSISTENT;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setDeliveryMode(deliveryMode);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(deliveryMode.getValue(), (long)
properties.getDeliveryMode(), "Unexpected deliveryMode");
-
}
@Test
- public void testNonPersistentDeliveryModeConversion()
+ void nonPersistentDeliveryModeConversion()
{
- MessageDeliveryMode deliveryMode = MessageDeliveryMode.NON_PERSISTENT;
+ final MessageDeliveryMode deliveryMode =
MessageDeliveryMode.NON_PERSISTENT;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setDeliveryMode(deliveryMode);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(deliveryMode.getValue(), (long)
properties.getDeliveryMode(), "Unexpected deliveryMode");
}
@Test
- public void testPriorityConversion()
+ void priorityConversion()
{
final byte priority = 5;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setPriority(MessageDeliveryPriority.get(priority));
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(priority, (long) properties.getPriority(), "Unexpected
priority");
}
@Test
- public void testCorrelationIdConversion()
+ void correlationIdConversion()
{
final String correlationId = "testCorrelationId";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setCorrelationId(correlationId.getBytes());
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(correlationId, properties.getCorrelationId().toString(),
"Unexpected correlationId");
}
@Test
- public void testCorrelationIdConversionWhenLengthExceeds255()
+ void correlationIdConversionWhenLengthExceeds255()
{
final String correlationId = generateLongString();
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setCorrelationId(correlationId.getBytes());
- MessageTransferMessage message = createTestMessage(messageProperties);
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
- 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 testCorrelationIdConversionWhenNotString()
+ void correlationIdConversionWhenNotString()
{
final byte[] correlationId = new byte[] {(byte) 0xc3, 0x28};
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setCorrelationId(correlationId);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(correlationId,
properties.getCorrelationId().getBytes(), "Unexpected correlationId");
-
}
@Test
- public void testReplyToConversionWhenExchangeAndRoutingKeySpecified()
+ void replyToConversionWhenExchangeAndRoutingKeySpecified()
{
final String exchangeName = "amq.direct";
final String routingKey = "test_routing_key";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo(exchangeName, routingKey));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final String expectedReplyTo =
String.format("direct://%s//?routingkey='%s'", exchangeName, routingKey);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- String expectedReplyTo =
String.format("direct://%s//?routingkey='%s'", exchangeName, routingKey);
assertEquals(expectedReplyTo, properties.getReplyTo().toString(),
"Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenExchangeSpecified()
+ void replyToConversionWhenExchangeSpecified()
{
final String exchangeName = "amq.direct";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo(exchangeName, null));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final String expectedReplyTo = String.format("direct://%s//",
exchangeName);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- String expectedReplyTo = String.format("direct://%s//", exchangeName);
assertEquals(expectedReplyTo, properties.getReplyTo().toString(),
"Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenRoutingKeySpecified()
+ void replyToConversionWhenRoutingKeySpecified()
{
final String routingKey = "test_routing_key";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo(null, routingKey));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final String expectedReplyTo =
String.format("direct:////?routingkey='%s'", routingKey);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- String expectedReplyTo = String.format("direct:////?routingkey='%s'",
routingKey);
assertEquals(expectedReplyTo, properties.getReplyTo().toString(),
"Unexpected reply-to");
}
@Test
- public void
testReplyToConversionWhenExchangeIsEmptyStringAndRoutingKeySpecified()
+ void replyToConversionWhenExchangeIsEmptyStringAndRoutingKeySpecified()
{
final String routingKey = "test_routing_key";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo("", routingKey));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final String expectedReplyTo =
String.format("direct:////?routingkey='%s'", routingKey);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- String expectedReplyTo = String.format("direct:////?routingkey='%s'",
routingKey);
assertEquals(expectedReplyTo, properties.getReplyTo().toString(),
"Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenExchangeAndRoutingKeyAreNull()
+ void replyToConversionWhenExchangeAndRoutingKeyAreNull()
{
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo(null, null));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertNull(properties.getReplyTo(), "Unexpected reply-to");
}
@Test
- public void testReplyToConversionWhenResultExceeds255()
+ void replyToConversionWhenResultExceeds255()
{
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setReplyTo(new ReplyTo(generateLongString(255),
generateLongString(255)));
- MessageTransferMessage message = createTestMessage(messageProperties);
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
- 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 testExpirationConversion()
+ void expirationConversion()
{
- long timestamp = System.currentTimeMillis();
- int ttl = 100000;
+ final long timestamp = System.currentTimeMillis();
+ final int ttl = 100000;
final long expiration = timestamp + ttl;
-
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setExpiration(expiration);
- MessageTransferMessage message = createTestMessage(deliveryProperties,
new MessageProperties(), null, timestamp);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties, new MessageProperties(), null, timestamp);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(expiration, properties.getExpiration(), "Unexpected
expiration");
}
@Test
- public void testTTLConversion()
+ void TTLConversion()
{
- long timestamp = System.currentTimeMillis();
- int ttl = 100000;
-
+ final long timestamp = System.currentTimeMillis();
+ final int ttl = 100000;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setTtl(ttl);
- MessageTransferMessage message = createTestMessage(deliveryProperties,
new MessageProperties(), null, timestamp);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties, new MessageProperties(), null, timestamp);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(timestamp + ttl, properties.getExpiration(), "Unexpected
expiration");
}
@Test
- public void testMessageIdConversion()
+ void messageIdConversion()
{
- UUID messageId = UUID.randomUUID();
+ final UUID messageId = UUID.randomUUID();
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setMessageId(messageId);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals("ID:" + messageId, properties.getMessageId().toString(),
"Unexpected messageId");
}
@Test
- public void testTimestampConversion()
+ void timestampConversion()
{
final DeliveryProperties deliveryProperties = new DeliveryProperties();
final long timestamp = System.currentTimeMillis() - 1000;
deliveryProperties.setTimestamp(timestamp);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(timestamp, properties.getTimestamp(), "Unexpected
creation timestamp");
}
@Test
- public void testArrivalTimeConversion()
+ void arrivalTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 1000;
- MessageTransferMessage message = createTestMessage(new
DeliveryProperties(), new MessageProperties(), null, timestamp);
+ final MessageTransferMessage message =
+ createTestMessage(new DeliveryProperties(), new
MessageProperties(), null, timestamp);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(timestamp, properties.getTimestamp(), "Unexpected
creation timestamp");
}
@Test
- public void testJmsTypeConversion()
+ void jmsTypeConversion()
{
final String type = "test-type";
- final Map<String, Object> headers =
Collections.singletonMap("x-jms-type", type);
+ final Map<String, Object> headers = Map.of("x-jms-type", type);
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setApplicationHeaders(headers);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
-
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
assertEquals(type, properties.getType().toString(), "Unexpected
subject");
- Map<String, Object> applicationProperties =
properties.getHeadersAsMap();
- assertFalse(applicationProperties.containsKey("x-jms-type"),
- "Unexpected x-jms-type in application properties");
-
+ assertFalse(applicationProperties.containsKey("x-jms-type"),
"Unexpected x-jms-type in application properties");
}
@Test
- public void testJmsTypeConversionWhenLengthExceeds255()
+ void jmsTypeConversionWhenLengthExceeds255()
{
final String type = generateLongString();
- final Map<String, Object> headers =
Collections.singletonMap("x-jms-type", type);
+ final Map<String, Object> headers = Map.of("x-jms-type", type);
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setApplicationHeaders(headers);
- MessageTransferMessage message = createTestMessage(messageProperties);
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
- 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 testUserIdConversion()
+ void userIdConversion()
{
final String userId = "test-userId";
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setUserId(userId.getBytes());
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(userId, properties.getUserId().toString(), "Unexpected
user-id");
}
@Test
- public void testUserIdConversionExceeds255()
+ void userIdConversionExceeds255()
{
final String userId = generateLongString();
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setUserId(userId.getBytes());
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertNull(properties.getUserId(), "Unexpected user-id");
}
@Test
- public void testUserIdConversionWhenNotUtf8()
+ void userIdConversionWhenNotUtf8()
{
final byte[] userId = new byte[] {(byte) 0xc3, 0x28};
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setUserId(userId);
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertArrayEquals(userId, properties.getUserId().getBytes(),
"Unexpected user-id");
}
@Test
- public void testExchangeConversion()
+ void exchangeConversion()
{
final String testExchange = "testExchange";
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setExchange(testExchange);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
assertEquals(testExchange,
messagePublishInfo.getExchange().toString(), "Unexpected exchange");
}
@Test
- public void testRoutingKeyConversion()
+ void routingKeyConversion()
{
final String testRoutingKey = "testRoutingKey";
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setRoutingKey(testRoutingKey);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
assertEquals(testRoutingKey,
messagePublishInfo.getRoutingKey().toString(), "Unexpected routing key");
}
@Test
- public void testImmediateTrueConversion()
+ void immediateTrueConversion()
{
final boolean immediate = true;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setImmediate(immediate);
-
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
assertEquals(immediate, messagePublishInfo.isImmediate(), "Unexpected
immediate flag");
}
@Test
- public void testImmediateFalseConversion()
+ void immediateFalseConversion()
{
final boolean immediate = false;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setImmediate(immediate);
-
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
assertEquals(immediate, messagePublishInfo.isImmediate(), "Unexpected
immediate flag");
}
@Test
- public void testDiscardUnroutableTrueConversion()
+ void discardUnroutableTrueConversion()
{
final boolean discardUnroutable = true;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setDiscardUnroutable(discardUnroutable);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
-
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
final Object expected = !discardUnroutable;
+
assertEquals(expected, messagePublishInfo.isMandatory(), "Unexpected
mandatory flag");
}
@Test
- public void testDiscardUnroutableFalseConversion()
+ void discardUnroutableFalseConversion()
{
final boolean discardUnroutable = false;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setDiscardUnroutable(discardUnroutable);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
-
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
-
- MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
+ final MessagePublishInfo messagePublishInfo =
convertedMessage.getMessagePublishInfo();
final Object expected = !discardUnroutable;
+
assertEquals(expected, messagePublishInfo.isMandatory(), "Unexpected
mandatory flag");
}
@Test
- public void testApplicationIdConversion()
+ void applicationIdConversion()
{
- String applicationId = "testAppId";
- MessageProperties messageProperties = new MessageProperties();
+ final String applicationId = "testAppId";
+ final MessageProperties messageProperties = new MessageProperties();
messageProperties.setAppId(applicationId.getBytes(UTF_8));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertEquals(applicationId, properties.getAppId().toString(),
"Unexpected application id");
}
@Test
- public void testApplicationIdConversionWhenLengthExceeds255()
+ void applicationIdConversionWhenLengthExceeds255()
{
- String appId = generateLongString();
- MessageProperties messageProperties = new MessageProperties();
+ final String appId = generateLongString();
+ final MessageProperties messageProperties = new MessageProperties();
messageProperties.setAppId(appId.getBytes(UTF_8));
- MessageTransferMessage message = createTestMessage(messageProperties);
-
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final AMQMessage convertedMessage = _messageConverter.convert(message,
_namedAddressSpace);
+ final BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
- BasicContentHeaderProperties properties =
convertedMessage.getContentHeaderBody().getProperties();
assertNull(properties.getAppId(), "Unexpected application id");
}
@@ -589,15 +528,9 @@ public class PropertyConverter_0_10_to_0_8Test extends
UnitTestBase
return generateLongString(AMQShortString.MAX_LENGTH + 1);
}
- private String generateLongString(int stringLength)
+ private String generateLongString(final int stringLength)
{
- StringBuilder buffer = new StringBuilder();
- for(int i = 0; i < stringLength ; i++)
- {
- buffer.append('x');
- }
-
- return buffer.toString();
+ return "x".repeat(Math.max(0, stringLength));
}
private MessageTransferMessage createTestMessage(final DeliveryProperties
deliveryProperties)
@@ -615,8 +548,8 @@ public class PropertyConverter_0_10_to_0_8Test extends
UnitTestBase
final byte[] content,
final long arrivalTime)
{
- int bodySize = content == null ? 0 : content.length;
- final org.apache.qpid.server.protocol.v0_10.transport.Header header =
new org.apache.qpid.server.protocol.v0_10.transport.Header(deliveryProperties,
messageProperties);
+ final int bodySize = content == null ? 0 : content.length;
+ final Header header = new Header(deliveryProperties,
messageProperties);
final MessageMetaData_0_10 metaData = new MessageMetaData_0_10(header,
bodySize, arrivalTime);
final StoredMessage<MessageMetaData_0_10> storedMessage =
mock(StoredMessage.class);
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
index f2e568c11b..8d22020486 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
@@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -50,433 +49,399 @@ import
org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_0_8_to_0_10Test extends UnitTestBase
+@SuppressWarnings("unchecked")
+class PropertyConverter_0_8_to_0_10Test extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_0_8_to_0_10 _messageConverter;
@BeforeAll
- public void setUp()
+ void setUp()
{
_namedAddressSpace = mock(NamedAddressSpace.class);
_messageConverter = new MessageConverter_0_8_to_0_10();
}
@Test
- public void testContentTypeConversion()
+ void contentTypeConversion()
{
- String contentType = "test-content-type";
- BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
+ final String contentType = "test-content-type";
+ final BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
basicContentHeaderProperties.setContentType(contentType);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(contentType, messageProperties.getContentType(),
"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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(contentEncoding, messageProperties.getContentEncoding(),
"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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
- Map<String, Object> applicationProperties =
messageProperties.getApplicationHeaders();
- assertEquals(headers, new HashMap<>(applicationProperties),
"Unexpected applicationProperties");
+ final Map<String, Object> applicationProperties =
messageProperties.getApplicationHeaders();
+
+ assertEquals(headers, Map.copyOf(applicationProperties), "Unexpected
applicationProperties");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
- assertEquals(MessageDeliveryMode.PERSISTENT,
deliveryProperties.getDeliveryMode(), "Unexpected deliveryMode");
+ assertEquals(MessageDeliveryMode.PERSISTENT,
deliveryProperties.getDeliveryMode(), "Unexpected deliveryMode");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(MessageDeliveryMode.NON_PERSISTENT,
deliveryProperties.getDeliveryMode(), "Unexpected deliveryMode");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(priority, (long)
deliveryProperties.getPriority().getValue(), "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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(correlationId, new
String(messageProperties.getCorrelationId(), UTF_8), "Unexpected
correlationId");
}
@Test
- public void testApplicationIdConversion()
+ void applicationIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
final String applicationId = "testApplicationId";
basicContentHeaderProperties.setAppId(applicationId);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(applicationId, new String(messageProperties.getAppId(),
UTF_8), "Unexpected applicationId");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals("amq.direct",
messageProperties.getReplyTo().getExchange(), "Unexpected reply-to exchange");
assertEquals("test_routing_key",
messageProperties.getReplyTo().getRoutingKey(), "Unexpected reply-to
routing-key");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals("amq.direct",
messageProperties.getReplyTo().getExchange(), "Unexpected reply-to exchange");
assertEquals("queue_name",
messageProperties.getReplyTo().getRoutingKey(), "Unexpected reply-to
routing-key");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertNull(messageProperties.getReplyTo().getExchange(), "Unexpected
reply-to exchange");
assertEquals("queue_name",
messageProperties.getReplyTo().getRoutingKey(), "Unexpected reply-to
routing-key");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertNull(messageProperties.getReplyTo().getExchange(), "Unexpected
reply-to exchange");
assertEquals("test_routing_key",
messageProperties.getReplyTo().getRoutingKey(), "Unexpected reply-to
routing-key");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertFalse(messageProperties.getReplyTo().hasExchange(), "Unexpected
reply-to exchange");
assertEquals("test", messageProperties.getReplyTo().getRoutingKey(),
"Unexpected reply-to routing-key");
}
@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);
basicContentHeaderProperties.setTimestamp(timestamp);
- AMQMessage message = createTestMessage(basicContentHeaderProperties,
timestamp);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties, timestamp);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(ttl, deliveryProperties.getTtl(), "Unexpected TTL");
assertEquals(expiration, deliveryProperties.getExpiration(),
"Unexpected expiration");
}
@Test
- public void testUuidMessageIdConversion()
+ void uuidMessageIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
final UUID messageId = UUID.randomUUID();
basicContentHeaderProperties.setMessageId(messageId.toString());
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(messageId, messageProperties.getMessageId(), "Unexpected
messageId");
}
@Test
- public void testUuidMessageIdWithPrefixConversion()
+ void uuidMessageIdWithPrefixConversion()
{
- 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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(messageId, messageProperties.getMessageId(), "Unexpected
messageId");
}
@Test
- public void testNonUuidMessageIdConversion()
+ void nonUuidMessageIdConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
final String messageId = "testMessageId";
basicContentHeaderProperties.setMessageId("ID:" + messageId);
- AMQMessage message = createTestMessage(basicContentHeaderProperties);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(UUID.nameUUIDFromBytes(messageId.getBytes(UTF_8)),
messageProperties.getMessageId(),
"Unexpected message id");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(timestamp, deliveryProperties.getTimestamp(), "Unexpected
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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
- Map<String, Object> applicationProperties =
messageProperties.getApplicationHeaders();
+ final Map<String, Object> applicationProperties =
messageProperties.getApplicationHeaders();
+
assertEquals(type, applicationProperties.get("x-jms-type"),
"Unexpected x-jms-type in application headers");
}
@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 MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(userId, new String(messageProperties.getUserId(), UTF_8),
"Unexpected user-id");
}
@Test
- public void testPublishInfoExchangeConversion()
+ void publishInfoExchangeConversion()
{
final String testExchange = "testExchange";
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setExchange(AMQShortString.valueOf(testExchange));
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(testExchange, deliveryProperties.getExchange(),
"Unexpected exchange");
}
@Test
- public void testPublishInfoRoutingKeyConversion()
+ void publishInfoRoutingKeyConversion()
{
final String testRoutingKey = "testRoutingKey";
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setRoutingKey(AMQShortString.valueOf(testRoutingKey));
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(testRoutingKey, deliveryProperties.getRoutingKey(),
"Unexpected routing-key");
}
@Test
- public void testPublishInfoImmediateTrueConversion()
+ void publishInfoImmediateTrueConversion()
{
final boolean immediate = true;
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setImmediate(immediate);
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(immediate, deliveryProperties.getImmediate(), "Unexpected
immediate flag");
}
@Test
- public void testPublishInfoImmediateFalseConversion()
+ void publishInfoImmediateFalseConversion()
{
final boolean immediate = false;
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setImmediate(immediate);
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
+
assertEquals(immediate, deliveryProperties.getImmediate(), "Unexpected
immediate flag");
}
@Test
- public void testPublishInfoMandatoryTrueConversion()
+ void publishInfoMandatoryTrueConversion()
{
final boolean mandatory = true;
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setMandatory(mandatory);
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
final Object expected = !mandatory;
+
assertEquals(expected, deliveryProperties.getDiscardUnroutable(),
"Unexpected discard-unroutable flag");
}
@Test
- public void testPublishInfoMandatoryFalseConversion()
+ void publishInfoMandatoryFalseConversion()
{
final boolean mandatory = false;
- AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
+ final AMQMessage message = createTestMessage(new
BasicContentHeaderProperties());
message.getMessagePublishInfo().setMandatory(mandatory);
-
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
final Object expected = !mandatory;
+
assertEquals(expected, deliveryProperties.getDiscardUnroutable(),
"Unexpected discard-unroutable flag");
}
@Test
- public void testContentLengthConversion()
+ void contentLengthConversion()
{
- BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
+ final BasicContentHeaderProperties basicContentHeaderProperties = new
BasicContentHeaderProperties();
final byte[] content = {(byte) 1, (byte) 2};
- AMQMessage message = createTestMessage(basicContentHeaderProperties,
content, 0);
-
+ final AMQMessage message =
createTestMessage(basicContentHeaderProperties, content, 0);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
-
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
+
assertEquals(content.length, messageProperties.getContentLength(),
"Unexpected content-length");
}
@@ -486,21 +451,21 @@ public class PropertyConverter_0_8_to_0_10Test 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)
{
@@ -512,7 +477,6 @@ public class PropertyConverter_0_8_to_0_10Test extends
UnitTestBase
when(storedMessage.getContentSize()).thenReturn(0);
when(storedMessage.getContent(0,
0)).thenReturn(QpidByteBuffer.emptyQpidByteBuffer());
}
-
return new AMQMessage(storedMessage);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
