You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:20 UTC
[13/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
----------------------------------------------------------------------
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 a490df1..cb8980a 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
@@ -22,6 +22,11 @@
package org.apache.qpid.server.protocol.v0_10;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@@ -39,6 +44,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.internal.InternalMessage;
@@ -54,22 +62,22 @@ import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryMode;
import org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
+public class PropertyConverter_Internal_to_v0_10Test extends UnitTestBase
{
private MessageConverter_Internal_to_v0_10 _messageConverter;
private NamedAddressSpace _addressSpace;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_addressSpace = mock(NamedAddressSpace.class);
when(_addressSpace.getLocalAddress(anyString())).then(returnsFirstArg());
_messageConverter = new MessageConverter_Internal_to_v0_10();
}
+ @Test
public void testPersistentTrueConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -78,13 +86,15 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected delivery mode",
- MessageDeliveryMode.PERSISTENT,
- convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode());
+ MessageDeliveryMode.PERSISTENT,
+ convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode());
+
assertTrue("Unexpected persistence of message", convertedMessage.isPersistent());
assertTrue("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testPersistentFalseConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -93,13 +103,14 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected delivery mode",
- MessageDeliveryMode.NON_PERSISTENT,
- convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode());
+ MessageDeliveryMode.NON_PERSISTENT,
+ convertedMessage.getHeader().getDeliveryProperties().getDeliveryMode());
assertFalse("Unexpected persistence of message", convertedMessage.isPersistent());
assertFalse("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testPriorityConversion() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -110,10 +121,12 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected priority",
- priority,
- convertedMessage.getHeader().getDeliveryProperties().getPriority().getValue());
+ (long) priority,
+ (long) convertedMessage.getHeader().getDeliveryProperties().getPriority().getValue());
+
}
+ @Test
public void testExpirationConversion() throws InterruptedException, IOException
{
long ttl = 10000;
@@ -126,14 +139,13 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected expiration time",
- expiryTime,
- convertedMessage.getHeader().getDeliveryProperties().getExpiration());
+ expiryTime,
+ convertedMessage.getHeader().getDeliveryProperties().getExpiration());
- assertEquals("Unexpected TTL",
- ttl,
- convertedMessage.getHeader().getDeliveryProperties().getTtl());
+ assertEquals("Unexpected TTL", ttl, convertedMessage.getHeader().getDeliveryProperties().getTtl());
}
+ @Test
public void testContentEncodingConversion() throws IOException
{
String contentEncoding = "my-test-encoding";
@@ -144,10 +156,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected content encoding",
- contentEncoding,
- convertedMessage.getHeader().getMessageProperties().getContentEncoding());
+ contentEncoding,
+ convertedMessage.getHeader().getMessageProperties().getContentEncoding());
}
+ @Test
public void testLongContentEncodingConversion() throws IOException
{
String contentEncoding = generateLongString();
@@ -166,6 +179,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
}
+ @Test
public void testMessageIdUUIDConversion() throws IOException
{
UUID messageId = UUID.randomUUID();
@@ -177,10 +191,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected messageId",
- messageId,
- convertedMessage.getHeader().getMessageProperties().getMessageId());
+ messageId,
+ convertedMessage.getHeader().getMessageProperties().getMessageId());
}
+ @Test
public void testMessageIdStringConversion() throws IOException
{
final String messageId = "testMessageId";
@@ -193,6 +208,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertNull("Unexpected messageId", convertedMessage.getHeader().getMessageProperties().getMessageId());
}
+ @Test
public void testCorrelationIdConversion() throws IOException
{
String correlationId = "testCorrelationId";
@@ -202,11 +218,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertTrue("Unexpected correlationId",
- Arrays.equals(correlationId.getBytes(UTF_8),
- convertedMessage.getHeader().getMessageProperties().getCorrelationId()));
+ assertTrue("Unexpected correlationId", Arrays.equals(correlationId.getBytes(UTF_8),
+ convertedMessage.getHeader().getMessageProperties().getCorrelationId()));
}
+ @Test
public void testCorrelationIdConversionWhenLengthExceeds16Bits() throws IOException
{
final String correlationId = generateLongLongString();
@@ -226,6 +242,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
+ @Test
public void testUserIdConversion() throws IOException
{
final String userId = "testUserId";
@@ -235,11 +252,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertTrue("Unexpected userId",
- Arrays.equals(userId.getBytes(UTF_8),
- convertedMessage.getHeader().getMessageProperties().getUserId()));
+ assertTrue("Unexpected userId", Arrays.equals(userId.getBytes(UTF_8),
+ convertedMessage.getHeader().getMessageProperties().getUserId()));
}
+ @Test
public void testUserIdConversionWhenLengthExceeds16Bits() throws IOException
{
final String userId = generateLongLongString();
@@ -252,6 +269,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertNull("Unexpected userId", convertedMessage.getHeader().getMessageProperties().getUserId());
}
+ @Test
public void testTimestampConversion() throws IOException
{
final long timestamp = System.currentTimeMillis();
@@ -262,10 +280,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected timestamp",
- timestamp,
- convertedMessage.getHeader().getDeliveryProperties().getTimestamp());
+ timestamp,
+ convertedMessage.getHeader().getDeliveryProperties().getTimestamp());
}
+ @Test
public void testArrivalTimeConversion() throws IOException
{
final long timestamp = System.currentTimeMillis();
@@ -275,10 +294,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected timestamp",
- timestamp,
- convertedMessage.getHeader().getDeliveryProperties().getTimestamp());
+ timestamp,
+ convertedMessage.getHeader().getDeliveryProperties().getTimestamp());
}
+ @Test
public void testHeadersConversion() throws IOException
{
final Map<String, Object> properties = new HashMap<>();
@@ -300,6 +320,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected application properties", properties, new HashMap<>(convertedHeaders));
}
+ @Test
public void testHeadersConversionWithUnsupportedTypes() throws IOException
{
final Map<String, Object> properties = Collections.singletonMap("bigDecimalProperty", new BigDecimal(1));
@@ -324,6 +345,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
+ @Test
public void testHeadersConversionWhenKeyLengthExceeds255() throws IOException
{
final Map<String, Object> properties = Collections.singletonMap(generateLongString(), "test");
@@ -347,6 +369,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
}
+ @Test
public void testContentLengthConversion() throws IOException
{
byte[] content = {(byte) 1, (byte) 2};
@@ -357,10 +380,11 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
MessageTransferMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected timestamp",
- content.length,
- convertedMessage.getHeader().getMessageProperties().getContentLength());
+ (long) content.length,
+ convertedMessage.getHeader().getMessageProperties().getContentLength());
}
+ @Test
public void testReplyToConversionWhenQueueIsSpecified() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -379,6 +403,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", replyTo, convertedReplyTo.getRoutingKey());
}
+ @Test
public void testReplyToConversionWhenExchangeIsSpecified() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -397,6 +422,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", "", convertedReplyTo.getRoutingKey());
}
+ @Test
public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecified() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -417,6 +443,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", routingKey, convertedReplyTo.getRoutingKey());
}
+ @Test
public void testReplyToConversionWhenReplyToCannotBeResolved() throws IOException
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -433,6 +460,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
+ @Test
public void testToConversionWhenExchangeAndRoutingKeyIsSpecified() throws IOException
{
final String testExchange = "testExchange";
@@ -454,6 +482,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", testRoutingKey, deliveryProperties.getRoutingKey());
}
+ @Test
public void testToConversionWhenExchangeIsSpecified() throws IOException
{
final String testExchange = "testExchange";
@@ -472,6 +501,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", "", deliveryProperties.getRoutingKey());
}
+ @Test
public void testToConversionWhenQueueIsSpecified() throws IOException
{
final String testQueue = "testQueue";
@@ -490,6 +520,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", testQueue, deliveryProperties.getRoutingKey());
}
+ @Test
public void testToConversionWhenGlobalAddressIsUnknown() throws IOException
{
final String queueName = "testQueue";
@@ -510,6 +541,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", globalAddress, deliveryProperties.getRoutingKey());
}
+ @Test
public void testToConversionWhenGlobalAddressIsKnown() throws IOException
{
final String queueName = "testQueue";
@@ -530,6 +562,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
assertEquals("Unexpected routing key", queueName, deliveryProperties.getRoutingKey());
}
+ @Test
public void testToConversionWhenExchangeLengthExceeds255() throws IOException
{
final String testExchange = generateLongString();
@@ -550,6 +583,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenRoutingKeyLengthExceeds255() throws Exception
{
final String testExchange = "testExchange";
@@ -570,6 +604,7 @@ public class PropertyConverter_Internal_to_v0_10Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenDestinationIsSpecifiedButDoesNotExists() throws IOException
{
final String testDestination = "testDestination";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
----------------------------------------------------------------------
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 6ee24a3..ada7004 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
@@ -26,25 +26,27 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
+
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.server.protocol.v0_10.transport.ExchangeDelete;
import org.apache.qpid.server.protocol.v0_10.transport.ExecutionErrorCode;
import org.apache.qpid.server.protocol.v0_10.transport.ExecutionException;
import org.apache.qpid.server.protocol.v0_10.transport.Option;
-import org.mockito.ArgumentMatcher;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ServerSessionDelegateTest extends QpidTestCase
+public class ServerSessionDelegateTest extends UnitTestBase
{
private VirtualHost<?> _host;
private ServerSession _session;
private ServerSessionDelegate _delegate;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_host = mock(VirtualHost.class);
ServerConnection serverConnection = mock(ServerConnection.class);
@@ -56,6 +58,7 @@ public class ServerSessionDelegateTest extends QpidTestCase
_delegate = new ServerSessionDelegate();
}
+ @Test
public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
{
Exchange<?> exchange = mock(Exchange.class);
@@ -78,6 +81,7 @@ public class ServerSessionDelegateTest extends QpidTestCase
}));
}
+ @Test
public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
{
Exchange<?> exchange = mock(Exchange.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
----------------------------------------------------------------------
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 11679e5..104cafa 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
@@ -18,17 +18,22 @@
*/
package org.apache.qpid.server.protocol.v0_10;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import javax.security.auth.Subject;
import com.google.common.util.concurrent.Futures;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
@@ -49,25 +54,24 @@ import org.apache.qpid.server.protocol.v0_10.transport.ExecutionErrorCode;
import org.apache.qpid.server.protocol.v0_10.transport.ExecutionException;
import org.apache.qpid.server.protocol.v0_10.transport.MessageTransfer;
import org.apache.qpid.server.protocol.v0_10.transport.Method;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ServerSessionTest extends QpidTestCase
+public class ServerSessionTest extends UnitTestBase
{
private VirtualHost<?> _virtualHost;
private CurrentThreadTaskExecutor _taskExecutor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
- _virtualHost = BrokerTestHelper.createVirtualHost(getName());
+ _virtualHost = BrokerTestHelper.createVirtualHost(getTestName(), this);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -89,11 +93,11 @@ public class ServerSessionTest extends QpidTestCase
finally
{
BrokerTestHelper.tearDown();
- super.tearDown();
}
}
}
+ @Test
public void testOverlargeMessageTest() throws Exception
{
final Broker<?> broker = mock(Broker.class);
@@ -124,7 +128,7 @@ public class ServerSessionTest extends QpidTestCase
final List<Method> invokedMethods = new ArrayList<>();
ServerSession session = new ServerSession(connection, new ServerSessionDelegate(),
- new Binary(getName().getBytes()), 0)
+ new Binary(getTestName().getBytes()), 0)
{
@Override
public void invoke(final Method m)
@@ -143,8 +147,11 @@ public class ServerSessionTest extends QpidTestCase
assertFalse("No methods invoked - expecting at least 1", invokedMethods.isEmpty());
Method firstInvoked = invokedMethods.get(0);
- assertTrue("First invoked method not execution error", firstInvoked instanceof ExecutionException);
- assertEquals(ExecutionErrorCode.RESOURCE_LIMIT_EXCEEDED, ((ExecutionException)firstInvoked).getErrorCode());
+ final boolean condition = firstInvoked instanceof ExecutionException;
+ assertTrue("First invoked method not execution error", condition);
+ assertEquals(ExecutionErrorCode.RESOURCE_LIMIT_EXCEEDED,
+ ((ExecutionException)firstInvoked).getErrorCode());
+
invokedMethods.clear();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
----------------------------------------------------------------------
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 1052cc5..3f1a403 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
@@ -20,21 +20,26 @@
*/
package org.apache.qpid.server.protocol.v0_10;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.transport.ProtocolEngine;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class WindowCreditManagerTest extends QpidTestCase
+public class WindowCreditManagerTest extends UnitTestBase
{
private WindowCreditManager _creditManager;
private ProtocolEngine _protocolEngine;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_protocolEngine = mock(ProtocolEngine.class);
when(_protocolEngine.isTransportBlockedForWriting()).thenReturn(false);
@@ -48,46 +53,47 @@ public class WindowCreditManagerTest extends QpidTestCase
* more credit is added, that the 'used' count is correct and the proper values for bytes
* and message credit are returned along with appropriate 'hasCredit' results (QPID-3592).
*/
+ @Test
public void testRestoreCreditDecrementsUsedCountAfterCreditClear()
{
- assertEquals("unexpected credit value", 0, _creditManager.getMessageCredit());
- assertEquals("unexpected credit value", 0, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getBytesCredit());
//give some message credit
_creditManager.addCredit(1, 0);
assertFalse("Manager should not 'haveCredit' due to having 0 bytes credit", _creditManager.hasCredit());
- assertEquals("unexpected credit value", 1, _creditManager.getMessageCredit());
- assertEquals("unexpected credit value", 0, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 1, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getBytesCredit());
//give some bytes credit
_creditManager.addCredit(0, 1);
assertTrue("Manager should 'haveCredit'", _creditManager.hasCredit());
- assertEquals("unexpected credit value", 1, _creditManager.getMessageCredit());
- assertEquals("unexpected credit value", 1, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 1, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 1, _creditManager.getBytesCredit());
//use all the credit
_creditManager.useCreditForMessage(1);
- assertEquals("unexpected credit value", 0, _creditManager.getBytesCredit());
- assertEquals("unexpected credit value", 0, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getMessageCredit());
assertFalse("Manager should not 'haveCredit'", _creditManager.hasCredit());
//clear credit out (eg from a message.stop command)
_creditManager.clearCredit();
- assertEquals("unexpected credit value", 0, _creditManager.getBytesCredit());
- assertEquals("unexpected credit value", 0, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getMessageCredit());
assertFalse("Manager should not 'haveCredit'", _creditManager.hasCredit());
//restore credit (e.g the original message transfer command got completed)
//this should not increase credit, because it is now limited to 0
_creditManager.restoreCredit(1, 1);
- assertEquals("unexpected credit value", 0, _creditManager.getBytesCredit());
- assertEquals("unexpected credit value", 0, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 0, _creditManager.getMessageCredit());
assertFalse("Manager should not 'haveCredit'", _creditManager.hasCredit());
//give more credit to open the window again
_creditManager.addCredit(1, 1);
- assertEquals("unexpected credit value", 1, _creditManager.getBytesCredit());
- assertEquals("unexpected credit value", 1, _creditManager.getMessageCredit());
+ assertEquals("unexpected credit value", (long) 1, _creditManager.getBytesCredit());
+ assertEquals("unexpected credit value", (long) 1, _creditManager.getMessageCredit());
assertTrue("Manager should 'haveCredit'", _creditManager.hasCredit());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
----------------------------------------------------------------------
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 8745490..7d19454 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
@@ -23,6 +23,7 @@ package org.apache.qpid.server.protocol.v0_10.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -31,24 +32,28 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
-public class BBEncoderTest extends QpidTestCase
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class BBEncoderTest extends UnitTestBase
{
+ @Test
public void testGrow()
{
BBEncoder enc = new BBEncoder(4);
enc.writeInt32(0xDEADBEEF);
ByteBuffer buf = enc.buffer();
- assertEquals(0xDEADBEEF, buf.getInt(0));
+ assertEquals((long) 0xDEADBEEF, (long) buf.getInt(0));
enc.writeInt32(0xBEEFDEAD);
buf = enc.buffer();
- assertEquals(0xDEADBEEF, buf.getInt(0));
- assertEquals(0xBEEFDEAD, buf.getInt(4));
+ assertEquals((long) 0xDEADBEEF, (long) buf.getInt(0));
+ assertEquals((long) 0xBEEFDEAD, (long) buf.getInt(4));
}
+ @Test
public void testReadWriteStruct()
{
BBEncoder encoder = new BBEncoder(4);
@@ -58,7 +63,9 @@ public class BBEncoderTest extends QpidTestCase
ByteBuffer buffer = encoder.buffer();
- assertEquals("Unexpected size", EncoderUtils.getStructLength(ReplyTo.TYPE, replyTo), buffer.remaining());
+ assertEquals("Unexpected size",
+ (long) EncoderUtils.getStructLength(ReplyTo.TYPE, replyTo),
+ (long) buffer.remaining());
BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
@@ -69,6 +76,7 @@ public class BBEncoderTest extends QpidTestCase
assertEquals("Unexpected routing key", replyTo.getRoutingKey(), decoded.getRoutingKey());
}
+ @Test
public void testReadWriteStruct32()
{
BBEncoder encoder = new BBEncoder(4);
@@ -90,21 +98,30 @@ public class BBEncoderTest extends QpidTestCase
ByteBuffer buffer = encoder.buffer();
- assertEquals("Unexpected size", EncoderUtils.getStruct32Length(messageProperties), buffer.remaining());
+ assertEquals("Unexpected size",
+ (long) EncoderUtils.getStruct32Length(messageProperties),
+ (long) buffer.remaining());
BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
MessageProperties decoded = (MessageProperties)decoder.readStruct32();
- assertEquals("Unexpected content length", messageProperties.getContentLength(), decoded.getContentLength());
+ assertEquals("Unexpected content length",
+ messageProperties.getContentLength(),
+ decoded.getContentLength());
assertEquals("Unexpected message id", messageProperties.getMessageId(), decoded.getMessageId());
- assertArrayEquals("Unexpected correlation id", messageProperties.getCorrelationId(), decoded.getCorrelationId());
+ assertArrayEquals("Unexpected correlation id", messageProperties.getCorrelationId(), decoded.getCorrelationId
+ ());
assertEquals("Unexpected reply to", messageProperties.getReplyTo(), decoded.getReplyTo());
assertEquals("Unexpected content type", messageProperties.getContentType(), decoded.getContentType());
- assertEquals("Unexpected content encoding", messageProperties.getContentEncoding(), decoded.getContentEncoding());
+ assertEquals("Unexpected content encoding",
+ messageProperties.getContentEncoding(),
+ decoded.getContentEncoding());
assertArrayEquals("Unexpected user id", messageProperties.getUserId(), decoded.getUserId());
assertArrayEquals("Unexpected application id", messageProperties.getAppId(), decoded.getAppId());
- assertEquals("Unexpected application headers", messageProperties.getApplicationHeaders(), decoded.getApplicationHeaders());
+ assertEquals("Unexpected application headers",
+ messageProperties.getApplicationHeaders(),
+ decoded.getApplicationHeaders());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
----------------------------------------------------------------------
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 6dc1f6a..6647beb 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
@@ -21,16 +21,22 @@
package org.apache.qpid.server.protocol.v0_10.transport;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* GenTest
- *
*/
-
-public class GenTest extends QpidTestCase
+public class GenTest extends UnitTestBase
{
+ @Test
public void testBooleans()
{
QueueDeclare qd = new QueueDeclare().queue("test-queue").durable(false);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
----------------------------------------------------------------------
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 53f0e4c..662378d 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
@@ -21,22 +21,26 @@
package org.apache.qpid.server.protocol.v0_10.transport;
-import org.apache.qpid.test.utils.QpidTestCase;
-
import static org.apache.qpid.server.util.Serial.COMPARATOR;
import static org.apache.qpid.server.util.Serial.eq;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
+
/**
* RangeSetTest
- *
*/
-
-public class RangeSetTest extends QpidTestCase
+public class RangeSetTest extends UnitTestBase
{
private void check(RangeSet ranges)
@@ -56,11 +60,13 @@ public class RangeSetTest extends QpidTestCase
int idx = 1;
while (idx + 1 < posts.size())
{
- assertTrue(!eq(posts.get(idx) + 1, posts.get(idx+1)));
+ final boolean condition = !eq(posts.get(idx) + 1, posts.get(idx+1));
+ assertTrue(condition);
idx += 2;
}
}
+ @Test
public void test1()
{
RangeSet ranges = RangeSetFactory.createRangeSet();
@@ -78,6 +84,7 @@ public class RangeSetTest extends QpidTestCase
check(ranges);
}
+ @Test
public void test2()
{
RangeSet rs = RangeSetFactory.createRangeSet();
@@ -85,36 +92,46 @@ public class RangeSetTest extends QpidTestCase
rs.add(1);
assertTrue(rs.includes(1));
- assertTrue(!rs.includes(2));
- assertTrue(!rs.includes(0));
+ final boolean condition10 = !rs.includes(2);
+ assertTrue(condition10);
+ final boolean condition9 = !rs.includes(0);
+ assertTrue(condition9);
check(rs);
rs.add(2);
- assertTrue(!rs.includes(0));
+ final boolean condition8 = !rs.includes(0);
+ assertTrue(condition8);
assertTrue(rs.includes(1));
assertTrue(rs.includes(2));
- assertTrue(!rs.includes(3));
+ final boolean condition7 = !rs.includes(3);
+ assertTrue(condition7);
check(rs);
rs.add(0);
- assertTrue(!rs.includes(-1));
+ final boolean condition6 = !rs.includes(-1);
+ assertTrue(condition6);
assertTrue(rs.includes(0));
assertTrue(rs.includes(1));
assertTrue(rs.includes(2));
- assertTrue(!rs.includes(3));
+ final boolean condition5 = !rs.includes(3);
+ assertTrue(condition5);
check(rs);
rs.add(37);
- assertTrue(!rs.includes(-1));
+ final boolean condition4 = !rs.includes(-1);
+ assertTrue(condition4);
assertTrue(rs.includes(0));
assertTrue(rs.includes(1));
assertTrue(rs.includes(2));
- assertTrue(!rs.includes(3));
- assertTrue(!rs.includes(36));
+ final boolean condition3 = !rs.includes(3);
+ assertTrue(condition3);
+ final boolean condition2 = !rs.includes(36);
+ assertTrue(condition2);
assertTrue(rs.includes(37));
- assertTrue(!rs.includes(38));
+ final boolean condition1 = !rs.includes(38);
+ assertTrue(condition1);
check(rs);
rs.add(-1);
@@ -124,11 +141,13 @@ public class RangeSetTest extends QpidTestCase
check(rs);
rs.add(1, 20);
- assertTrue(!rs.includes(21));
+ final boolean condition = !rs.includes(21);
+ assertTrue(condition);
assertTrue(rs.includes(20));
check(rs);
}
+ @Test
public void testAddSelf()
{
RangeSet a = RangeSetFactory.createRangeSet();
@@ -136,24 +155,26 @@ public class RangeSetTest extends QpidTestCase
check(a);
a.add(0, 8);
check(a);
- assertEquals(a.size(), 1);
+ assertEquals((long) a.size(), (long) 1);
Range range = a.iterator().next();
- assertEquals(range.getLower(), 0);
- assertEquals(range.getUpper(), 8);
+ assertEquals((long) range.getLower(), (long) 0);
+ assertEquals((long) range.getUpper(), (long) 8);
}
+ @Test
public void testIntersect1()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(9, 20);
Range i1 = a.intersect(b);
Range i2 = b.intersect(a);
- assertEquals(i1.getUpper(), 10);
- assertEquals(i2.getUpper(), 10);
- assertEquals(i1.getLower(), 9);
- assertEquals(i2.getLower(), 9);
+ assertEquals((long) i1.getUpper(), (long) 10);
+ assertEquals((long) i2.getUpper(), (long) 10);
+ assertEquals((long) i1.getLower(), (long) 9);
+ assertEquals((long) i2.getLower(), (long) 9);
}
+ @Test
public void testIntersect2()
{
Range a = Range.newInstance(0, 10);
@@ -162,82 +183,90 @@ public class RangeSetTest extends QpidTestCase
assertNull(b.intersect(a));
}
+ @Test
public void testIntersect3()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(3, 5);
Range i1 = a.intersect(b);
Range i2 = b.intersect(a);
- assertEquals(i1.getUpper(), 5);
- assertEquals(i2.getUpper(), 5);
- assertEquals(i1.getLower(), 3);
- assertEquals(i2.getLower(), 3);
+ assertEquals((long) i1.getUpper(), (long) 5);
+ assertEquals((long) i2.getUpper(), (long) 5);
+ assertEquals((long) i1.getLower(), (long) 3);
+ assertEquals((long) i2.getLower(), (long) 3);
}
+ @Test
public void testSubtract1()
{
Range a = Range.newInstance(0, 10);
assertTrue(a.subtract(a).isEmpty());
}
+ @Test
public void testSubtract2()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(20, 30);
List<Range> ranges = a.subtract(b);
- assertEquals(ranges.size(), 1);
+ assertEquals((long) ranges.size(), (long) 1);
Range d = ranges.get(0);
- assertEquals(d.getLower(), a.getLower());
- assertEquals(d.getUpper(), a.getUpper());
+ assertEquals((long) d.getLower(), (long) a.getLower());
+ assertEquals((long) d.getUpper(), (long) a.getUpper());
}
+ @Test
public void testSubtract3()
{
Range a = Range.newInstance(20, 30);
Range b = Range.newInstance(0, 10);
List<Range> ranges = a.subtract(b);
- assertEquals(ranges.size(), 1);
+ assertEquals((long) ranges.size(), (long) 1);
Range d = ranges.get(0);
- assertEquals(d.getLower(), a.getLower());
- assertEquals(d.getUpper(), a.getUpper());
+ assertEquals((long) d.getLower(), (long) a.getLower());
+ assertEquals((long) d.getUpper(), (long) a.getUpper());
}
+ @Test
public void testSubtract4()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(3, 5);
List<Range> ranges = a.subtract(b);
- assertEquals(ranges.size(), 2);
+ assertEquals((long) ranges.size(), (long) 2);
Range low = ranges.get(0);
Range high = ranges.get(1);
- assertEquals(low.getLower(), 0);
- assertEquals(low.getUpper(), 2);
- assertEquals(high.getLower(), 6);
- assertEquals(high.getUpper(), 10);
+ assertEquals((long) low.getLower(), (long) 0);
+ assertEquals((long) low.getUpper(), (long) 2);
+ assertEquals((long) high.getLower(), (long) 6);
+ assertEquals((long) high.getUpper(), (long) 10);
}
+ @Test
public void testSubtract5()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(3, 20);
List<Range> ranges = a.subtract(b);
- assertEquals(ranges.size(), 1);
+ assertEquals((long) ranges.size(), (long) 1);
Range d = ranges.get(0);
- assertEquals(d.getLower(), 0);
- assertEquals(d.getUpper(), 2);
+ assertEquals((long) d.getLower(), (long) 0);
+ assertEquals((long) d.getUpper(), (long) 2);
}
+ @Test
public void testSubtract6()
{
Range a = Range.newInstance(0, 10);
Range b = Range.newInstance(-10, 5);
List<Range> ranges = a.subtract(b);
- assertEquals(ranges.size(), 1);
+ assertEquals((long) ranges.size(), (long) 1);
Range d = ranges.get(0);
- assertEquals(d.getLower(), 6);
- assertEquals(d.getUpper(), 10);
+ assertEquals((long) d.getLower(), (long) 6);
+ assertEquals((long) d.getUpper(), (long) 10);
}
+ @Test
public void testSetSubtract1()
{
final RangeSet orig = createRangeSet(0, 10) ;
@@ -246,6 +275,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 0, 2) ;
}
+ @Test
public void testSetSubtract2()
{
final RangeSet orig = createRangeSet(0, 10) ;
@@ -254,6 +284,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 0, 2) ;
}
+ @Test
public void testSetSubtract3()
{
final RangeSet orig = createRangeSet(0, 10) ;
@@ -262,6 +293,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 0, 2, 5, 10) ;
}
+ @Test
public void testSetSubtract4()
{
final RangeSet orig = createRangeSet(3, 15) ;
@@ -270,6 +302,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 11, 15) ;
}
+ @Test
public void testSetSubtract5()
{
final RangeSet orig = createRangeSet(3, 10) ;
@@ -278,6 +311,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig) ;
}
+ @Test
public void testSetSubtract6()
{
final RangeSet orig = createRangeSet(3, 10) ;
@@ -286,6 +320,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig) ;
}
+ @Test
public void testSetSubtract7()
{
final RangeSet orig = createRangeSet(0, 10) ;
@@ -294,6 +329,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig) ;
}
+ @Test
public void testSetSubtract8()
{
final RangeSet orig = createRangeSet(0, 15) ;
@@ -302,6 +338,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 11, 15) ;
}
+ @Test
public void testSetSubtract9()
{
final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
@@ -310,6 +347,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 0, 1, 4, 4, 7, 7, 10, 15, 20, 21, 24, 26, 29, 30) ;
}
+ @Test
public void testSetSubtract10()
{
final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
@@ -318,6 +356,7 @@ public class RangeSetTest extends QpidTestCase
checkRange(orig, 3, 3, 7, 9, 23, 23, 25, 26) ;
}
+ @Test
public void testSetSubtract11()
{
final RangeSet orig = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27, 30) ;
@@ -341,14 +380,16 @@ public class RangeSetTest extends QpidTestCase
private void checkRange(final RangeSet rangeSet, int ... bounds)
{
final int length = (bounds == null ? 0 : bounds.length) ;
- assertEquals("Range count", length / 2, rangeSet.size()) ;
+ assertEquals("Range count", (long) (length / 2), (long) rangeSet.size());
final Iterator<Range> iter = rangeSet.iterator() ;
int count = 0 ;
while(count < length)
{
final Range range = iter.next() ;
- assertEquals("Range lower", bounds[count++], range.getLower()) ;
- assertEquals("Range upper", bounds[count++], range.getUpper()) ;
+ final long expected1 = bounds[count++];
+ assertEquals("Range lower", expected1, (long) range.getLower());
+ final long expected = bounds[count++];
+ assertEquals("Range upper", expected, (long) range.getUpper());
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index 94522ea..1fb9940 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
@@ -38,14 +38,12 @@ import java.util.Set;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
-import org.apache.qpid.server.protocol.v0_8.transport.MethodRegistry;
-import org.apache.qpid.server.protocol.ProtocolVersion;
-import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.InstanceProperties;
@@ -59,6 +57,10 @@ import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Session;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
+import org.apache.qpid.server.protocol.v0_8.transport.MethodRegistry;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.store.MessageHandle;
@@ -67,9 +69,9 @@ import org.apache.qpid.server.store.NullMessageStore;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.store.StoredMemoryMessage;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AMQChannelTest extends QpidTestCase
+public class AMQChannelTest extends UnitTestBase
{
public static final AMQShortString ROUTING_KEY = AMQShortString.valueOf("routingKey");
@@ -81,10 +83,9 @@ public class AMQChannelTest extends QpidTestCase
private ProtocolOutputConverter _protocolOutputConverter;
private MessageDestination _messageDestination;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
TaskExecutor taskExecutor = mock(TaskExecutor.class);
@@ -134,6 +135,7 @@ public class AMQChannelTest extends QpidTestCase
_messageDestination = mock(MessageDestination.class);
}
+ @Test
public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
{
String testExchangeName = getTestName();
@@ -150,6 +152,7 @@ public class AMQChannelTest extends QpidTestCase
eq("Exchange has bindings"));
}
+ @Test
public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
{
Exchange<?> exchange = mock(Exchange.class);
@@ -162,6 +165,7 @@ public class AMQChannelTest extends QpidTestCase
verify(exchange).delete();
}
+ @Test
public void testOversizedMessageClosesChannel() throws Exception
{
when(_virtualHost.getDefaultDestination()).thenReturn(mock(MessageDestination.class));
@@ -180,6 +184,7 @@ public class AMQChannelTest extends QpidTestCase
}
+ @Test
public void testPublishContentHeaderWhenMessageAuthorizationFails() throws Exception
{
final String impostorId = "impostor";
@@ -208,6 +213,7 @@ public class AMQChannelTest extends QpidTestCase
verifyZeroInteractions(_messageDestination);
}
+ @Test
public void testPublishContentHeaderWhenMessageAuthorizationSucceeds() throws Exception
{
when(_virtualHost.getDefaultDestination()).thenReturn(_messageDestination);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
index dceccdc..53fca58 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
@@ -21,6 +21,10 @@
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -29,6 +33,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Random;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.protocol.ProtocolVersion;
import org.apache.qpid.server.protocol.v0_8.transport.AMQBody;
@@ -41,9 +48,9 @@ import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
import org.apache.qpid.server.protocol.v0_8.transport.FrameCreatingMethodProcessor;
import org.apache.qpid.server.protocol.v0_8.transport.HeartbeatBody;
import org.apache.qpid.server.transport.ByteBufferSender;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AMQDecoderTest extends QpidTestCase
+public class AMQDecoderTest extends UnitTestBase
{
private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0);
@@ -51,10 +58,9 @@ public class AMQDecoderTest extends QpidTestCase
private FrameCreatingMethodProcessor _methodProcessor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_methodProcessor = new FrameCreatingMethodProcessor(ProtocolVersion.v0_91);
_decoder = new ClientDecoder(_methodProcessor);
}
@@ -67,6 +73,7 @@ public class AMQDecoderTest extends QpidTestCase
return combine(sender.getSentBuffers());
}
+ @Test
public void testSingleFrameDecode() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
ByteBuffer msg = getHeartbeatBodyBuffer();
@@ -74,7 +81,9 @@ public class AMQDecoderTest extends QpidTestCase
List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
if (frames.get(0) instanceof AMQFrame)
{
- assertEquals(HeartbeatBody.FRAME.getBodyFrame().getFrameType(), ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
+ assertEquals((long) HeartbeatBody.FRAME.getBodyFrame().getFrameType(),
+ (long) ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
+
}
else
{
@@ -83,6 +92,7 @@ public class AMQDecoderTest extends QpidTestCase
}
+ @Test
public void testContentHeaderPropertiesFrame() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
final BasicContentHeaderProperties props = new BasicContentHeaderProperties();
@@ -101,7 +111,8 @@ public class AMQDecoderTest extends QpidTestCase
AMQDataBlock firstFrame = frames.get(0);
if (firstFrame instanceof AMQFrame)
{
- assertEquals(ContentHeaderBody.TYPE, ((AMQFrame) firstFrame).getBodyFrame().getFrameType());
+ assertEquals((long) ContentHeaderBody.TYPE,
+ (long) ((AMQFrame) firstFrame).getBodyFrame().getFrameType());
BasicContentHeaderProperties decodedProps = ((ContentHeaderBody)((AMQFrame)firstFrame).getBodyFrame()).getProperties();
final FieldTable headers = decodedProps.getHeaders();
assertEquals("world", headers.getString("hello"));
@@ -113,6 +124,7 @@ public class AMQDecoderTest extends QpidTestCase
}
+ @Test
public void testDecodeWithManyBuffers() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
Random random = new Random();
@@ -135,7 +147,8 @@ public class AMQDecoderTest extends QpidTestCase
List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
if (frames.get(0) instanceof AMQFrame)
{
- assertEquals(ContentBody.TYPE, ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
+ assertEquals((long) ContentBody.TYPE,
+ (long) ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
ContentBody decodedBody = (ContentBody) ((AMQFrame) frames.get(0)).getBodyFrame();
byte[] bodyBytes;
try (QpidByteBuffer payloadBuffer = decodedBody.getPayload())
@@ -151,6 +164,7 @@ public class AMQDecoderTest extends QpidTestCase
}
}
+ @Test
public void testPartialFrameDecode() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
ByteBuffer msg = getHeartbeatBodyBuffer();
@@ -163,13 +177,14 @@ public class AMQDecoderTest extends QpidTestCase
_decoder.decodeBuffer(msgA);
List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
- assertEquals(0, frames.size());
+ assertEquals((long) 0, (long) frames.size());
_decoder.decodeBuffer(msgB);
- assertEquals(1, frames.size());
+ assertEquals((long) 1, (long) frames.size());
if (frames.get(0) instanceof AMQFrame)
{
- assertEquals(HeartbeatBody.FRAME.getBodyFrame().getFrameType(), ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
+ assertEquals((long) HeartbeatBody.FRAME.getBodyFrame().getFrameType(), (long) ((AMQFrame) frames.get
+ (0)).getBodyFrame().getFrameType());
}
else
{
@@ -177,6 +192,7 @@ public class AMQDecoderTest extends QpidTestCase
}
}
+ @Test
public void testMultipleFrameDecode() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
ByteBuffer msgA = getHeartbeatBodyBuffer();
@@ -187,12 +203,13 @@ public class AMQDecoderTest extends QpidTestCase
msg.flip();
_decoder.decodeBuffer(msg);
List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
- assertEquals(2, frames.size());
+ assertEquals((long) 2, (long) frames.size());
for (AMQDataBlock frame : frames)
{
if (frame instanceof AMQFrame)
{
- assertEquals(HeartbeatBody.FRAME.getBodyFrame().getFrameType(), ((AMQFrame) frame).getBodyFrame().getFrameType());
+ assertEquals((long) HeartbeatBody.FRAME.getBodyFrame().getFrameType(),
+ (long) ((AMQFrame) frame).getBodyFrame().getFrameType());
}
else
{
@@ -201,6 +218,7 @@ public class AMQDecoderTest extends QpidTestCase
}
}
+ @Test
public void testMultiplePartialFrameDecode() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
{
ByteBuffer msgA = getHeartbeatBodyBuffer();
@@ -226,18 +244,19 @@ public class AMQDecoderTest extends QpidTestCase
_decoder.decodeBuffer(sliceA);
List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
- assertEquals(1, frames.size());
+ assertEquals((long) 1, (long) frames.size());
frames.clear();
_decoder.decodeBuffer(sliceB);
- assertEquals(1, frames.size());
+ assertEquals((long) 1, (long) frames.size());
frames.clear();
_decoder.decodeBuffer(msgC);
- assertEquals(1, frames.size());
+ assertEquals((long) 1, (long) frames.size());
for (AMQDataBlock frame : frames)
{
if (frame instanceof AMQFrame)
{
- assertEquals(HeartbeatBody.FRAME.getBodyFrame().getFrameType(), ((AMQFrame) frame).getBodyFrame().getFrameType());
+ assertEquals((long) HeartbeatBody.FRAME.getBodyFrame().getFrameType(),
+ (long) ((AMQFrame) frame).getBodyFrame().getFrameType());
}
else
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
index 2631eaa..3cdae66 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
@@ -32,9 +35,10 @@ import java.util.Collections;
import javax.security.auth.Subject;
-import org.apache.qpid.server.protocol.v0_8.transport.ProtocolInitiation;
-import org.apache.qpid.server.protocol.ProtocolVersion;
-import org.apache.qpid.server.properties.ConnectionStartProperties;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -50,6 +54,9 @@ import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.ProtocolInitiation;
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.AuthenticationResult;
@@ -59,13 +66,13 @@ import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.transport.AggregateTicker;
+import org.apache.qpid.server.transport.ByteBufferSender;
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AMQPConnection_0_8Test extends QpidTestCase
+public class AMQPConnection_0_8Test extends UnitTestBase
{
private static final String VIRTUAL_HOST_NAME = "vhost";
private static final byte[] SASL_RESPONSE = "response".getBytes();
@@ -83,10 +90,9 @@ public class AMQPConnection_0_8Test extends QpidTestCase
private AggregateTicker _ticker;
private ByteBufferSender _sender;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
EventLogger value = new EventLogger();
@@ -163,7 +169,7 @@ public class AMQPConnection_0_8Test extends QpidTestCase
_ticker = new AggregateTicker();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -172,10 +178,10 @@ public class AMQPConnection_0_8Test extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testCloseOnNoRoute()
{
{
@@ -206,6 +212,7 @@ public class AMQPConnection_0_8Test extends QpidTestCase
}
}
+ @Test
public void testConnectionEnforcesMaxSessions() throws Exception
{
AMQPConnection_0_8Impl
@@ -220,23 +227,28 @@ public class AMQPConnection_0_8Test extends QpidTestCase
// check the channel count is correct
int channelCount = conn.getSessionModels().size();
- assertEquals("Initial channel count wrong", 0, channelCount);
+ assertEquals("Initial channel count wrong", (long) 0, (long) channelCount);
+
+ assertEquals("Number of channels not correctly set.",
+ (long) maxChannels,
+ (long) conn.getSessionCountLimit());
- assertEquals("Number of channels not correctly set.", maxChannels, conn.getSessionCountLimit());
assertFalse("Connection should not be closed after opening " + maxChannels + " channels",
- conn.isClosing());
+ conn.isClosing());
for (long currentChannel = 1L; currentChannel <= maxChannels; currentChannel++)
{
conn.receiveChannelOpen((int) currentChannel);
}
assertFalse("Connection should not be closed after opening " + maxChannels + " channels",
- conn.isClosing());
- assertEquals("Maximum number of channels not set.", maxChannels, conn.getSessionModels().size());
+ conn.isClosing());
+ assertEquals("Maximum number of channels not set.",
+ (long) maxChannels,
+ (long) conn.getSessionModels().size());
conn.receiveChannelOpen(maxChannels + 1);
assertTrue("Connection should be closed after opening " + (maxChannels + 1) + " channels",
- conn.isClosing());
+ conn.isClosing());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java
index 22a0fdd..640fd11 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java
@@ -21,6 +21,7 @@ package org.apache.qpid.server.protocol.v0_8;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -37,6 +38,8 @@ import java.util.Map;
import java.util.UUID;
import com.google.common.collect.Lists;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -50,9 +53,9 @@ import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.typedmessage.TypedBytesContentWriter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
+public class MessageConverter_0_8_to_InternalTest extends UnitTestBase
{
private final MessageConverter_v0_8_to_Internal _converter = new MessageConverter_v0_8_to_Internal();
@@ -63,10 +66,9 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
private final ContentHeaderBody _contentHeaderBody = mock(ContentHeaderBody.class);
private final BasicContentHeaderProperties _basicContentHeaderProperties = mock(BasicContentHeaderProperties.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_handle.getMetaData()).thenReturn(_metaData);
when(_metaData.getMessageHeader()).thenReturn(_header);
when(_metaData.getMessagePublishInfo()).thenReturn(new MessagePublishInfo());
@@ -74,82 +76,98 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
when(_contentHeaderBody.getProperties()).thenReturn(_basicContentHeaderProperties);
}
+ @Test
public void testConvertStringMessageBody() throws Exception
{
doTestTextMessage("helloworld", "text/plain");
}
+ @Test
public void testConvertEmptyStringMessageBody() throws Exception
{
doTestTextMessage(null, "text/plain");
}
+ @Test
public void testConvertStringXmlMessageBody() throws Exception
{
doTestTextMessage("<helloworld></helloworld>", "text/xml");
}
+ @Test
public void testConvertEmptyStringXmlMessageBody() throws Exception
{
doTestTextMessage(null, "text/xml");
}
+ @Test
public void testConvertEmptyStringApplicationXmlMessageBody() throws Exception
{
doTestTextMessage(null, "application/xml");
}
+ @Test
public void testConvertStringWithContentTypeText() throws Exception
{
doTestTextMessage("foo","text/foobar");
}
+ @Test
public void testConvertStringWithContentTypeApplicationXml() throws Exception
{
doTestTextMessage("<helloworld></helloworld>","application/xml");
}
+ @Test
public void testConvertStringWithContentTypeApplicationXmlDtd() throws Exception
{
doTestTextMessage("<!DOCTYPE name []>","application/xml-dtd");
}
+ @Test
public void testConvertStringWithContentTypeApplicationFooXml() throws Exception
{
doTestTextMessage("<helloworld></helloworld>","application/foo+xml");
}
+ @Test
public void testConvertStringWithContentTypeApplicationJson() throws Exception
{
doTestTextMessage("[]","application/json");
}
+ @Test
public void testConvertStringWithContentTypeApplicationFooJson() throws Exception
{
doTestTextMessage("[]","application/foo+json");
}
+ @Test
public void testConvertStringWithContentTypeApplicationJavascript() throws Exception
{
doTestTextMessage("var foo","application/javascript");
}
+ @Test
public void testConvertStringWithContentTypeApplicationEcmascript() throws Exception
{
doTestTextMessage("var foo","application/ecmascript");
}
+ @Test
public void testConvertBytesMessageBody() throws Exception
{
doTestBytesMessage("helloworld".getBytes());
}
+ @Test
public void testConvertBytesMessageBodyNoContentType() throws Exception
{
final byte[] messageContent = "helloworld".getBytes();
doTest(messageContent, null, messageContent, null);
}
+ @Test
public void testConvertMessageBodyUnknownContentType() throws Exception
{
final byte[] messageContent = "helloworld".getBytes();
@@ -158,11 +176,13 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
}
+ @Test
public void testConvertEmptyBytesMessageBody() throws Exception
{
doTestBytesMessage(new byte[0]);
}
+ @Test
public void testConvertJmsStreamMessageBody() throws Exception
{
final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
@@ -172,6 +192,7 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
doTestStreamMessage(messageBytes, mimeType, expected);
}
+ @Test
public void testConvertEmptyJmsStreamMessageBody() throws Exception
{
final List<Object> expected = Lists.newArrayList();
@@ -179,6 +200,7 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
doTestStreamMessage(null, mimeType, expected);
}
+ @Test
public void testConvertAmqpListMessageBody() throws Exception
{
final List<Object> expected = Lists.newArrayList("apple", 43, 31.42D);
@@ -187,12 +209,14 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
doTestStreamMessage(messageBytes, "amqp/list", expected);
}
+ @Test
public void testConvertEmptyAmqpListMessageBody() throws Exception
{
final List<Object> expected = Lists.newArrayList();
doTestStreamMessage(null, "amqp/list", expected);
}
+ @Test
public void testConvertJmsMapMessageBody() throws Exception
{
final Map<String, Object> expected = Collections.singletonMap("key", "value");
@@ -201,11 +225,13 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
doTestMapMessage(messageBytes, "jms/map-message", expected);
}
+ @Test
public void testConvertEmptyJmsMapMessageBody() throws Exception
{
doTestMapMessage(null, "jms/map-message", Collections.emptyMap());
}
+ @Test
public void testConvertAmqpMapMessageBody() throws Exception
{
final Map<String, Object> expected = Collections.singletonMap("key", "value");
@@ -214,38 +240,45 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
doTestMapMessage(messageBytes, "amqp/map", expected);
}
+ @Test
public void testConvertEmptyAmqpMapMessageBody() throws Exception
{
doTestMapMessage(null, "amqp/map", Collections.emptyMap());
}
+ @Test
public void testConvertObjectStreamMessageBody() throws Exception
{
final byte[] messageBytes = getObjectStreamMessageBytes(UUID.randomUUID());
doTestObjectMessage(messageBytes, "application/java-object-stream", messageBytes);
}
+ @Test
public void testConvertObjectStream2MessageBody() throws Exception
{
final byte[] messageBytes = getObjectStreamMessageBytes(UUID.randomUUID());
doTestObjectMessage(messageBytes, "application/x-java-serialized-object", messageBytes);
}
+ @Test
public void testConvertEmptyObjectStreamMessageBody() throws Exception
{
doTestObjectMessage(null, "application/java-object-stream", new byte[0]);
}
+ @Test
public void testConvertEmptyMessageWithoutContentType() throws Exception
{
doTest(null, null, null, null);
}
+ @Test
public void testConvertEmptyMessageWithUnknownContentType() throws Exception
{
doTest(null, "foo/bar", new byte[0], "foo/bar");
}
+ @Test
public void testConvertMessageWithoutContentType() throws Exception
{
final byte[] expectedContent = "someContent".getBytes(UTF_8);
@@ -386,14 +419,14 @@ public class MessageConverter_0_8_to_InternalTest extends QpidTestCase
else if (expectedContent instanceof List)
{
assertEquals("Unexpected content",
- new ArrayList((Collection) expectedContent),
- new ArrayList((Collection) convertedMessage.getMessageBody()));
+ new ArrayList((Collection) expectedContent),
+ new ArrayList((Collection) convertedMessage.getMessageBody()));
}
else if (expectedContent instanceof Map)
{
assertEquals("Unexpected content",
- new HashMap((Map) expectedContent),
- new HashMap((Map) convertedMessage.getMessageBody()));
+ new HashMap((Map) expectedContent),
+ new HashMap((Map) convertedMessage.getMessageBody()));
}
else
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java
index fd3fac6..d6c39b4 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java
@@ -21,6 +21,7 @@ package org.apache.qpid.server.protocol.v0_8;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,6 +35,8 @@ import java.util.HashMap;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -48,21 +51,21 @@ import org.apache.qpid.server.protocol.v0_10.transport.mimecontentconverter.MapT
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.typedmessage.mimecontentconverter.ListToJmsStreamMessage;
import org.apache.qpid.server.typedmessage.mimecontentconverter.MapToJmsMapMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
+public class MessageConverter_Internal_to_0_8Test extends UnitTestBase
{
private final MessageConverter_Internal_to_v0_8 _converter = new MessageConverter_Internal_to_v0_8();
private final StoredMessage<InternalMessageMetaData> _handle = mock(StoredMessage.class);
private final AMQMessageHeader _amqpHeader = mock(AMQMessageHeader.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
}
+ @Test
public void testStringMessage() throws Exception
{
String content = "testContent";
@@ -70,6 +73,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, content.getBytes(UTF_8), mimeType);
}
+ @Test
public void testStringMessageWithUnknownMimeType() throws Exception
{
String content = "testContent";
@@ -77,12 +81,14 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, content.getBytes(UTF_8), "text/plain");
}
+ @Test
public void testStringMessageWithoutMimeType() throws Exception
{
String content = "testContent";
doTest(content, null, content.getBytes(UTF_8), "text/plain");
}
+ @Test
public void testListMessageWithMimeType() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
@@ -91,6 +97,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, "foo/bar", expectedContent, listToJmsStreamMessage.getMimeType());
}
+ @Test
public void testListMessageWithoutMimeType() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
@@ -99,6 +106,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, null, expectedContent, listToJmsStreamMessage.getMimeType());
}
+ @Test
public void testListMessageWithoutMimeTypeWithNonJmsContent() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42, Lists.newArrayList());
@@ -107,6 +115,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, null, expectedContent, listToAmqpListConverter.getMimeType());
}
+ @Test
public void testListMessageWithoutMimeTypeWithNonConvertibleItem() throws Exception
{
ArrayList<?> content = Lists.newArrayList(new MySerializable());
@@ -114,12 +123,14 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, null, getObjectStreamMessageBytes(content), "application/java-object-stream");
}
+ @Test
public void testByteArrayMessageWithoutMimeType() throws Exception
{
byte[] content = "testContent".getBytes(UTF_8);
doTest(content, null, content, "application/octet-stream");
}
+ @Test
public void testByteArrayMessageWithMimeType() throws Exception
{
byte[] content = "testContent".getBytes(UTF_8);
@@ -127,6 +138,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, content, mimeType);
}
+ @Test
public void testEmptyByteArrayMessageWithMimeType() throws Exception
{
byte[] content = new byte[0];
@@ -134,6 +146,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, content, mimeType);
}
+ @Test
public void testMapMessageWithMimeType() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -145,6 +158,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, expectedContent, mapToJmsMapMessage.getMimeType());
}
+ @Test
public void testMapMessageWithoutMimeType() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -155,6 +169,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, null, expectedContent, mapToJmsMapMessage.getMimeType());
}
+ @Test
public void testMapMessageWithMimeTypeWithNonJmsContent() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -165,6 +180,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, expectedContent, mapToAmqpMapConverter.getMimeType());
}
+ @Test
public void testMapMessageWithoutMimeTypeWithNonConvertibleEntry() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -173,6 +189,7 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, null, getObjectStreamMessageBytes(content), "application/java-object-stream");
}
+ @Test
public void testSerializableMessageWithMimeType() throws Exception
{
Serializable content = new MySerializable();
@@ -180,12 +197,14 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
doTest(content, mimeType, getObjectStreamMessageBytes(content), "application/java-object-stream");
}
+ @Test
public void testSerializableMessageWithoutMimeType() throws Exception
{
Serializable content = new MySerializable();
doTest(content, null, getObjectStreamMessageBytes(content), "application/java-object-stream");
}
+ @Test
public void testNullMessageWithoutMimeType() throws Exception
{
doTest(null, null, null, null);
@@ -249,7 +268,9 @@ public class MessageConverter_Internal_to_0_8Test extends QpidTestCase
final QpidByteBuffer content = convertedMessage.getContent();
assertArrayEquals("Unexpected content", expectedContent != null ? expectedContent : new byte[0], getBytes(content));
- assertEquals("Unexpected content type", expectedContentType, convertedMessage.getMessageHeader().getMimeType());
+ assertEquals("Unexpected content type",
+ expectedContentType,
+ convertedMessage.getMessageHeader().getMimeType());
}
private byte[] getBytes(final QpidByteBuffer content) throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org