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 22fb7c09cc QPID-8646: [Broker-J] JUnit 5 tests refactoring for
broker-plugins/amqp-0-10-protocol (#184)
22fb7c09cc is described below
commit 22fb7c09cc42cb543f8872fe6f429fb27623eccc
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Wed May 24 08:49:11 2023 +0200
QPID-8646: [Broker-J] JUnit 5 tests refactoring for
broker-plugins/amqp-0-10-protocol (#184)
---
.../MessageConverter_0_10_to_InternalTest.java | 110 ++++----
.../MessageConverter_Internal_to_0_10Test.java | 88 +++---
.../v0_10/MessageTransferMessageMutatorTest.java | 23 +-
.../PropertyConverter_0_10_to_InternalTest.java | 138 +++++-----
.../PropertyConverter_Internal_to_v0_10Test.java | 299 +++++++++------------
.../v0_10/ServerConnectionDelegateTest.java | 40 +--
.../protocol/v0_10/ServerSessionDelegateTest.java | 22 +-
.../server/protocol/v0_10/ServerSessionTest.java | 42 ++-
.../protocol/v0_10/WindowCreditManagerTest.java | 10 +-
.../protocol/v0_10/transport/BBDecoderTest.java | 20 +-
.../protocol/v0_10/transport/BBEncoderTest.java | 67 +++--
.../server/protocol/v0_10/transport/GenTest.java | 10 +-
.../protocol/v0_10/transport/RangeSetTest.java | 135 +++++-----
13 files changed, 468 insertions(+), 536 deletions(-)
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_0_10_to_InternalTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_0_10_to_InternalTest.java
index 0f5bc545ba..f2ea6c955c 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_0_10_to_InternalTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_0_10_to_InternalTest.java
@@ -31,7 +31,6 @@ import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,21 +54,20 @@ 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_10_to_InternalTest extends UnitTestBase
+@SuppressWarnings({"rawtypes"})
+class MessageConverter_0_10_to_InternalTest extends UnitTestBase
{
private final MessageConverter_v0_10_to_Internal _converter = new
MessageConverter_v0_10_to_Internal();
-
private final StoredMessage<MessageMetaData_0_10> _handle =
mock(StoredMessage.class);
-
private final MessageMetaData_0_10 _metaData =
mock(MessageMetaData_0_10.class);
private final AMQMessageHeader _amqpHeader = mock(AMQMessageHeader.class);
private final Header _header = mock(Header.class);
+
private MessageProperties _messageProperties;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
-
_messageProperties = new MessageProperties();
when(_handle.getMetaData()).thenReturn(_metaData);
@@ -80,113 +78,112 @@ public class MessageConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testConvertStringMessageBody()
+ void convertStringMessageBody()
{
doTestTextMessage("helloworld", "text/plain");
}
@Test
- public void testConvertEmptyStringMessageBody()
+ void convertEmptyStringMessageBody()
{
doTestTextMessage(null, "text/plain");
}
@Test
- public void testConvertStringXmlMessageBody()
+ void convertStringXmlMessageBody()
{
doTestTextMessage("<helloworld></helloworld>", "text/xml");
}
@Test
- public void testConvertEmptyStringXmlMessageBody()
+ void convertEmptyStringXmlMessageBody()
{
doTestTextMessage(null, "text/xml");
}
@Test
- public void testConvertEmptyStringApplicationXmlMessageBody()
+ void convertEmptyStringApplicationXmlMessageBody()
{
doTestTextMessage(null, "application/xml");
}
@Test
- public void testConvertStringWithContentTypeText()
+ void convertStringWithContentTypeText()
{
doTestTextMessage("foo","text/foobar");
}
@Test
- public void testConvertStringWithContentTypeApplicationXml()
+ void convertStringWithContentTypeApplicationXml()
{
doTestTextMessage("<helloworld></helloworld>","application/xml");
}
@Test
- public void testConvertStringWithContentTypeApplicationXmlDtd()
+ void convertStringWithContentTypeApplicationXmlDtd()
{
doTestTextMessage("<!DOCTYPE name []>","application/xml-dtd");
}
@Test
- public void testConvertStringWithContentTypeApplicationFooXml()
+ void convertStringWithContentTypeApplicationFooXml()
{
doTestTextMessage("<helloworld></helloworld>","application/foo+xml");
}
@Test
- public void testConvertStringWithContentTypeApplicationJson()
+ void convertStringWithContentTypeApplicationJson()
{
doTestTextMessage("[]","application/json");
}
@Test
- public void testConvertStringWithContentTypeApplicationFooJson()
+ void convertStringWithContentTypeApplicationFooJson()
{
doTestTextMessage("[]","application/foo+json");
}
@Test
- public void testConvertStringWithContentTypeApplicationJavascript()
+ void convertStringWithContentTypeApplicationJavascript()
{
doTestTextMessage("var foo","application/javascript");
}
@Test
- public void testConvertStringWithContentTypeApplicationEcmascript()
+ void convertStringWithContentTypeApplicationEcmascript()
{
doTestTextMessage("var foo","application/ecmascript");
}
@Test
- public void testConvertBytesMessageBody()
+ void convertBytesMessageBody()
{
doTestBytesMessage("helloworld".getBytes());
}
@Test
- public void testConvertBytesMessageBodyNoContentType()
+ void convertBytesMessageBodyNoContentType()
{
final byte[] messageContent = "helloworld".getBytes();
doTest(messageContent, null, messageContent, null);
}
@Test
- public void testConvertMessageBodyUnknownContentType()
+ void convertMessageBodyUnknownContentType()
{
final byte[] messageContent = "helloworld".getBytes();
final String mimeType = "my/bytes";
doTest(messageContent, mimeType, messageContent, mimeType);
}
-
@Test
- public void testConvertEmptyBytesMessageBody()
+ void convertEmptyBytesMessageBody()
{
doTestBytesMessage(new byte[0]);
}
@Test
- public void testConvertJmsStreamMessageBody() throws Exception
+ void convertJmsStreamMessageBody() throws Exception
{
final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
final byte[] messageBytes = getJmsStreamMessageBytes(expected);
@@ -196,7 +193,7 @@ public class MessageConverter_0_10_to_InternalTest extends
UnitTestBase
}
@Test
- public void testConvertEmptyJmsStreamMessageBody()
+ void convertEmptyJmsStreamMessageBody()
{
final List<Object> expected = Lists.newArrayList();
final String mimeType = "jms/stream-message";
@@ -204,7 +201,7 @@ public class MessageConverter_0_10_to_InternalTest extends
UnitTestBase
}
@Test
- public void testConvertAmqpListMessageBody()
+ void convertAmqpListMessageBody()
{
final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
final byte[] messageBytes = new
ListToAmqpListConverter().toMimeContent(expected);
@@ -213,107 +210,106 @@ public class MessageConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testConvertEmptyAmqpListMessageBody()
+ void convertEmptyAmqpListMessageBody()
{
final List<Object> expected = Lists.newArrayList();
doTestStreamMessage(null, "amqp/list", expected);
}
@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);
}
@Test
- public void testConvertEmptyJmsMapMessageBody()
+ void convertEmptyJmsMapMessageBody()
{
- doTestMapMessage(null, "jms/map-message", Collections.emptyMap());
+ doTestMapMessage(null, "jms/map-message", Map.of());
}
@Test
- public void testConvertAmqpMapMessageBody()
+ void convertAmqpMapMessageBody()
{
- 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);
}
@Test
- public void testConvertEmptyAmqpMapMessageBody()
+ void convertEmptyAmqpMapMessageBody()
{
- doTestMapMessage(null, "amqp/map", Collections.emptyMap());
+ doTestMapMessage(null, "amqp/map", Map.of());
}
@Test
- public void testConvertObjectStreamMessageBody() throws Exception
+ void convertObjectStreamMessageBody() throws Exception
{
final byte[] messageBytes =
getObjectStreamMessageBytes(UUID.randomUUID());
doTestObjectMessage(messageBytes, "application/java-object-stream",
messageBytes);
}
@Test
- public void testConvertObjectStream2MessageBody() throws Exception
+ void convertObjectStream2MessageBody() throws Exception
{
final byte[] messageBytes =
getObjectStreamMessageBytes(UUID.randomUUID());
doTestObjectMessage(messageBytes,
"application/x-java-serialized-object", messageBytes);
}
@Test
- public void testConvertEmptyObjectStreamMessageBody() throws Exception
+ void convertEmptyObjectStreamMessageBody() throws Exception
{
doTestObjectMessage(null, "application/java-object-stream", new
byte[0]);
}
@Test
- public void testConvertEmptyMessageWithoutContentType()
+ void convertEmptyMessageWithoutContentType()
{
doTest(null, null, null, null);
}
@Test
- public void testConvertEmptyMessageWithUnknownContentType()
+ void convertEmptyMessageWithUnknownContentType()
{
doTest(null, "foo/bar", new byte[0], "foo/bar");
}
@Test
- public void testConvertMessageWithoutContentType() throws Exception
+ void convertMessageWithoutContentType()
{
final byte[] expectedContent = "someContent".getBytes(UTF_8);
doTest(expectedContent, null, expectedContent, 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());
@@ -323,7 +319,7 @@ public class MessageConverter_0_10_to_InternalTest 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;
@@ -354,14 +350,12 @@ public class MessageConverter_0_10_to_InternalTest
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 void doTestTextMessage(final String originalContent, final String
mimeType)
{
-
final byte[] contentBytes;
final String expectedContent;
if (originalContent == null)
@@ -377,7 +371,6 @@ public class MessageConverter_0_10_to_InternalTest extends
UnitTestBase
doTest(contentBytes, mimeType, expectedContent, mimeType);
}
-
private void doTestMapMessage(final byte[] messageBytes,
final String mimeType,
final Map<String, Object> expected)
@@ -400,7 +393,6 @@ public class MessageConverter_0_10_to_InternalTest extends
UnitTestBase
private void doTestObjectMessage(final byte[] messageBytes,
final String mimeType,
final byte[] expectedBytes)
- throws Exception
{
doTest(messageBytes, mimeType, expectedBytes,
"application/x-java-serialized-object");
}
@@ -434,7 +426,7 @@ public class MessageConverter_0_10_to_InternalTest extends
UnitTestBase
{
assertEquals(expectedContent, convertedMessage.getMessageBody(),
"Unexpected content");
}
- String convertedMimeType =
convertedMessage.getMessageHeader().getMimeType();
+ final String convertedMimeType =
convertedMessage.getMessageHeader().getMimeType();
assertEquals(expectedMimeType, convertedMimeType, "Unexpected content
type");
}
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_0_10Test.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_0_10Test.java
index c58b65ea3b..7b41a309ad 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_0_10Test.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_0_10Test.java
@@ -30,8 +30,8 @@ import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
@@ -54,97 +54,97 @@ 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_Internal_to_0_10Test extends UnitTestBase
+class MessageConverter_Internal_to_0_10Test extends UnitTestBase
{
private final MessageConverter_Internal_to_v0_10 _converter = new
MessageConverter_Internal_to_v0_10();
private final StoredMessage<InternalMessageMetaData> _handle =
mock(StoredMessage.class);
private final AMQMessageHeader _amqpHeader = mock(AMQMessageHeader.class);
@Test
- public void testStringMessage() throws Exception
+ void stringMessage() throws Exception
{
- String content = "testContent";
+ final String content = "testContent";
final String mimeType = "text/plain";
doTest(content, mimeType, content.getBytes(UTF_8), mimeType);
}
@Test
- public void testStringMessageWithUnknownMimeType() throws Exception
+ void stringMessageWithUnknownMimeType() throws Exception
{
- String content = "testContent";
+ final String content = "testContent";
final String mimeType = "foo/bar";
doTest(content, mimeType, content.getBytes(UTF_8), "text/plain");
}
@Test
- public void testStringMessageWithoutMimeType() throws Exception
+ void stringMessageWithoutMimeType() throws Exception
{
- String content = "testContent";
+ final String content = "testContent";
doTest(content, null, content.getBytes(UTF_8), "text/plain");
}
@Test
- public void testListMessageWithMimeType() throws Exception
+ void listMessageWithMimeType() throws Exception
{
- ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
+ final ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
final ListToJmsStreamMessage listToJmsStreamMessage = new
ListToJmsStreamMessage();
final byte[] expectedContent =
listToJmsStreamMessage.toMimeContent(content);
doTest(content, "foo/bar", expectedContent,
listToJmsStreamMessage.getMimeType());
}
@Test
- public void testListMessageWithoutMimeType() throws Exception
+ void listMessageWithoutMimeType() throws Exception
{
- ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
+ final ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
final ListToJmsStreamMessage listToJmsStreamMessage = new
ListToJmsStreamMessage();
final byte[] expectedContent =
listToJmsStreamMessage.toMimeContent(content);
doTest(content, null, expectedContent,
listToJmsStreamMessage.getMimeType());
}
@Test
- public void testListMessageWithoutMimeTypeWithNonJmsContent() throws
Exception
+ void listMessageWithoutMimeTypeWithNonJmsContent() throws Exception
{
- ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42,
Lists.newArrayList());
+ final ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42,
Lists.newArrayList());
final ListToAmqpListConverter listToAmqpListConverter = new
ListToAmqpListConverter();
final byte[] expectedContent =
listToAmqpListConverter.toMimeContent(content);
doTest(content, null, expectedContent,
listToAmqpListConverter.getMimeType());
}
@Test
- public void testListMessageWithoutMimeTypeWithNonConvertibleItem() throws
Exception
+ void listMessageWithoutMimeTypeWithNonConvertibleItem() throws Exception
{
- ArrayList<?> content = Lists.newArrayList(new MySerializable());
+ final ArrayList<?> content = Lists.newArrayList(new MySerializable());
final InternalMessage sourceMessage = getAmqMessage(content, null);
doTest(content, null, getObjectStreamMessageBytes(content),
"application/java-object-stream");
}
@Test
- public void testByteArrayMessageWithoutMimeType() throws Exception
+ void byteArrayMessageWithoutMimeType() throws Exception
{
- byte[] content = "testContent".getBytes(UTF_8);
+ final byte[] content = "testContent".getBytes(UTF_8);
doTest(content, null, content, "application/octet-stream");
}
@Test
- public void testByteArrayMessageWithMimeType() throws Exception
+ void byteArrayMessageWithMimeType() throws Exception
{
- byte[] content = "testContent".getBytes(UTF_8);
+ final byte[] content = "testContent".getBytes(UTF_8);
final String mimeType = "foo/bar";
doTest(content, mimeType, content, mimeType);
}
@Test
- public void testEmptyByteArrayMessageWithMimeType() throws Exception
+ void emptyByteArrayMessageWithMimeType() throws Exception
{
- byte[] content = new byte[0];
+ final byte[] content = new byte[0];
final String mimeType = "foo/bar";
doTest(content, mimeType, content, mimeType);
}
@Test
- public void testMapMessageWithMimeType() throws Exception
+ void mapMessageWithMimeType() throws Exception
{
- HashMap<Object, Object> content = new HashMap<>();
+ final HashMap<Object, Object> content = new HashMap<>();
content.put("key1", 37);
content.put("key2", "foo");
final String mimeType = "foo/bar";
@@ -154,9 +154,9 @@ public class MessageConverter_Internal_to_0_10Test extends
UnitTestBase
}
@Test
- public void testMapMessageWithoutMimeType() throws Exception
+ void mapMessageWithoutMimeType() throws Exception
{
- HashMap<Object, Object> content = new HashMap<>();
+ final HashMap<Object, Object> content = new HashMap<>();
content.put("key1", 37);
content.put("key2", "foo");
final MapToJmsMapMessage mapToJmsMapMessage = new MapToJmsMapMessage();
@@ -165,10 +165,10 @@ public class MessageConverter_Internal_to_0_10Test
extends UnitTestBase
}
@Test
- public void testMapMessageWithMimeTypeWithNonJmsContent() throws Exception
+ void mapMessageWithMimeTypeWithNonJmsContent() throws Exception
{
- HashMap<Object, Object> content = new HashMap<>();
- content.put("key", Collections.singletonMap("foo", "bar"));
+ final HashMap<Object, Object> content = new HashMap<>();
+ content.put("key", Map.of("foo", "bar"));
final String mimeType = "foo/bar";
final MapToAmqpMapConverter mapToAmqpMapConverter = new
MapToAmqpMapConverter();
final byte[] expectedContent =
mapToAmqpMapConverter.toMimeContent(content);
@@ -176,47 +176,45 @@ public class MessageConverter_Internal_to_0_10Test
extends UnitTestBase
}
@Test
- public void testMapMessageWithoutMimeTypeWithNonConvertibleEntry() throws
Exception
+ void mapMessageWithoutMimeTypeWithNonConvertibleEntry() throws Exception
{
- HashMap<Object, Object> content = new HashMap<>();
+ final HashMap<Object, Object> content = new HashMap<>();
content.put(37, new MySerializable());
doTest(content, null, getObjectStreamMessageBytes(content),
"application/java-object-stream");
}
@Test
- public void testSerializableMessageWithMimeType() throws Exception
+ void serializableMessageWithMimeType() throws Exception
{
- Serializable content = new MySerializable();
+ final Serializable content = new MySerializable();
final String mimeType = "foo/bar";
doTest(content, mimeType, getObjectStreamMessageBytes(content),
"application/java-object-stream");
}
@Test
- public void testSerializableMessageWithoutMimeType() throws Exception
+ void serializableMessageWithoutMimeType() throws Exception
{
- Serializable content = new MySerializable();
+ final Serializable content = new MySerializable();
doTest(content, null, getObjectStreamMessageBytes(content),
"application/java-object-stream");
}
@Test
- public void testNullMessageWithoutMimeType() throws Exception
+ void nullMessageWithoutMimeType() throws Exception
{
doTest(null, null, 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();
}
}
-
protected InternalMessage getAmqMessage(final Serializable content, final
String mimeType) throws Exception
{
final byte[] serializedContent = getObjectStreamMessageBytes(content);
@@ -248,9 +246,8 @@ public class MessageConverter_Internal_to_0_10Test 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 void doTest(final Serializable messageBytes,
@@ -268,8 +265,8 @@ public class MessageConverter_Internal_to_0_10Test extends
UnitTestBase
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();
@@ -277,7 +274,6 @@ public class MessageConverter_Internal_to_0_10Test extends
UnitTestBase
}
}
-
private static class MySerializable implements Serializable
{
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessageMutatorTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessageMutatorTest.java
index 7f2dccbb40..35e6eba56c 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessageMutatorTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessageMutatorTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -41,56 +41,56 @@ import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestMemoryMessageStore;
import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageTransferMessageMutatorTest extends UnitTestBase
+class MessageTransferMessageMutatorTest extends UnitTestBase
{
private static final short TEST_PRIORITY = (short) 1;
private static final String TEST_HEADER_NAME = "foo";
private static final String TEST_HEADER_VALUE = "bar";
private static final String TEST_CONTENT_TYPE = "text/plain";
private static final String TEST_CONTENT = "testContent";
+
private MessageStore _messageStore;
private MessageTransferMessageMutator _messageMutator;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
_messageStore = new TestMemoryMessageStore();
final MessageTransferMessage message = createTestMessage();
_messageMutator = new MessageTransferMessageMutator(message,
_messageStore);
}
-
@AfterEach
- public void tearDown()
+ void tearDown()
{
_messageStore.closeMessageStore();
}
@Test
- public void setPriority()
+ void setPriority()
{
_messageMutator.setPriority((byte) (TEST_PRIORITY + 1));
assertThat(_messageMutator.getPriority(), is(equalTo((byte)
(TEST_PRIORITY + 1))));
}
@Test
- public void getPriority()
+ void getPriority()
{
assertThat((int) _messageMutator.getPriority(), is(equalTo((int)
TEST_PRIORITY)));
}
@Test
- public void create()
+ void create()
{
_messageMutator.setPriority((byte) (TEST_PRIORITY + 1));
- MessageTransferMessage newMessage = _messageMutator.create();
+ final MessageTransferMessage newMessage = _messageMutator.create();
assertThat(newMessage.getMessageHeader().getPriority(),
is(equalTo((byte) (TEST_PRIORITY + 1))));
assertThat(newMessage.getMessageHeader().getMimeType(),
is(equalTo(TEST_CONTENT_TYPE)));
assertThat(newMessage.getMessageHeader().getHeader(TEST_HEADER_NAME),
is(equalTo(TEST_HEADER_VALUE)));
- QpidByteBuffer content = newMessage.getContent();
+ final QpidByteBuffer content = newMessage.getContent();
final byte[] bytes = new byte[content.remaining()];
content.copyTo(bytes);
@@ -104,7 +104,7 @@ public class MessageTransferMessageMutatorTest extends
UnitTestBase
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setContentType(TEST_CONTENT_TYPE);
-
messageProperties.setApplicationHeaders(Collections.singletonMap(TEST_HEADER_NAME,
TEST_HEADER_VALUE));
+ messageProperties.setApplicationHeaders(Map.of(TEST_HEADER_NAME,
TEST_HEADER_VALUE));
final Header header = new Header(deliveryProperties,
messageProperties);
final QpidByteBuffer content =
QpidByteBuffer.wrap(TEST_CONTENT.getBytes(UTF_8));
@@ -114,5 +114,4 @@ public class MessageTransferMessageMutatorTest extends
UnitTestBase
addedMessage.addContent(content);
return new MessageTransferMessage(addedMessage.allContentAdded(),
null);
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_0_10_to_InternalTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_0_10_to_InternalTest.java
index b8a3ccb1c9..d174855254 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_0_10_to_InternalTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_0_10_to_InternalTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
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;
@@ -49,26 +48,26 @@ import
org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_0_10_to_InternalTest extends UnitTestBase
+class PropertyConverter_0_10_to_InternalTest extends UnitTestBase
{
private NamedAddressSpace _namedAddressSpace;
private MessageConverter_v0_10_to_Internal _messageConverter;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
_namedAddressSpace = mock(NamedAddressSpace.class);
_messageConverter = new MessageConverter_v0_10_to_Internal();
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -77,29 +76,29 @@ public class PropertyConverter_0_10_to_InternalTest extends
UnitTestBase
}
@Test
- public void testApplicationHeadersConversion()
+ void applicationHeadersConversion()
{
- Map<String, Object> headers = new HashMap<>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("testProperty1", "testProperty1Value");
headers.put("intProperty", 1);
headers.put("nullProperty", null);
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setApplicationHeaders(headers);
- MessageTransferMessage message = createTestMessage(messageProperties);
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
- Map<String, Object> header =
convertedMessage.getMessageHeader().getHeaderMap();
+ final Map<String, Object> header =
convertedMessage.getMessageHeader().getHeaderMap();
assertEquals(headers, new HashMap<>(header), "Unexpected headers");
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -109,12 +108,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -124,26 +123,25 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testPriorityConversion()
+ void priorityConversion()
{
final byte priority = 7;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setPriority(MessageDeliveryPriority.get(priority));
- MessageTransferMessage message = createTestMessage(deliveryProperties);
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
assertEquals(priority, (long)
convertedMessage.getMessageHeader().getPriority(), "Unexpected priority");
-
}
@Test
- public void testCorrelationIdConversion()
+ void correlationIdConversion()
{
final byte[] correlationId = "testCorrelationId".getBytes();
final MessageProperties messageProperties = new MessageProperties();
messageProperties.setCorrelationId(correlationId);
- MessageTransferMessage message = createTestMessage(messageProperties);
+ final MessageTransferMessage message =
createTestMessage(messageProperties);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -152,12 +150,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -166,27 +164,27 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
- String expectedReplyTo = String.format("%s/%s", exchangeName,
routingKey);
+ final String expectedReplyTo = String.format("%s/%s", exchangeName,
routingKey);
assertEquals(expectedReplyTo,
convertedMessage.getMessageHeader().getReplyTo(), "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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -194,12 +192,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -207,12 +205,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -220,11 +218,11 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -232,15 +230,15 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 =
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties, new MessageProperties(),
null, timestamp);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -249,14 +247,14 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 =
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties, new MessageProperties(),
null, timestamp);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -265,15 +263,15 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testTtlTakesPrecedenceOverExpiration()
+ void ttlTakesPrecedenceOverExpiration()
{
- long timestamp = System.currentTimeMillis();
- int ttl = 100000;
+ final long timestamp = System.currentTimeMillis();
+ final int ttl = 100000;
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setTtl(ttl);
deliveryProperties.setExpiration(timestamp + ttl + 10000);
- MessageTransferMessage message =
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties, new MessageProperties(),
null, timestamp);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -282,12 +280,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -295,12 +293,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -308,10 +306,10 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testArrivalTimeConversion()
+ void arrivalTimeConversion()
{
final long timestamp = System.currentTimeMillis() - 1000;
- MessageTransferMessage message =
+ final MessageTransferMessage message =
createTestMessage(new DeliveryProperties(), new
MessageProperties(), null, timestamp);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -320,13 +318,13 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -334,12 +332,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -347,12 +345,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -360,12 +358,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -373,14 +371,14 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@Test
- public void testInitialRoutingAddressConversion()
+ void initialRoutingAddressConversion()
{
final String testExchange = "testExchange";
final DeliveryProperties deliveryProperties = new DeliveryProperties();
deliveryProperties.setExchange(testExchange);
final String testRoutingKey = "testRoutingKey";
deliveryProperties.setRoutingKey(testRoutingKey);
- MessageTransferMessage message = createTestMessage(deliveryProperties);
+ final MessageTransferMessage message =
createTestMessage(deliveryProperties);
final InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -388,12 +386,12 @@ public class PropertyConverter_0_10_to_InternalTest
extends UnitTestBase
}
@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 InternalMessage convertedMessage =
_messageConverter.convert(message, _namedAddressSpace);
@@ -415,7 +413,7 @@ public class PropertyConverter_0_10_to_InternalTest extends
UnitTestBase
final byte[] content,
final long arrivalTime)
{
- int bodySize = content == null ? 0 : content.length;
+ final 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 MessageMetaData_0_10 metaData = new MessageMetaData_0_10(header,
bodySize, arrivalTime);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
index e87b2fdbf7..d5e116892f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
@@ -27,8 +27,8 @@ 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.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -43,7 +43,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.math.BigDecimal;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -67,14 +66,15 @@ import
org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_Internal_to_v0_10Test extends UnitTestBase
+class PropertyConverter_Internal_to_v0_10Test extends UnitTestBase
{
private static final int AMQP_0_8_SHORT_STRING_MAX_LENGTH = 255;
+
private MessageConverter_Internal_to_v0_10 _messageConverter;
private NamedAddressSpace _addressSpace;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
_addressSpace = mock(NamedAddressSpace.class);
when(_addressSpace.getLocalAddress(anyString())).then(returnsFirstArg());
@@ -82,12 +82,12 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testPersistentTrueConversion() throws IOException
+ void persistentTrueConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
- InternalMessage originalMessage = createTestMessage(header, null,
true, System.currentTimeMillis());
+ final InternalMessage originalMessage = createTestMessage(header,
null, true, System.currentTimeMillis());
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(MessageDeliveryMode.PERSISTENT,
convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode(),
"Unexpected delivery mode");
@@ -98,12 +98,12 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testPersistentFalseConversion() throws IOException
+ void persistentFalseConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
- InternalMessage originalMessage = createTestMessage(header, null,
false, System.currentTimeMillis());
+ final InternalMessage originalMessage = createTestMessage(header,
null, false, System.currentTimeMillis());
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(MessageDeliveryMode.NON_PERSISTENT,
convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode(),
"Unexpected delivery mode");
@@ -113,14 +113,14 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testPriorityConversion() throws IOException
+ void priorityConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
- byte priority = (byte) 7;
+ final byte priority = (byte) 7;
when(header.getPriority()).thenReturn(priority);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(priority, (long)
convertedMessage.getHeader().getDeliveryProperties().getPriority().getValue(),
"Unexpected priority");
@@ -128,16 +128,16 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testExpirationConversion() throws IOException
+ void expirationConversion() throws IOException
{
- long ttl = 10000;
- long arrivalTime = System.currentTimeMillis();
- long expiryTime = arrivalTime + ttl;
+ final long ttl = 10000;
+ final long arrivalTime = System.currentTimeMillis();
+ final long expiryTime = arrivalTime + ttl;
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getExpiration()).thenReturn(expiryTime);
- InternalMessage originalMessage = createTestMessage(header,
arrivalTime);
+ final InternalMessage originalMessage = createTestMessage(header,
arrivalTime);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(expiryTime,
convertedMessage.getHeader().getDeliveryProperties().getExpiration(),
"Unexpected expiration time");
@@ -146,159 +146,146 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testContentEncodingConversion() throws IOException
+ void contentEncodingConversion() throws IOException
{
- String contentEncoding = "my-test-encoding";
+ final String contentEncoding = "my-test-encoding";
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getEncoding()).thenReturn(contentEncoding);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(contentEncoding,
convertedMessage.getHeader().getMessageProperties().getContentEncoding(),
"Unexpected content encoding");
}
@Test
- public void testLongContentEncodingConversion() throws IOException
+ void longContentEncodingConversion() throws IOException
{
- String contentEncoding = generateLongString();
+ final String contentEncoding = generateLongString();
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getEncoding()).thenReturn(contentEncoding);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- try
- {
- _messageConverter.convert(originalMessage, _addressSpace);
- fail("Expected exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(originalMessage,
_addressSpace),
+ "Expected exception is not thrown");
}
@Test
- public void testMessageIdUUIDConversion() throws IOException
+ void messageIdUUIDConversion() throws IOException
{
- UUID messageId = UUID.randomUUID();
+ final UUID messageId = UUID.randomUUID();
final String messageIdAsString = messageId.toString();
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getMessageId()).thenReturn("ID:" + messageIdAsString);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(messageId,
convertedMessage.getHeader().getMessageProperties().getMessageId(),
"Unexpected messageId");
}
@Test
- public void testMessageIdStringConversion() throws IOException
+ void messageIdStringConversion() throws IOException
{
final String messageId = "testMessageId";
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getMessageId()).thenReturn(messageId);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertNull(convertedMessage.getHeader().getMessageProperties().getMessageId(),
"Unexpected messageId");
}
@Test
- public void testCorrelationIdConversion() throws IOException
+ void correlationIdConversion() throws IOException
{
- String correlationId = "testCorrelationId";
+ final String correlationId = "testCorrelationId";
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getCorrelationId()).thenReturn(correlationId);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertArrayEquals(correlationId.getBytes(UTF_8),
convertedMessage.getHeader().getMessageProperties().getCorrelationId(),
"Unexpected correlationId");
}
@Test
- public void testCorrelationIdConversionWhenLengthExceeds16Bits() throws
IOException
+ void correlationIdConversionWhenLengthExceeds16Bits() throws IOException
{
final String correlationId = generateLongLongString();
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getCorrelationId()).thenReturn(correlationId);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- try
- {
- _messageConverter.convert(originalMessage, _addressSpace);
- fail("Expected exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(originalMessage,
_addressSpace),
+ "Expected exception is not thrown");
}
@Test
- public void testUserIdConversion() throws IOException
+ void userIdConversion() throws IOException
{
final String userId = "testUserId";
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getUserId()).thenReturn(userId);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertArrayEquals(userId.getBytes(UTF_8),
convertedMessage.getHeader().getMessageProperties().getUserId(),
"Unexpected userId");
}
@Test
- public void testUserIdConversionWhenLengthExceeds16Bits() throws
IOException
+ void userIdConversionWhenLengthExceeds16Bits() throws IOException
{
final String userId = generateLongLongString();
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getUserId()).thenReturn(userId);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertNull(convertedMessage.getHeader().getMessageProperties().getUserId(),
"Unexpected userId");
}
@Test
- public void testTimestampConversion() throws IOException
+ void timestampConversion() throws IOException
{
final long timestamp = System.currentTimeMillis();
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getTimestamp()).thenReturn(timestamp);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(timestamp,
convertedMessage.getHeader().getDeliveryProperties().getTimestamp(),
"Unexpected timestamp");
}
@Test
- public void testArrivalTimeConversion() throws IOException
+ void arrivalTimeConversion() throws IOException
{
final long timestamp = System.currentTimeMillis();
- InternalMessage originalMessage =
createTestMessage(mock(AMQMessageHeader.class), timestamp);
+ final InternalMessage originalMessage =
createTestMessage(mock(AMQMessageHeader.class), timestamp);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(timestamp,
convertedMessage.getHeader().getDeliveryProperties().getTimestamp(),
"Unexpected timestamp");
}
@Test
- public void testHeadersConversion() throws IOException
+ void headersConversion() throws IOException
{
- final Map<String, Object> properties = new HashMap<>();
- properties.put("testProperty1", "testProperty1Value");
- properties.put("intProperty", 1);
+ final Map<String, Object> properties = Map.of("testProperty1",
"testProperty1Value",
+ "intProperty", 1);
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getHeaderNames()).thenReturn(properties.keySet());
doAnswer(invocation ->
@@ -306,19 +293,19 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
final String originalArgument = (String)
(invocation.getArguments())[0];
return properties.get(originalArgument);
}).when(header).getHeader(any(String.class));
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
- Map<String, Object> convertedHeaders =
+ final Map<String, Object> convertedHeaders =
convertedMessage.getHeader().getMessageProperties().getApplicationHeaders();
assertEquals(properties, new HashMap<>(convertedHeaders), "Unexpected
application properties");
}
@Test
- public void testHeadersConversionWithUnsupportedTypes() throws IOException
+ void headersConversionWithUnsupportedTypes() throws IOException
{
- final Map<String, Object> properties =
Collections.singletonMap("bigDecimalProperty", new BigDecimal(1));
+ final Map<String, Object> properties = Map.of("bigDecimalProperty",
new BigDecimal(1));
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getHeaderNames()).thenReturn(properties.keySet());
doAnswer(invocation ->
@@ -326,23 +313,17 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
final String originalArgument = (String)
(invocation.getArguments())[0];
return properties.get(originalArgument);
}).when(header).getHeader(any(String.class));
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- try
- {
- _messageConverter.convert(originalMessage, _addressSpace);
- fail("Expected exception not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(originalMessage,
_addressSpace),
+ "Expected exception not thrown");
}
@Test
- public void testHeadersConversionWhenKeyLengthExceeds255() throws
IOException
+ void headersConversionWhenKeyLengthExceeds255() throws IOException
{
- final Map<String, Object> properties =
Collections.singletonMap(generateLongString(), "test");
+ final Map<String, Object> properties = Map.of(generateLongString(),
"test");
final AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getHeaderNames()).thenReturn(properties.keySet());
doAnswer(invocation ->
@@ -350,45 +331,38 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
final String originalArgument = (String)
(invocation.getArguments())[0];
return properties.get(originalArgument);
}).when(header).getHeader(any(String.class));
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- try
- {
- _messageConverter.convert(originalMessage, _addressSpace);
- fail("Expected exception not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(originalMessage,
_addressSpace),
+ "Expected exception not thrown");
}
@Test
- public void testContentLengthConversion() throws IOException
+ void contentLengthConversion() throws IOException
{
- byte[] content = {(byte) 1, (byte) 2};
+ final byte[] content = {(byte) 1, (byte) 2};
- InternalMessage originalMessage =
createTestMessage(mock(AMQMessageHeader.class),
- content, false, 0);
+ final InternalMessage originalMessage =
createTestMessage(mock(AMQMessageHeader.class), content, false, 0);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
assertEquals(content.length,
convertedMessage.getHeader().getMessageProperties().getContentLength(),
"Unexpected timestamp");
}
@Test
- public void testReplyToConversionWhenQueueIsSpecified() throws IOException
+ void replyToConversionWhenQueueIsSpecified() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
final String replyTo = "myTestQueue";
- final Queue queue = mock(Queue.class);
+ final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(replyTo);
doReturn(queue).when(_addressSpace).getAttainedMessageDestination(eq(replyTo),anyBoolean());
when(header.getReplyTo()).thenReturn(replyTo);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
final ReplyTo convertedReplyTo =
convertedMessage.getHeader().getMessageProperties().getReplyTo();
@@ -397,17 +371,17 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testReplyToConversionWhenExchangeIsSpecified() throws
IOException
+ void replyToConversionWhenExchangeIsSpecified() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
final String replyTo = "myTestExchange";
- final Exchange exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(replyTo);
doReturn(exchange).when(_addressSpace).getAttainedMessageDestination(eq(replyTo),anyBoolean());
when(header.getReplyTo()).thenReturn(replyTo);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
final ReplyTo convertedReplyTo =
convertedMessage.getHeader().getMessageProperties().getReplyTo();
@@ -416,19 +390,19 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecified()
throws IOException
+ void replyToConversionWhenExchangeAndRoutingKeyAreSpecified() throws
IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
- final String exchangeName = "testExchnageName";
+ final String exchangeName = "testExchangeName";
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);
doReturn(exchange).when(_addressSpace).getAttainedMessageDestination(eq(exchangeName),anyBoolean());
when(header.getReplyTo()).thenReturn(replyTo);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
final ReplyTo convertedReplyTo =
convertedMessage.getHeader().getMessageProperties().getReplyTo();
@@ -437,14 +411,14 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testReplyToConversionWhenReplyToCannotBeResolved() throws
IOException
+ void replyToConversionWhenReplyToCannotBeResolved() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
final String replyTo = "direct://amq.direct//test?routingkey='test'";
when(header.getReplyTo()).thenReturn(replyTo);
- InternalMessage originalMessage = createTestMessage(header);
+ final InternalMessage originalMessage = createTestMessage(header);
- MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
+ final MessageTransferMessage convertedMessage =
_messageConverter.convert(originalMessage, _addressSpace);
final ReplyTo convertedReplyTo =
convertedMessage.getHeader().getMessageProperties().getReplyTo();
@@ -452,16 +426,15 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
assertEquals(replyTo, convertedReplyTo.getRoutingKey(), "Unexpected
routing key");
}
-
@Test
- public void testToConversionWhenExchangeAndRoutingKeyIsSpecified() throws
IOException
+ void toConversionWhenExchangeAndRoutingKeyIsSpecified() throws IOException
{
final String testExchange = "testExchange";
final String testRoutingKey = "testRoutingKey";
- String to = testExchange + "/" + testRoutingKey;
+ final String to = testExchange + "/" + testRoutingKey;
- InternalMessage message = createTestMessage(to);
+ final InternalMessage message = createTestMessage(to);
final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(testExchange);
@@ -476,11 +449,11 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testToConversionWhenExchangeIsSpecified() throws IOException
+ void toConversionWhenExchangeIsSpecified() throws IOException
{
final String testExchange = "testExchange";
- InternalMessage message = createTestMessage(testExchange);
+ final InternalMessage message = createTestMessage(testExchange);
final Exchange<?> exchange = mock(Exchange.class);
when(exchange.getName()).thenReturn(testExchange);
@@ -495,11 +468,11 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testToConversionWhenQueueIsSpecified() throws IOException
+ void toConversionWhenQueueIsSpecified() throws IOException
{
final String testQueue = "testQueue";
- InternalMessage message = createTestMessage(testQueue);
+ final InternalMessage message = createTestMessage(testQueue);
final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(testQueue);
@@ -514,13 +487,13 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testToConversionWhenGlobalAddressIsUnknown() throws IOException
+ void toConversionWhenGlobalAddressIsUnknown() throws IOException
{
final String queueName = "testQueue";
final String prefix = "/testPrefix";
final String globalAddress = prefix + "/" + queueName;
- InternalMessage message = createTestMessage(globalAddress);
+ final InternalMessage message = createTestMessage(globalAddress);
final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(queueName);
@@ -535,13 +508,13 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testToConversionWhenGlobalAddressIsKnown() throws IOException
+ void toConversionWhenGlobalAddressIsKnown() throws IOException
{
final String queueName = "testQueue";
final String prefix = "/testPrefix";
final String globalAddress = prefix + "/" + queueName;
- InternalMessage message = createTestMessage(globalAddress);
+ final InternalMessage message = createTestMessage(globalAddress);
final Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(queueName);
@@ -556,56 +529,39 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
}
@Test
- public void testToConversionWhenExchangeLengthExceeds255() throws
IOException
+ void toConversionWhenExchangeLengthExceeds255() throws IOException
{
final String testExchange = generateLongString();
final String testRoutingKey = "testRoutingKey";
- String to = testExchange + "/" + testRoutingKey;
+ final String to = testExchange + "/" + testRoutingKey;
- InternalMessage message = createTestMessage(to);
+ final InternalMessage message = createTestMessage(to);
- try
- {
- _messageConverter.convert(message, _addressSpace);
- fail("Exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _addressSpace),
+ "Exception is not thrown");
}
@Test
- public void testToConversionWhenRoutingKeyLengthExceeds255() throws
Exception
+ void toConversionWhenRoutingKeyLengthExceeds255() throws Exception
{
final String testExchange = "testExchange";
final String testRoutingKey = generateLongString();
+ final String to = testExchange + "/" + testRoutingKey;
+ final InternalMessage message = createTestMessage(to);
- String to = testExchange + "/" + testRoutingKey;
-
- InternalMessage message = createTestMessage(to);
-
- try
- {
- _messageConverter.convert(message, _addressSpace);
- fail("Exception is not thrown");
- }
- catch (MessageConversionException e)
- {
- // pass
- }
+ assertThrows(MessageConversionException.class,
+ () -> _messageConverter.convert(message, _addressSpace),
+ "Exception is not thrown");
}
@Test
- public void testToConversionWhenDestinationIsSpecifiedButDoesNotExists()
throws IOException
+ void toConversionWhenDestinationIsSpecifiedButDoesNotExists() throws
IOException
{
final String testDestination = "testDestination";
-
- InternalMessage message = createTestMessage(testDestination);
-
+ final InternalMessage message = createTestMessage(testDestination);
final MessageTransferMessage convertedMessage =
_messageConverter.convert(message, _addressSpace);
-
final DeliveryProperties deliveryProperties =
convertedMessage.getStoredMessage().getMetaData().getDeliveryProperties();
assertEquals("", deliveryProperties.getExchange(), "Unexpected
exchange");
@@ -625,15 +581,15 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
return createTestMessage(header, null, false,
System.currentTimeMillis());
}
-
private InternalMessage createTestMessage(final AMQMessageHeader header,
final long arrivalTime) throws IOException
{
return createTestMessage(header, null, false, arrivalTime);
}
private InternalMessage createTestMessage(final AMQMessageHeader header,
- byte[] content,
- final boolean persistent, final
long arrivalTime) throws IOException
+ final byte[] content,
+ final boolean persistent,
+ final long arrivalTime) throws
IOException
{
final InternalMessageHeader internalMessageHeader = new
InternalMessageHeader(header, arrivalTime);
final StoredMessage<InternalMessageMetaData> storedMessage =
@@ -646,11 +602,11 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
final InternalMessageHeader internalMessageHeader) throws IOException
{
final StoredMessage<InternalMessageMetaData> storedMessage =
mock(StoredMessage.class);
- int contentSize = content == null ? 0 : content.length;
+ final int contentSize = content == null ? 0 : content.length;
if (contentSize > 0)
{
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos))
+ try (final ByteArrayOutputStream baos = new
ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos))
{
oos.writeObject(content);
@@ -672,12 +628,11 @@ public class PropertyConverter_Internal_to_v0_10Test
extends UnitTestBase
private String generateLongString(long stringLength)
{
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
for (long i = 0; i < stringLength; i++)
{
buffer.append('x');
}
-
return buffer.toString();
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegateTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegateTest.java
index 9b5681e800..b031cea972 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegateTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegateTest.java
@@ -38,7 +38,7 @@ import java.security.AccessController;
import java.security.MessageDigest;
import java.security.PrivilegedAction;
import java.util.Base64;
-import java.util.Collections;
+import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -64,7 +64,8 @@ import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.protocol.v0_10.transport.SessionAttach;
import org.apache.qpid.test.utils.UnitTestBase;
-public class ServerConnectionDelegateTest extends UnitTestBase
+@SuppressWarnings({"rawtypes", "unchecked"})
+class ServerConnectionDelegateTest extends UnitTestBase
{
private ServerConnectionDelegate _delegate;
private ServerConnection _serverConnection;
@@ -72,7 +73,7 @@ public class ServerConnectionDelegateTest extends UnitTestBase
private AccessControlContext _accessControlContext;
@BeforeEach
- public void setUp()
+ void setUp()
{
_taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
final Broker broker = mock(Broker.class);
@@ -81,7 +82,7 @@ public class ServerConnectionDelegateTest extends UnitTestBase
when(broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(broker.getModel()).thenReturn(BrokerModel.getInstance());
final AuthenticationProvider authenticationProvider =
mock(AuthenticationProvider.class);
-
when(authenticationProvider.getAvailableMechanisms(anyBoolean())).thenReturn(Collections.singletonList("PLAIN"));
+
when(authenticationProvider.getAvailableMechanisms(anyBoolean())).thenReturn(List.of("PLAIN"));
final AmqpPort<?> port = mock(AmqpPort.class);
when(port.getAuthenticationProvider()).thenReturn(authenticationProvider);
when(port.getParent()).thenReturn(broker);
@@ -89,12 +90,12 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
_delegate = new ServerConnectionDelegate(port, true, "test");
_delegate.setState(ServerConnectionDelegate.ConnectionState.OPEN);
final NamedAddressSpace addressSpace = mock(NamedAddressSpace.class);
-
when(addressSpace.getConnections()).thenReturn(Collections.emptyList());
+ when(addressSpace.getConnections()).thenReturn(List.of());
final Subject subject = new Subject();
subject.setReadOnly();
_accessControlContext = AccessController.getContext();
- final AMQPConnection_0_10 amqpConnection =
mock(AMQPConnection_0_10.class);
+ final AMQPConnection_0_10<?> amqpConnection =
mock(AMQPConnection_0_10.class);
when(amqpConnection.getParent()).thenReturn(broker);
when(amqpConnection.getBroker()).thenReturn(broker);
when(amqpConnection.getChildExecutor()).thenReturn(_taskExecutor);
@@ -104,10 +105,9 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
when(amqpConnection.getContextValue(Integer.class,
org.apache.qpid.server.model.Session.PRODUCER_AUTH_CACHE_SIZE)).thenReturn(Integer.MAX_VALUE);
doAnswer((Answer<AccessControlContext>) invocationOnMock ->
{
- Subject subject1 = invocationOnMock.getArgument(0);
- return AccessController.doPrivileged(
- (PrivilegedAction<AccessControlContext>) () ->
- new AccessControlContext(_accessControlContext,
new SubjectDomainCombiner(subject1)));
+ final Subject subject1 = invocationOnMock.getArgument(0);
+ return
AccessController.doPrivileged((PrivilegedAction<AccessControlContext>) () ->
+ new AccessControlContext(_accessControlContext, new
SubjectDomainCombiner(subject1)));
}).when(amqpConnection).getAccessControlContextFromSubject(any());
when(amqpConnection.getEventLogger()).thenReturn(mock(EventLogger.class));
@@ -118,13 +118,13 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
}
@AfterEach
- public void tearDown()
+ void tearDown()
{
_taskExecutor.stop();
}
@Test
- public void sessionAttachWhenNameIsUUID()
+ void sessionAttachWhenNameIsUUID()
{
final String name = UUID.randomUUID().toString();
final SessionAttach attach = createSessionAttach(name);
@@ -135,12 +135,12 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
verify(_serverConnection).registerSession(sessionCaptor.capture());
final ServerSession serverSession = sessionCaptor.getValue();
- final Session session = serverSession.getModelObject();
+ final Session<?> session = serverSession.getModelObject();
assertThat(session.getPeerSessionName(),
CoreMatchers.is(equalTo(name)));
}
@Test
- public void sessionAttachWhenNameIsNotUUID()
+ void sessionAttachWhenNameIsNotUUID()
{
final String name = "ABC";
final SessionAttach attach = createSessionAttach(name);
@@ -151,14 +151,15 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
verify(_serverConnection).registerSession(sessionCaptor.capture());
final ServerSession serverSession = sessionCaptor.getValue();
- final Session session = serverSession.getModelObject();
+ final Session<?> session = serverSession.getModelObject();
assertThat(session.getPeerSessionName(),
CoreMatchers.is(equalTo(Base64.getEncoder().encodeToString(name.getBytes(UTF_8)))));
}
@Test
- public void sessionAttachWhenNameExceedsSizeLimit() throws Exception
+ void sessionAttachWhenNameExceedsSizeLimit() throws Exception
{
- final String name = Stream.generate(() ->
String.valueOf('a')).limit(BASE64_LIMIT + 1).collect(Collectors.joining());;
+ final String name = Stream.generate(() ->
+ String.valueOf('a')).limit(BASE64_LIMIT +
1).collect(Collectors.joining());;
final SessionAttach attach = createSessionAttach(name);
_delegate.sessionAttach(_serverConnection, attach);
@@ -167,8 +168,9 @@ public class ServerConnectionDelegateTest extends
UnitTestBase
verify(_serverConnection).registerSession(sessionCaptor.capture());
final ServerSession serverSession = sessionCaptor.getValue();
- final Session session = serverSession.getModelObject();
- final String digest =
Base64.getEncoder().encodeToString(MessageDigest.getInstance(MESSAGE_DIGEST_SHA1).digest(name.getBytes(UTF_8)));
+ final Session<?> session = serverSession.getModelObject();
+ final String digest =
Base64.getEncoder().encodeToString(MessageDigest.getInstance(MESSAGE_DIGEST_SHA1)
+ .digest(name.getBytes(UTF_8)));
assertThat(session.getPeerSessionName(),
CoreMatchers.is(equalTo(digest)));
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
index c2c493b791..e5caf51753 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
@@ -40,18 +40,18 @@ import
org.apache.qpid.server.protocol.v0_10.transport.ExecutionException;
import org.apache.qpid.server.protocol.v0_10.transport.Option;
import org.apache.qpid.test.utils.UnitTestBase;
-public class ServerSessionDelegateTest extends UnitTestBase
+class ServerSessionDelegateTest extends UnitTestBase
{
private VirtualHost<?> _host;
private ServerSession _session;
private ServerSessionDelegate _delegate;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
_host = mock(VirtualHost.class);
- ServerConnection serverConnection = mock(ServerConnection.class);
+ final ServerConnection serverConnection = mock(ServerConnection.class);
doReturn(_host).when(serverConnection).getAddressSpace();
_session = mock(ServerSession.class);
@@ -61,9 +61,9 @@ public class ServerSessionDelegateTest extends UnitTestBase
}
@Test
- public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings()
throws Exception
+ void exchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings()
{
- Exchange<?> exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(true);
doReturn(exchange).when(_host).getAttainedMessageDestination(eq(getTestName()),
anyBoolean());
@@ -71,16 +71,15 @@ public class ServerSessionDelegateTest extends UnitTestBase
final ExchangeDelete method = new ExchangeDelete(getTestName(),
Option.IF_UNUSED);
_delegate.exchangeDelete(_session, method);
- verify(_session).invoke(argThat((ArgumentMatcher<ExecutionException>)
exception -> exception.getErrorCode()
-
== ExecutionErrorCode.PRECONDITION_FAILED
-
&& "Exchange has bindings".equals(
- exception.getDescription())));
+ verify(_session).invoke(argThat((ArgumentMatcher<ExecutionException>)
exception ->
+ exception.getErrorCode() ==
ExecutionErrorCode.PRECONDITION_FAILED &&
+ "Exchange has bindings".equals(exception.getDescription())));
}
@Test
- public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding()
throws Exception
+ void exchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding()
{
- Exchange<?> exchange = mock(Exchange.class);
+ final Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(false);
doReturn(exchange).when(_host).getAttainedMessageDestination(eq(getTestName()),
anyBoolean());
@@ -90,5 +89,4 @@ public class ServerSessionDelegateTest extends UnitTestBase
verify(exchange).delete();
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
index c6e2dd48f5..9d0b12febe 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
@@ -26,9 +26,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import javax.security.auth.Subject;
@@ -62,21 +62,21 @@ import
org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.test.utils.UnitTestBase;
-public class ServerSessionTest extends UnitTestBase
+@SuppressWarnings({"rawtypes"})
+class ServerSessionTest extends UnitTestBase
{
private VirtualHost<?> _virtualHost;
- private CurrentThreadTaskExecutor _taskExecutor;
+ private TaskExecutor _taskExecutor;
@BeforeEach
- public void setUp() throws Exception
+ void setUp() throws Exception
{
- _taskExecutor = new CurrentThreadTaskExecutor();
- _taskExecutor.start();
+ _taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
_virtualHost = BrokerTestHelper.createVirtualHost(getTestName(), this);
}
@AfterEach
- public void tearDown() throws Exception
+ void tearDown()
{
try
{
@@ -95,12 +95,12 @@ public class ServerSessionTest extends UnitTestBase
}
@Test
- public void testOverlargeMessageTest()
+ void overlargeMessageTest()
{
final Broker<?> broker = mock(Broker.class);
when(broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0L);
- AmqpPort port = createMockPort();
+ final AmqpPort<?> port = createMockPort();
final AMQPConnection_0_10 modelConnection =
mock(AMQPConnection_0_10.class);
when(modelConnection.getCategoryClass()).thenReturn(Connection.class);
@@ -119,17 +119,16 @@ public class ServerSessionTest extends UnitTestBase
final AuthenticatedPrincipal principal =
new AuthenticatedPrincipal(new
UsernamePrincipal(getTestName(), mock(AuthenticationProvider.class)));
- final Subject subject =
- new Subject(false, Collections.singleton(principal),
Collections.emptySet(), Collections.emptySet());
+ final Subject subject = new Subject(false, Set.of(principal),
Set.of(), Set.of());
when(modelConnection.getSubject()).thenReturn(subject);
when(modelConnection.getMaxMessageSize()).thenReturn(1024L);
when(modelConnection.getCreatedTime()).thenReturn(new Date());
- ServerConnection connection = new ServerConnection(1, broker, port,
Transport.TCP, modelConnection);
+ final ServerConnection connection = new ServerConnection(1, broker,
port, Transport.TCP, modelConnection);
connection.setVirtualHost(_virtualHost);
final List<Method> invokedMethods = new ArrayList<>();
- ServerSession session = new ServerSession(connection, new
ServerSessionDelegate(),
- new
Binary(getTestName().getBytes()), 0)
+ final ServerSession session =
+ new ServerSession(connection, new ServerSessionDelegate(), new
Binary(getTestName().getBytes()), 0)
{
@Override
public void invoke(final Method m)
@@ -137,34 +136,33 @@ public class ServerSessionTest extends UnitTestBase
invokedMethods.add(m);
}
};
- Session_0_10 modelSession = new Session_0_10(modelConnection, 1,
session, getTestName());
+ final Session_0_10 modelSession = new Session_0_10(modelConnection, 1,
session, getTestName());
session.setModelObject(modelSession);
- ServerSessionDelegate delegate = new ServerSessionDelegate();
+ final ServerSessionDelegate delegate = new ServerSessionDelegate();
- MessageTransfer xfr = new MessageTransfer();
- byte[] body1 = new byte[2048];
+ final MessageTransfer xfr = new MessageTransfer();
+ final byte[] body1 = new byte[2048];
xfr.setBody(QpidByteBuffer.wrap(body1));
delegate.messageTransfer(session, xfr);
assertFalse(invokedMethods.isEmpty(), "No methods invoked - expecting
at least 1");
- Method firstInvoked = invokedMethods.get(0);
+ final Method firstInvoked = invokedMethods.get(0);
final boolean condition = firstInvoked instanceof ExecutionException;
assertTrue(condition, "First invoked method not execution error");
assertEquals(ExecutionErrorCode.RESOURCE_LIMIT_EXCEEDED,
((ExecutionException)firstInvoked).getErrorCode());
-
invokedMethods.clear();
// test the boundary condition
- byte[] body = new byte[1024];
+ final byte[] body = new byte[1024];
xfr.setBody(QpidByteBuffer.wrap(body));
delegate.messageTransfer(session, xfr);
assertTrue(invokedMethods.isEmpty(), "Methods invoked when not
expecting any");
}
- public AmqpPort createMockPort()
+ AmqpPort<?> createMockPort()
{
AmqpPort port = mock(AmqpPort.class);
TaskExecutor childExecutor = new TaskExecutorImpl();
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
index 1174486d36..6536dfed91 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
@@ -32,14 +32,14 @@ import org.junit.jupiter.api.Test;
import org.apache.qpid.server.transport.ProtocolEngine;
import org.apache.qpid.test.utils.UnitTestBase;
-public class WindowCreditManagerTest extends UnitTestBase
+class WindowCreditManagerTest extends UnitTestBase
{
private WindowCreditManager _creditManager;
@BeforeEach
- public void setUp() throws Exception
+ void setUp()
{
- ProtocolEngine protocolEngine = mock(ProtocolEngine.class);
+ final ProtocolEngine protocolEngine = mock(ProtocolEngine.class);
when(protocolEngine.isTransportBlockedForWriting()).thenReturn(false);
_creditManager = new WindowCreditManager(0L, 0L);
@@ -52,7 +52,7 @@ public class WindowCreditManagerTest extends UnitTestBase
* and message credit are returned along with appropriate 'hasCredit'
results (QPID-3592).
*/
@Test
- public void testRestoreCreditDecrementsUsedCountAfterCreditClear()
+ void restoreCreditDecrementsUsedCountAfterCreditClear()
{
assertEquals(0, _creditManager.getMessageCredit(), "unexpected credit
value");
assertEquals(0, _creditManager.getBytesCredit(), "unexpected credit
value");
@@ -96,7 +96,7 @@ public class WindowCreditManagerTest extends UnitTestBase
}
@Test
- public void testRestoreCreditWhenInfiniteBytesCredit()
+ void restoreCreditWhenInfiniteBytesCredit()
{
_creditManager.addCredit(1, WindowCreditManager.INFINITE_CREDIT);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
index 82b71b6cf2..6b488511b7 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
@@ -34,27 +34,27 @@ import org.junit.jupiter.api.Test;
import org.apache.qpid.test.utils.UnitTestBase;
-public class BBDecoderTest extends UnitTestBase
+class BBDecoderTest extends UnitTestBase
{
@Test
- public void str8Caching()
+ void str8Caching()
{
- String testString = "Test";
- BBEncoder encoder = new BBEncoder(64);
+ final String testString = "Test";
+ final BBEncoder encoder = new BBEncoder(64);
encoder.writeStr8(testString);
encoder.writeStr8(testString);
- ByteBuffer buffer = encoder.buffer();
+ final ByteBuffer buffer = encoder.buffer();
- BBDecoder decoder = new BBDecoder();
+ final BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
- Cache<Binary, String> original = BBDecoder.getStringCache();
- Cache<Binary, String> cache =
CacheBuilder.newBuilder().maximumSize(2).build();
+ final Cache<Binary, String> original = BBDecoder.getStringCache();
+ final Cache<Binary, String> cache =
CacheBuilder.newBuilder().maximumSize(2).build();
try
{
BBDecoder.setStringCache(cache);
- String decodedString1 = decoder.readStr8();
- String decodedString2 = decoder.readStr8();
+ final String decodedString1 = decoder.readStr8();
+ final String decodedString2 = decoder.readStr8();
assertThat(testString, is(equalTo(decodedString1)));
assertThat(testString, is(equalTo(decodedString2)));
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
index 2db6f27e14..cea61a8164 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
@@ -29,9 +29,7 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -42,12 +40,12 @@ import org.junit.jupiter.api.Test;
import org.apache.qpid.test.utils.UnitTestBase;
-public class BBEncoderTest extends UnitTestBase
+class BBEncoderTest extends UnitTestBase
{
@Test
- public void testGrow()
+ void grow()
{
- BBEncoder enc = new BBEncoder(4);
+ final BBEncoder enc = new BBEncoder(4);
enc.writeInt32(0xDEADBEEF);
ByteBuffer buf = enc.buffer();
assertEquals(0xDEADBEEF, (long) buf.getInt(0));
@@ -58,54 +56,53 @@ public class BBEncoderTest extends UnitTestBase
}
@Test
- public void testReadWriteStruct()
+ void readWriteStruct()
{
- BBEncoder encoder = new BBEncoder(4);
+ final BBEncoder encoder = new BBEncoder(4);
- ReplyTo replyTo = new ReplyTo("amq.direct", "test");
+ final ReplyTo replyTo = new ReplyTo("amq.direct", "test");
encoder.writeStruct(ReplyTo.TYPE, replyTo);
- ByteBuffer buffer = encoder.buffer();
+ final ByteBuffer buffer = encoder.buffer();
assertEquals(EncoderUtils.getStructLength(ReplyTo.TYPE, replyTo),
(long) buffer.remaining(), "Unexpected size");
- BBDecoder decoder = new BBDecoder();
+ final BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
- ReplyTo decoded = (ReplyTo)decoder.readStruct(ReplyTo.TYPE);
+ final ReplyTo decoded = (ReplyTo)decoder.readStruct(ReplyTo.TYPE);
assertEquals(replyTo.getExchange(), decoded.getExchange(), "Unexpected
exchange");
assertEquals(replyTo.getRoutingKey(), decoded.getRoutingKey(),
"Unexpected routing key");
}
@Test
- public void testReadWriteStruct32()
+ void readWriteStruct32()
{
- BBEncoder encoder = new BBEncoder(4);
- Map<String, Object> applicationHeaders = new HashMap<>();
- applicationHeaders.put("testProperty", "testValue");
- applicationHeaders.put("list", Arrays.asList("a", 1, 2.0));
- applicationHeaders.put("map", Collections.singletonMap("mapKey",
"mapValue"));
- MessageProperties messageProperties = new MessageProperties(10,
-
UUID.randomUUID(),
-
"abc".getBytes(UTF_8),
- new
ReplyTo("amq.direct", "test"),
-
"text/plain",
- "identity",
-
"cba".getBytes(UTF_8),
-
"app".getBytes(UTF_8),
-
applicationHeaders);
+ final BBEncoder encoder = new BBEncoder(4);
+ final Map<String, Object> applicationHeaders = Map.of("testProperty",
"testValue",
+ "list", List.of("a", 1, 2.0),
+ "map", Map.of("mapKey", "mapValue"));
+ final MessageProperties messageProperties = new MessageProperties(10,
+ UUID.randomUUID(),
+ "abc".getBytes(UTF_8),
+ new ReplyTo("amq.direct", "test"),
+ "text/plain",
+ "identity",
+ "cba".getBytes(UTF_8),
+ "app".getBytes(UTF_8),
+ applicationHeaders);
encoder.writeStruct32(messageProperties);
- ByteBuffer buffer = encoder.buffer();
+ final ByteBuffer buffer = encoder.buffer();
assertEquals(EncoderUtils.getStruct32Length(messageProperties), (long)
buffer.remaining(), "Unexpected size");
- BBDecoder decoder = new BBDecoder();
+ final BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
- MessageProperties decoded = (MessageProperties)decoder.readStruct32();
+ final MessageProperties decoded =
(MessageProperties)decoder.readStruct32();
assertEquals(messageProperties.getContentLength(),
decoded.getContentLength(), "Unexpected content length");
assertEquals(messageProperties.getMessageId(), decoded.getMessageId(),
"Unexpected message id");
@@ -120,14 +117,14 @@ public class BBEncoderTest extends UnitTestBase
}
@Test
- public void encodedStr8Caching()
+ void encodedStr8Caching()
{
- String testString = "Test";
- Cache< String, byte[]> original = BBEncoder.getEncodedStringCache();
- Cache< String, byte[]> cache =
CacheBuilder.newBuilder().maximumSize(2).build();
+ final String testString = "Test";
+ final Cache< String, byte[]> original =
BBEncoder.getEncodedStringCache();
+ final Cache< String, byte[]> cache =
CacheBuilder.newBuilder().maximumSize(2).build();
try
{
- BBEncoder encoder = new BBEncoder(64);
+ final BBEncoder encoder = new BBEncoder(64);
BBEncoder.setEncodedStringCache(cache);
encoder.writeStr8(testString);
encoder.writeStr8(testString);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
index 373ae4cef8..729bb8b80c 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
@@ -29,22 +29,20 @@ import org.junit.jupiter.api.Test;
import org.apache.qpid.test.utils.UnitTestBase;
-
/**
* GenTest
*/
-public class GenTest extends UnitTestBase
+class GenTest extends UnitTestBase
{
@Test
- public void testBooleans()
+ void booleans()
{
- QueueDeclare qd = new
QueueDeclare().queue("test-queue").durable(false);
- assertEquals(qd.getQueue(), "test-queue");
+ final QueueDeclare qd = new
QueueDeclare().queue("test-queue").durable(false);
+ assertEquals("test-queue", qd.getQueue());
assertFalse(qd.getDurable(), "durable should be false");
qd.setDurable(true);
assertTrue(qd.getDurable(), "durable should be true");
qd.setDurable(false);
assertFalse(qd.getDurable(), "durable should be false again");
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
index f7bc829594..d91a30875f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
@@ -35,22 +35,21 @@ import org.junit.jupiter.api.Test;
import org.apache.qpid.test.utils.UnitTestBase;
-
/**
* RangeSetTest
*/
-public class RangeSetTest extends UnitTestBase
+class RangeSetTest extends UnitTestBase
{
private void check(RangeSet ranges)
{
- List<Integer> posts = new ArrayList<>();
- for (Range range : ranges)
+ final List<Integer> posts = new ArrayList<>();
+ for (final Range range : ranges)
{
posts.add(range.getLower());
posts.add(range.getUpper());
}
- List<Integer> sorted = new ArrayList<>(posts);
+ final List<Integer> sorted = new ArrayList<>(posts);
sorted.sort(COMPARATOR);
assertEquals(posts, sorted);
@@ -65,9 +64,9 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void test1()
+ void test1()
{
- RangeSet ranges = RangeSetFactory.createRangeSet();
+ final RangeSet ranges = RangeSetFactory.createRangeSet();
ranges.add(5, 10);
check(ranges);
ranges.add(15, 20);
@@ -83,9 +82,9 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void test2()
+ void test2()
{
- RangeSet rs = RangeSetFactory.createRangeSet();
+ final RangeSet rs = RangeSetFactory.createRangeSet();
check(rs);
rs.add(1);
@@ -146,9 +145,9 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testAddSelf()
+ void addSelf()
{
- RangeSet a = RangeSetFactory.createRangeSet();
+ final RangeSet a = RangeSetFactory.createRangeSet();
a.add(0, 8);
check(a);
a.add(0, 8);
@@ -160,12 +159,12 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testIntersect1()
+ void intersect1()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(9, 20);
- Range i1 = a.intersect(b);
- Range i2 = b.intersect(a);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(9, 20);
+ final Range i1 = a.intersect(b);
+ final Range i2 = b.intersect(a);
assertEquals(i1.getUpper(), (long) 10);
assertEquals(i2.getUpper(), (long) 10);
assertEquals(i1.getLower(), (long) 9);
@@ -173,21 +172,21 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testIntersect2()
+ void intersect2()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(11, 20);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(11, 20);
assertNull(a.intersect(b));
assertNull(b.intersect(a));
}
@Test
- public void testIntersect3()
+ void intersect3()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(3, 5);
- Range i1 = a.intersect(b);
- Range i2 = b.intersect(a);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(3, 5);
+ final Range i1 = a.intersect(b);
+ final Range i2 = b.intersect(a);
assertEquals(i1.getUpper(), (long) 5);
assertEquals(i2.getUpper(), (long) 5);
assertEquals(i1.getLower(), (long) 3);
@@ -195,45 +194,45 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSubtract1()
+ void subtract1()
{
- Range a = Range.newInstance(0, 10);
+ final Range a = Range.newInstance(0, 10);
assertTrue(a.subtract(a).isEmpty());
}
@Test
- public void testSubtract2()
+ void subtract2()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(20, 30);
- List<Range> ranges = a.subtract(b);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(20, 30);
+ final List<Range> ranges = a.subtract(b);
assertEquals(ranges.size(), (long) 1);
- Range d = ranges.get(0);
+ final Range d = ranges.get(0);
assertEquals(d.getLower(), (long) a.getLower());
assertEquals(d.getUpper(), (long) a.getUpper());
}
@Test
- public void testSubtract3()
+ void subtract3()
{
- Range a = Range.newInstance(20, 30);
- Range b = Range.newInstance(0, 10);
- List<Range> ranges = a.subtract(b);
+ final Range a = Range.newInstance(20, 30);
+ final Range b = Range.newInstance(0, 10);
+ final List<Range> ranges = a.subtract(b);
assertEquals(ranges.size(), (long) 1);
- Range d = ranges.get(0);
+ final Range d = ranges.get(0);
assertEquals(d.getLower(), (long) a.getLower());
assertEquals(d.getUpper(), (long) a.getUpper());
}
@Test
- public void testSubtract4()
+ void subtract4()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(3, 5);
- List<Range> ranges = a.subtract(b);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(3, 5);
+ final List<Range> ranges = a.subtract(b);
assertEquals(ranges.size(), (long) 2);
- Range low = ranges.get(0);
- Range high = ranges.get(1);
+ final Range low = ranges.get(0);
+ final Range high = ranges.get(1);
assertEquals(low.getLower(), (long) 0);
assertEquals(low.getUpper(), (long) 2);
assertEquals(high.getLower(), (long) 6);
@@ -241,31 +240,31 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSubtract5()
+ void subtract5()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(3, 20);
- List<Range> ranges = a.subtract(b);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(3, 20);
+ final List<Range> ranges = a.subtract(b);
assertEquals(ranges.size(), (long) 1);
- Range d = ranges.get(0);
+ final Range d = ranges.get(0);
assertEquals(d.getLower(), (long) 0);
assertEquals(d.getUpper(), (long) 2);
}
@Test
- public void testSubtract6()
+ void subtract6()
{
- Range a = Range.newInstance(0, 10);
- Range b = Range.newInstance(-10, 5);
- List<Range> ranges = a.subtract(b);
+ final Range a = Range.newInstance(0, 10);
+ final Range b = Range.newInstance(-10, 5);
+ final List<Range> ranges = a.subtract(b);
assertEquals(ranges.size(), (long) 1);
- Range d = ranges.get(0);
+ final Range d = ranges.get(0);
assertEquals(d.getLower(), (long) 6);
assertEquals(d.getUpper(), (long) 10);
}
@Test
- public void testSetSubtract1()
+ void setSubtract1()
{
final RangeSet orig = createRangeSet(0, 10) ;
final RangeSet update = createRangeSet(3, 15) ;
@@ -274,7 +273,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract2()
+ void setSubtract2()
{
final RangeSet orig = createRangeSet(0, 10) ;
final RangeSet update = createRangeSet(3, 10) ;
@@ -283,7 +282,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract3()
+ void setSubtract3()
{
final RangeSet orig = createRangeSet(0, 10) ;
final RangeSet update = createRangeSet(3, 4) ;
@@ -292,7 +291,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract4()
+ void setSubtract4()
{
final RangeSet orig = createRangeSet(3, 15) ;
final RangeSet update = createRangeSet(0, 10) ;
@@ -301,7 +300,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract5()
+ void setSubtract5()
{
final RangeSet orig = createRangeSet(3, 10) ;
final RangeSet update = createRangeSet(0, 10) ;
@@ -310,7 +309,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract6()
+ void setSubtract6()
{
final RangeSet orig = createRangeSet(3, 10) ;
final RangeSet update = createRangeSet(0, 15) ;
@@ -319,7 +318,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract7()
+ void setSubtract7()
{
final RangeSet orig = createRangeSet(0, 10) ;
final RangeSet update = createRangeSet(0, 15) ;
@@ -328,7 +327,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract8()
+ void setSubtract8()
{
final RangeSet orig = createRangeSet(0, 15) ;
final RangeSet update = createRangeSet(0, 10) ;
@@ -337,7 +336,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract9()
+ void setSubtract9()
{
final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
final RangeSet update = createRangeSet(2, 3, 5, 6, 8, 9, 22, 23, 27,
28) ;
@@ -346,7 +345,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract10()
+ void setSubtract10()
{
final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
final RangeSet update = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27,
30) ;
@@ -355,7 +354,7 @@ public class RangeSetTest extends UnitTestBase
}
@Test
- public void testSetSubtract11()
+ void setSubtract11()
{
final RangeSet orig = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27,
30) ;
final RangeSet update = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27,
30) ;
@@ -363,25 +362,25 @@ public class RangeSetTest extends UnitTestBase
checkRange(orig) ;
}
- private RangeSet createRangeSet(int ... bounds)
+ private RangeSet createRangeSet(final int ... bounds)
{
- RangeSet set = RangeSetFactory.createRangeSet();
+ final RangeSet set = RangeSetFactory.createRangeSet();
final int length = (bounds == null ? 0 : bounds.length) ;
int count = 0 ;
- while(count < length)
+ while (count < length)
{
set.add(bounds[count++], bounds[count++]) ;
}
return set ;
}
- private void checkRange(final RangeSet rangeSet, int ... bounds)
+ private void checkRange(final RangeSet rangeSet, final int ... bounds)
{
final int length = (bounds == null ? 0 : bounds.length) ;
assertEquals(length / 2, (long) rangeSet.size(), "Range count");
final Iterator<Range> iter = rangeSet.iterator() ;
int count = 0 ;
- while(count < length)
+ while (count < length)
{
final Range range = iter.next() ;
final long expected1 = bounds[count++];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
