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:19 UTC
[12/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-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java
index 6939683..33afad2 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java
@@ -20,13 +20,19 @@
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageMetaDataFactoryTest extends QpidTestCase
+public class MessageMetaDataFactoryTest extends UnitTestBase
{
private static final String CONTENT_TYPE = "content/type";
private final long _arrivalTime = System.currentTimeMillis();
@@ -34,23 +40,22 @@ public class MessageMetaDataFactoryTest extends QpidTestCase
private final AMQShortString _exchange = AMQShortString.valueOf("exch");
private MessageMetaData _mmd;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_mmd = createTestMessageMetaData();
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
if (_mmd != null)
{
_mmd.dispose();
}
}
+ @Test
public void testUnmarshalFromSingleBuffer() throws Exception
{
try(QpidByteBuffer qpidByteBuffer = QpidByteBuffer.allocateDirect(_mmd.getStorableSize()))
@@ -61,9 +66,14 @@ public class MessageMetaDataFactoryTest extends QpidTestCase
MessageMetaData recreated = MessageMetaData.FACTORY.createMetaData(qpidByteBuffer);
assertEquals("Unexpected arrival time", _arrivalTime, recreated.getArrivalTime());
- assertEquals("Unexpected routing key", _routingKey, recreated.getMessagePublishInfo().getRoutingKey());
- assertEquals("Unexpected content type", CONTENT_TYPE, recreated.getContentHeaderBody().getProperties()
- .getContentTypeAsString());
+ assertEquals("Unexpected routing key",
+ _routingKey,
+ recreated.getMessagePublishInfo().getRoutingKey());
+
+ assertEquals("Unexpected content type",
+ CONTENT_TYPE,
+ recreated.getContentHeaderBody().getProperties()
+ .getContentTypeAsString());
recreated.dispose();
}
}
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/Pre0_10CreditManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManagerTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManagerTest.java
index 0bccaeb..7f285c6 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManagerTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManagerTest.java
@@ -19,23 +19,28 @@
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
+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 Pre0_10CreditManagerTest extends QpidTestCase
+public class Pre0_10CreditManagerTest extends UnitTestBase
{
private Pre0_10CreditManager _creditManager;
private ProtocolEngine _protocolEngine;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_protocolEngine = mock(ProtocolEngine.class);
}
+ @Test
public void testBasicMessageCredit() throws Exception
{
_creditManager = new Pre0_10CreditManager(0, 0, 100L, 10L);
@@ -51,6 +56,7 @@ public class Pre0_10CreditManagerTest extends QpidTestCase
assertTrue("Creditmanager should be able to useCredit", _creditManager.useCreditForMessage(37));
}
+ @Test
public void testBytesLimitDoesNotPreventLargeMessage() throws Exception
{
_creditManager = new Pre0_10CreditManager(0, 0, 100L, 10L);
@@ -61,6 +67,7 @@ public class Pre0_10CreditManagerTest extends QpidTestCase
assertTrue("Creditmanager should be able to useCredit", _creditManager.useCreditForMessage(30));
}
+ @Test
public void testUseCreditWithNegativeMessageCredit() throws Exception
{
_creditManager = new Pre0_10CreditManager(0, 0, 100L, 10L);
@@ -79,6 +86,7 @@ public class Pre0_10CreditManagerTest extends QpidTestCase
assertTrue("Creditmanager should have credit", _creditManager.hasCredit());
}
+ @Test
public void testUseCreditWithNegativeBytesCredit() throws Exception
{
_creditManager = new Pre0_10CreditManager(0, 0, 100L, 10L);
@@ -97,6 +105,7 @@ public class Pre0_10CreditManagerTest extends QpidTestCase
assertTrue("Creditmanager should have credit", _creditManager.hasCredit());
}
+ @Test
public void testCreditAccountingWhileMessageLimitNotSet() throws Exception
{
_creditManager = new Pre0_10CreditManager(0, 0, 100L, 10L);
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/PropertyConverter_Internal_to_v0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
index 9524e2a..8a92d61 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
@@ -21,6 +21,11 @@
*/
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.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;
@@ -32,6 +37,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.exchange.ExchangeDefaults;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.internal.InternalMessage;
@@ -45,22 +53,22 @@ import org.apache.qpid.server.protocol.converter.MessageConversionException;
import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
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_8Test extends QpidTestCase
+public class PropertyConverter_Internal_to_v0_8Test extends UnitTestBase
{
private MessageConverter_Internal_to_v0_8 _messageConverter;
private NamedAddressSpace _addressSpace;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_messageConverter = new MessageConverter_Internal_to_v0_8();
_addressSpace = mock(NamedAddressSpace.class);
when(_addressSpace.getLocalAddress(anyString())).then(returnsFirstArg());
}
+ @Test
public void testDurableTrueConversion()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -69,13 +77,15 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected delivery mode",
- BasicContentHeaderProperties.PERSISTENT,
- convertedMessage.getContentHeaderBody().getProperties().getDeliveryMode());
+ (long) BasicContentHeaderProperties.PERSISTENT,
+ (long) convertedMessage.getContentHeaderBody().getProperties().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 testDurableFalseConversion()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -84,13 +94,14 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected delivery mode",
- BasicContentHeaderProperties.NON_PERSISTENT,
- convertedMessage.getContentHeaderBody().getProperties().getDeliveryMode());
+ (long) BasicContentHeaderProperties.NON_PERSISTENT,
+ (long) convertedMessage.getContentHeaderBody().getProperties().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()
{
final AMQMessageHeader header = mock(AMQMessageHeader.class);
@@ -101,10 +112,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected priority",
- priority,
- convertedMessage.getContentHeaderBody().getProperties().getPriority());
+ (long) priority,
+ (long) convertedMessage.getContentHeaderBody().getProperties().getPriority());
}
+ @Test
public void testExpirationConversion() throws InterruptedException
{
long ttl = 10000;
@@ -116,10 +128,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected expiration time",
- expiryTime,
- convertedMessage.getContentHeaderBody().getProperties().getExpiration());
+ expiryTime,
+ convertedMessage.getContentHeaderBody().getProperties().getExpiration());
}
+ @Test
public void testContentEncodingConversion()
{
String contentEncoding = "my-test-encoding";
@@ -130,10 +143,12 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected content encoding",
- contentEncoding,
- convertedMessage.getContentHeaderBody().getProperties().getEncodingAsString());
+ contentEncoding,
+ convertedMessage.getContentHeaderBody().getProperties().getEncodingAsString());
+
}
+ @Test
public void testLongContentEncodingConversion()
{
String contentEncoding = generateLongString();
@@ -152,6 +167,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testMessageIdConversion()
{
final String messageId = "testMessageId";
@@ -162,10 +178,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected messageId",
- messageId,
- convertedMessage.getContentHeaderBody().getProperties().getMessageIdAsString());
+ messageId,
+ convertedMessage.getContentHeaderBody().getProperties().getMessageIdAsString());
}
+ @Test
public void testMessageIdConversionWhenLengthExceeds255()
{
final String messageId = generateLongString();
@@ -175,9 +192,12 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertNull("Unexpected messageId", convertedMessage.getContentHeaderBody().getProperties().getMessageId());
+ assertNull("Unexpected messageId",
+ convertedMessage.getContentHeaderBody().getProperties().getMessageId());
+
}
+ @Test
public void testCorrelationIdConversionWhenLengthExceeds255()
{
final String correlationId = generateLongString();
@@ -196,6 +216,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testUserIdConversion()
{
final String userId = "testUserId";
@@ -206,10 +227,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected userId",
- userId,
- convertedMessage.getContentHeaderBody().getProperties().getUserIdAsString());
+ userId,
+ convertedMessage.getContentHeaderBody().getProperties().getUserIdAsString());
}
+ @Test
public void testUserIdConversionWhenLengthExceeds255()
{
final String userId = generateLongString();
@@ -222,6 +244,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertNull("Unexpected userId", convertedMessage.getContentHeaderBody().getProperties().getUserId());
}
+ @Test
public void testTimestampConversion()
{
final long timestamp = System.currentTimeMillis();
@@ -232,10 +255,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected timestamp",
- timestamp,
- convertedMessage.getContentHeaderBody().getProperties().getTimestamp());
+ timestamp,
+ convertedMessage.getContentHeaderBody().getProperties().getTimestamp());
}
+ @Test
public void testHeadersConversion()
{
final Map<String, Object> properties = new HashMap<>();
@@ -257,6 +281,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected application properties", properties, new HashMap<>(convertedHeaders));
}
+ @Test
public void testHeadersConversionWhenKeyLengthExceeds255()
{
final Map<String, Object> properties = Collections.singletonMap(generateLongString(), "test");
@@ -280,6 +305,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testReplyToConversionWhenQueueIsSpecified()
{
final String replyTo = "testQueue";
@@ -294,10 +320,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected reply-to",
- "direct:////" + replyTo,
- convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
+ "direct:////" + replyTo,
+ convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenExchangeIsSpecified()
{
final String replyTo = "testExchange";
@@ -314,10 +341,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected reply-to",
- "fanout://" + replyTo + "//",
- convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
+ "fanout://" + replyTo + "//",
+ convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenExchangeAndRoutingKeyAreSpecified()
{
final String exchangeName = "testExchange";
@@ -336,10 +364,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected reply-to",
- "topic://" + exchangeName + "//?routingkey='" + routingKey + "'",
- convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
+ "topic://" + exchangeName + "//?routingkey='" + routingKey + "'",
+ convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
}
+ @Test
public void testReplyToConversionWhenNonExistingExchangeAndRoutingKeyAreSpecified()
{
final String exchangeName = "testExchange";
@@ -353,10 +382,11 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
AMQMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected reply-to",
- "direct:////?routingkey='" + replyTo + "'",
- convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
+ "direct:////?routingkey='" + replyTo + "'",
+ convertedMessage.getContentHeaderBody().getProperties().getReplyToAsString());
}
+ @Test
public void testToConversionWhenExchangeAndRoutingKeyIsSpecified()
{
final String testExchange = "testExchange";
@@ -378,6 +408,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testRoutingKey, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenExchangeIsSpecified()
{
final String testExchange = "testExchange";
@@ -395,6 +426,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", "", messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testConversionWhenToIsUnsetButInitialRoutingKeyIsSet()
{
final String testExchange = "testExchange";
@@ -416,6 +448,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testRoutingKey, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenQueueIsSpecified()
{
final String testQueue = "testQueue";
@@ -433,6 +466,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", testQueue, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenGlobalAddressIsUnknown()
{
final String globalPrefix = "/testPrefix";
@@ -453,6 +487,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", globalAddress, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenGlobalAddressIsKnown()
{
final String globalPrefix = "/testPrefix";
@@ -474,6 +509,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
assertEquals("Unexpected routing key", queueName, messagePublishInfo.getRoutingKey().toString());
}
+ @Test
public void testToConversionWhenExchangeLengthExceeds255()
{
final String testExchange = generateLongString();
@@ -494,6 +530,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenRoutingKeyLengthExceeds255()
{
final String testExchange = "testExchange";
@@ -514,6 +551,7 @@ public class PropertyConverter_Internal_to_v0_8Test extends QpidTestCase
}
}
+ @Test
public void testToConversionWhenDestinationIsSpecifiedButDoesNotExists()
{
final String testDestination = "testDestination";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java
index 4c9cf37..ae54b56 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java
@@ -21,12 +21,18 @@
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.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -34,21 +40,21 @@ import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperti
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.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
+public class PropertyConverter_v0_8_to_InternalTest extends UnitTestBase
{
private MessageConverter_v0_8_to_Internal _messageConverter;
private NamedAddressSpace _addressSpace;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_messageConverter = new MessageConverter_v0_8_to_Internal();
_addressSpace = mock(NamedAddressSpace.class);
}
+ @Test
public void testDeliveryModePersistentConversion()
{
BasicContentHeaderProperties header = new BasicContentHeaderProperties();
@@ -59,9 +65,10 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertTrue("Unexpected persistence of message", convertedMessage.isPersistent());
assertTrue("Unexpected persistence of meta data",
- convertedMessage.getStoredMessage().getMetaData().isPersistent());
+ convertedMessage.getStoredMessage().getMetaData().isPersistent());
}
+ @Test
public void testDeliveryModeNonPersistentConversion()
{
BasicContentHeaderProperties header = new BasicContentHeaderProperties();
@@ -72,9 +79,10 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
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()
{
byte priority = (byte) 7;
@@ -84,9 +92,13 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected priority", priority, convertedMessage.getMessageHeader().getPriority());
+ assertEquals("Unexpected priority",
+ (long) priority,
+ (long) convertedMessage.getMessageHeader().getPriority());
+
}
+ @Test
public void testExpirationConversion()
{
long ttl = 10000;
@@ -101,6 +113,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected expiration", expiryTime, convertedMessage.getMessageHeader().getExpiration());
}
+ @Test
public void testContentEncodingConversion()
{
String contentEncoding = "my-test-encoding";
@@ -110,9 +123,13 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected content encoding", contentEncoding, convertedMessage.getMessageHeader().getEncoding());
+ assertEquals("Unexpected content encoding",
+ contentEncoding,
+ convertedMessage.getMessageHeader().getEncoding());
+
}
+ @Test
public void testMessageIdConversion()
{
final String messageId = "testMessageId";
@@ -122,11 +139,10 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
- assertEquals("Unexpected messageId",
- messageId,
- convertedMessage.getMessageHeader().getMessageId());
+ assertEquals("Unexpected messageId", messageId, convertedMessage.getMessageHeader().getMessageId());
}
+ @Test
public void testCorrelationIdStringConversion()
{
final String correlationId = "testMessageCorrelationId";
@@ -137,10 +153,11 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected correlationId",
- correlationId,
- convertedMessage.getMessageHeader().getCorrelationId());
+ correlationId,
+ convertedMessage.getMessageHeader().getCorrelationId());
}
+ @Test
public void testUserIdConversion()
{
final String userId = "testUserId";
@@ -153,6 +170,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected userId", userId, convertedMessage.getMessageHeader().getUserId());
}
+ @Test
public void testReplyToConversionForDirectExchangeAndRoutingKey()
{
String exchangeName = "amq.direct";
@@ -165,10 +183,11 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
InternalMessage convertedMessage = _messageConverter.convert(originalMessage, _addressSpace);
assertEquals("Unexpected replyTo",
- exchangeName + "/" + routingKey,
- convertedMessage.getMessageHeader().getReplyTo());
+ exchangeName + "/" + routingKey,
+ convertedMessage.getMessageHeader().getReplyTo());
}
+ @Test
public void testReplyToConversionForFanoutExchange()
{
String exchangeName = "amq.fanout";
@@ -182,6 +201,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected replyTo", exchangeName, convertedMessage.getMessageHeader().getReplyTo());
}
+ @Test
public void testReplyToConversionForDefaultDestination()
{
String exchangeName = "";
@@ -196,6 +216,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected replyTo", routingKey, convertedMessage.getMessageHeader().getReplyTo());
}
+ @Test
public void testReplyToNonBurl()
{
final String replyTo = "test/routing";
@@ -208,6 +229,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected replyTo", replyTo, convertedMessage.getMessageHeader().getReplyTo());
}
+ @Test
public void testTimestampConversion()
{
final long creationTime = System.currentTimeMillis();
@@ -220,6 +242,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected timestamp", creationTime, convertedMessage.getMessageHeader().getTimestamp());
}
+ @Test
public void testHeadersConversion()
{
Map<String, Object> properties = new HashMap<>();
@@ -235,6 +258,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected headers", properties, new HashMap<>(headers));
}
+ @Test
public void testContentTypeConversion()
{
final String contentType = "text/json";
@@ -247,6 +271,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected content type", contentType, convertedMessage.getMessageHeader().getMimeType());
}
+ @Test
public void testTypeConversion()
{
final String type = "JMSType";
@@ -259,6 +284,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected type", type, convertedMessage.getMessageHeader().getType());
}
+ @Test
public void testApplicationIdConversion()
{
final String applicationId = "appId";
@@ -271,6 +297,7 @@ public class PropertyConverter_v0_8_to_InternalTest extends QpidTestCase
assertEquals("Unexpected applicationId", applicationId, convertedMessage.getMessageHeader().getAppId());
}
+ @Test
public void testBasicPublishConversion()
{
final String exchangeName = "amq.direct";
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/ReferenceCountingTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index 33140f0..c6be923 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
@@ -20,40 +20,46 @@
*/
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertEquals;
+
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
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.message.EnqueueableMessage;
-import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.store.MessageCounter;
import org.apache.qpid.server.store.MessageDurability;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TestMemoryMessageStore;
import org.apache.qpid.server.store.Transaction;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests that reference counting works correctly with AMQMessage and the message store
*/
-public class ReferenceCountingTest extends QpidTestCase
+public class ReferenceCountingTest extends UnitTestBase
{
private TestMemoryMessageStore _store;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_store = new TestMemoryMessageStore();
}
/**
* Check that when the reference count is decremented the message removes itself from the store
*/
+ @Test
public void testMessageGetsRemoved() throws QpidException
{
ContentHeaderBody chb = createPersistentContentHeader();
@@ -70,11 +76,11 @@ public class ReferenceCountingTest extends QpidTestCase
MessageReference ref = message.newReference();
- assertEquals(1, getStoreMessageCount());
+ assertEquals((long) 1, (long) getStoreMessageCount());
ref.release();
- assertEquals(0, getStoreMessageCount());
+ assertEquals((long) 0, (long) getStoreMessageCount());
}
private int getStoreMessageCount()
@@ -92,6 +98,7 @@ public class ReferenceCountingTest extends QpidTestCase
return chb;
}
+ @Test
public void testMessageRemains() throws QpidException
{
@@ -110,10 +117,10 @@ public class ReferenceCountingTest extends QpidTestCase
MessageReference ref = message.newReference();
- assertEquals(1, getStoreMessageCount());
+ assertEquals((long) 1, (long) getStoreMessageCount());
MessageReference ref2 = message.newReference();
ref.release();
- assertEquals(1, getStoreMessageCount());
+ assertEquals((long) 1, (long) getStoreMessageCount());
}
private TransactionLogResource createTransactionLogResource(final String queueName)
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/UnacknowledgedMessageMapTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java
index 8f22b08..fd635e0 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v0_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -27,13 +29,14 @@ import java.util.Collection;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
+import org.junit.Test;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageInstanceConsumer;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class UnacknowledgedMessageMapTest extends QpidTestCase
+public class UnacknowledgedMessageMapTest extends UnitTestBase
{
public static final Function<MessageConsumerAssociation, MessageInstance>
MESSAGE_INSTANCE_FUNCTION = new Function<MessageConsumerAssociation, MessageInstance>()
@@ -47,16 +50,17 @@ public class UnacknowledgedMessageMapTest extends QpidTestCase
};
private final MessageInstanceConsumer _consumer = mock(MessageInstanceConsumer.class);
+ @Test
public void testDeletedMessagesCantBeAcknowledged()
{
UnacknowledgedMessageMap map = new UnacknowledgedMessageMapImpl(100, mock(CreditRestorer.class));
final int expectedSize = 5;
MessageInstance[] msgs = populateMap(map,expectedSize);
- assertEquals(expectedSize,map.size());
+ assertEquals((long) expectedSize, (long) map.size());
Collection<MessageConsumerAssociation> acknowledged = map.acknowledge(100, true);
Collection<MessageInstance> acknowledgedMessages = Collections2.transform(acknowledged, MESSAGE_INSTANCE_FUNCTION);
- assertEquals(expectedSize, acknowledged.size());
- assertEquals(0,map.size());
+ assertEquals((long) expectedSize, (long) acknowledged.size());
+ assertEquals((long) 0, (long) map.size());
for(int i = 0; i < expectedSize; i++)
{
assertTrue("Message " + i + " is missing", acknowledgedMessages.contains(msgs[i]));
@@ -68,13 +72,12 @@ public class UnacknowledgedMessageMapTest extends QpidTestCase
when(msgs[2].makeAcquisitionUnstealable(_consumer)).thenReturn(Boolean.FALSE);
when(msgs[4].makeAcquisitionUnstealable(_consumer)).thenReturn(Boolean.FALSE);
- assertEquals(expectedSize,map.size());
-
+ assertEquals((long) expectedSize, (long) map.size());
acknowledged = map.acknowledge(100, true);
acknowledgedMessages = Collections2.transform(acknowledged, MESSAGE_INSTANCE_FUNCTION);
- assertEquals(expectedSize-2, acknowledged.size());
- assertEquals(0,map.size());
+ assertEquals((long) (expectedSize - 2), (long) acknowledged.size());
+ assertEquals((long) 0, (long) map.size());
for(int i = 0; i < expectedSize; i++)
{
assertEquals(i != 2 && i != 4, acknowledgedMessages.contains(msgs[i]));
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/transport/BasicContentHeaderPropertiesTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
index 32e6238..251b4bd 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
@@ -20,13 +20,17 @@
*/
package org.apache.qpid.server.protocol.v0_8.transport;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
import org.apache.qpid.server.protocol.v0_8.FieldTable;
-import org.apache.qpid.test.utils.QpidTestCase;
-
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BasicContentHeaderPropertiesTest extends QpidTestCase
+public class BasicContentHeaderPropertiesTest extends UnitTestBase
{
private BasicContentHeaderProperties _testProperties;
@@ -42,10 +46,9 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
_testProperties = new BasicContentHeaderProperties();
}
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_testTable = new FieldTable();
_testTable.setString("TestString", _testString);
_testTable.setInteger("Testint", _testint);
@@ -53,6 +56,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
_testProperties.setHeaders(_testTable);
}
+ @Test
public void testGetPropertyListSize()
{
//needs a better test but at least we're exercising the code !
@@ -70,21 +74,24 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
int size = _testProperties.getPropertyListSize();
- assertEquals(expectedSize, size);
+ assertEquals((long) expectedSize, (long) size);
}
+ @Test
public void testGetSetPropertyFlags()
{
_testProperties.setPropertyFlags(99);
- assertEquals(99, _testProperties.getPropertyFlags());
+ assertEquals((long) 99, (long) _testProperties.getPropertyFlags());
}
+ @Test
public void testPopulatePropertiesFromBuffer() throws Exception
{
QpidByteBuffer buf = QpidByteBuffer.wrap(new byte[300]);
_testProperties.populatePropertiesFromBuffer(buf, 99, 99);
}
+ @Test
public void testSetGetContentType()
{
String contentType = "contentType";
@@ -92,6 +99,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(contentType, _testProperties.getContentTypeAsString());
}
+ @Test
public void testSetGetEncoding()
{
String encoding = "encoding";
@@ -99,26 +107,30 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(encoding, _testProperties.getEncodingAsString());
}
+ @Test
public void testSetGetHeaders()
{
_testProperties.setHeaders(_testTable);
assertEquals(_testTable, _testProperties.getHeaders());
}
+ @Test
public void testSetGetDeliveryMode()
{
byte deliveryMode = 1;
_testProperties.setDeliveryMode(deliveryMode);
- assertEquals(deliveryMode, _testProperties.getDeliveryMode());
+ assertEquals((long) deliveryMode, (long) _testProperties.getDeliveryMode());
}
+ @Test
public void testSetGetPriority()
{
byte priority = 1;
_testProperties.setPriority(priority);
- assertEquals(priority, _testProperties.getPriority());
+ assertEquals((long) priority, (long) _testProperties.getPriority());
}
+ @Test
public void testSetGetCorrelationId()
{
String correlationId = "correlationId";
@@ -126,6 +138,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(correlationId, _testProperties.getCorrelationIdAsString());
}
+ @Test
public void testSetGetReplyTo()
{
String replyTo = "replyTo";
@@ -133,6 +146,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(replyTo, _testProperties.getReplyToAsString());
}
+ @Test
public void testSetGetExpiration()
{
long expiration = 999999999;
@@ -143,6 +157,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(expiration, _testProperties.getExpiration());
}
+ @Test
public void testSetGetMessageId()
{
String messageId = "messageId";
@@ -150,6 +165,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(messageId, _testProperties.getMessageIdAsString());
}
+ @Test
public void testSetGetTimestamp()
{
long timestamp = System.currentTimeMillis();
@@ -157,6 +173,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(timestamp, _testProperties.getTimestamp());
}
+ @Test
public void testSetGetType()
{
String type = "type";
@@ -164,6 +181,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(type, _testProperties.getTypeAsString());
}
+ @Test
public void testSetGetUserId()
{
String userId = "userId";
@@ -171,6 +189,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(userId, _testProperties.getUserIdAsString());
}
+ @Test
public void testSetGetAppId()
{
String appId = "appId";
@@ -178,6 +197,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
assertEquals(appId, _testProperties.getAppIdAsString());
}
+ @Test
public void testSetGetClusterId()
{
String clusterId = "clusterId";
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/transport/MessagePublishInfoImplTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
index fa14fc1..1e0f5db 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
@@ -20,23 +20,30 @@
*/
package org.apache.qpid.server.protocol.v0_8.transport;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessagePublishInfoImplTest extends QpidTestCase
+public class MessagePublishInfoImplTest extends UnitTestBase
{
private MessagePublishInfo _mpi;
private final AMQShortString _exchange = new AMQShortString("exchange");
private final AMQShortString _routingKey = new AMQShortString("routingKey");
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_mpi = new MessagePublishInfo(_exchange, true, true, _routingKey);
}
/** Test that we can update the exchange value. */
+ @Test
public void testExchange()
{
assertEquals(_exchange, _mpi.getExchange());
@@ -51,6 +58,7 @@ public class MessagePublishInfoImplTest extends QpidTestCase
/**
* Check that the immedate value is set correctly and defaulted correctly
*/
+ @Test
public void testIsImmediate()
{
//Check that the set value is correct
@@ -61,14 +69,14 @@ public class MessagePublishInfoImplTest extends QpidTestCase
assertFalse("Default value for immediate should be false", mpi.isImmediate());
mpi.setImmediate(true);
-
- assertTrue("Updated value for immediate not as expected", mpi.isImmediate());
+ assertTrue("Updated value for immediate not as expected", mpi.isImmediate());
}
/**
* Check that the mandatory value is set correctly and defaulted correctly
*/
+ @Test
public void testIsMandatory()
{
assertTrue("Set value for mandatory not as expected", _mpi.isMandatory());
@@ -85,6 +93,7 @@ public class MessagePublishInfoImplTest extends QpidTestCase
/**
* Check that the routingKey value is perserved
*/
+ @Test
public void testRoutingKey()
{
assertEquals(_routingKey, _mpi.getRoutingKey());
@@ -95,6 +104,5 @@ public class MessagePublishInfoImplTest extends QpidTestCase
assertEquals(newRoutingKey, _mpi.getRoutingKey());
//Ensure that the new routingKey doesn't equal the old one
assertFalse(_routingKey.equals(_mpi.getRoutingKey()));
-
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java b/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
index b795d55..8bc0c7f 100644
--- a/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
+++ b/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
@@ -22,6 +22,9 @@ package org.apache.qpid.server.protocol.v1_0.store.bdb;
import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -35,6 +38,7 @@ import java.util.stream.Collectors;
import com.google.common.io.Files;
import com.sleepycat.je.CacheMode;
+import org.junit.Before;
import org.apache.qpid.server.protocol.v1_0.store.LinkStore;
import org.apache.qpid.server.protocol.v1_0.store.LinkStoreTestCase;
@@ -43,6 +47,7 @@ import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
import org.apache.qpid.server.store.berkeleydb.StandardEnvironmentConfiguration;
import org.apache.qpid.server.store.berkeleydb.StandardEnvironmentFacade;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
public class BDBLinkStoreTest extends LinkStoreTestCase
{
@@ -50,6 +55,14 @@ public class BDBLinkStoreTest extends LinkStoreTestCase
private File _storeFolder;
@Override
+ @Before
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+ super.setUp();
+ }
+
+ @Override
protected LinkStore createLinkStore()
{
_storeFolder = Files.createTempDir();
@@ -75,7 +88,13 @@ public class BDBLinkStoreTest extends LinkStoreTestCase
@Override
protected void deleteLinkStore()
{
- _facade.close();
- FileUtils.delete(_storeFolder, true);
+ if (_facade != null)
+ {
+ _facade.close();
+ }
+ if (_storeFolder != null)
+ {
+ FileUtils.delete(_storeFolder, true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
index 42abcf9..9647fcf 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v1_0;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
@@ -34,6 +36,9 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageInstanceConsumer;
@@ -55,9 +60,9 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotationsSec
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConsumerTarget_1_0Test extends QpidTestCase
+public class ConsumerTarget_1_0Test extends UnitTestBase
{
private final AMQPDescribedTypeRegistry _describedTypeRegistry = AMQPDescribedTypeRegistry.newInstance()
.registerTransportLayer()
@@ -68,10 +73,9 @@ public class ConsumerTarget_1_0Test extends QpidTestCase
private ConsumerTarget_1_0 _consumerTarget;
private SendingLinkEndpoint _sendingLinkEndpoint;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
final AMQPConnection_1_0 connection = mock(AMQPConnection_1_0.class);
final Session_1_0 session = mock(Session_1_0.class);
_sendingLinkEndpoint = mock(SendingLinkEndpoint.class);
@@ -85,6 +89,7 @@ public class ConsumerTarget_1_0Test extends QpidTestCase
_consumerTarget = new ConsumerTarget_1_0(_sendingLinkEndpoint, true);
}
+ @Test
public void testTTLAdjustedOnSend() throws Exception
{
final MessageInstanceConsumer comsumer = mock(MessageInstanceConsumer.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
index b5832c4..ed91f28 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
@@ -19,27 +19,33 @@
package org.apache.qpid.server.protocol.v1_0;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.mock;
import java.util.regex.Pattern;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.protocol.LinkModel;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class LinkRegistryTest extends QpidTestCase
+public class LinkRegistryTest extends UnitTestBase
{
public static final Pattern ANY = Pattern.compile(".*");
private LinkRegistryImpl _linkRegistry;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
_linkRegistry = new LinkRegistryImpl(virtualHost);
}
+ @Test
public void testGetSendingLink() throws Exception
{
String remoteContainerId = "testRemoteContainerId";
@@ -51,6 +57,7 @@ public class LinkRegistryTest extends QpidTestCase
assertSame("Two calls to LinkRegistryModel#getSendingLink should return the same object", link, link2);
}
+ @Test
public void testGetReceivingLink() throws Exception
{
String remoteContainerId = "testRemoteContainerId";
@@ -62,83 +69,93 @@ public class LinkRegistryTest extends QpidTestCase
assertSame("Two calls to LinkRegistryModel#getReceivingLink should return the same object", link, link2);
}
+ @Test
public void testPurgeSendingLinksFromRegistryWithEmptyRegistry() throws Exception
{
_linkRegistry.purgeSendingLinks(ANY, ANY);
}
+ @Test
public void testPurgeSendingLinksExactMatch() throws Exception
{
_linkRegistry.getSendingLink("testContainerId", "testLinkName");
_linkRegistry.purgeSendingLinks(Pattern.compile("testContainerId"), Pattern.compile("testLinkName"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 0);
+ assertEquals((long) dump.getContainers().size(), (long) 0);
}
+ @Test
public void testPurgeSendingLinksRegEx() throws Exception
{
_linkRegistry.getSendingLink("testContainerId", "testLinkName");
_linkRegistry.purgeSendingLinks(Pattern.compile("test.*Id"), Pattern.compile("testLink.*"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 0);
+ assertEquals((long) dump.getContainers().size(), (long) 0);
}
+ @Test
public void testPurgeSendingLinksNotMatchingRegEx() throws Exception
{
_linkRegistry.getSendingLink("testContainerId", "testLinkName");
_linkRegistry.purgeSendingLinks(Pattern.compile("Foo.*"), Pattern.compile(".*bar"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 1);
+ assertEquals((long) dump.getContainers().size(), (long) 1);
}
+ @Test
public void testPurgeSendingLinksDoesNotRemoveReceivingLink() throws Exception
{
_linkRegistry.getSendingLink("testContainerId", "testLinkName");
_linkRegistry.getReceivingLink("testContainerId", "testLinkName");
_linkRegistry.purgeSendingLinks(Pattern.compile("testContainerId"), Pattern.compile("testLinkName"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 1);
- assertEquals(dump.getContainers().get("testContainerId").getReceivingLinks().size(), 1);
- assertEquals(dump.getContainers().get("testContainerId").getSendingLinks().size(), 0);
+ assertEquals((long) dump.getContainers().size(), (long) 1);
+ assertEquals((long) dump.getContainers().get("testContainerId").getReceivingLinks().size(), (long) 1);
+ assertEquals((long) dump.getContainers().get("testContainerId").getSendingLinks().size(), (long) 0);
}
+ @Test
public void testPurgeReceivingLinksFromRegistryWithEmptyRegistry() throws Exception
{
_linkRegistry.purgeReceivingLinks(ANY, ANY);
}
+ @Test
public void testPurgeReceivingLinksExactMatch() throws Exception
{
_linkRegistry.getReceivingLink("testContainerId", "testLinkName");
_linkRegistry.purgeReceivingLinks(Pattern.compile("testContainerId"), Pattern.compile("testLinkName"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 0);
+ assertEquals((long) dump.getContainers().size(), (long) 0);
}
+ @Test
public void testPurgeReceivingLinksRegEx() throws Exception
{
_linkRegistry.getReceivingLink("testContainerId", "testLinkName");
_linkRegistry.purgeReceivingLinks(Pattern.compile("test.*Id"), Pattern.compile("testLink.*"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 0);
+ assertEquals((long) dump.getContainers().size(), (long) 0);
}
+ @Test
public void testPurgeReceivingLinksNotMatchingRegEx() throws Exception
{
_linkRegistry.getReceivingLink("testContainerId", "testLinkName");
_linkRegistry.purgeReceivingLinks(Pattern.compile("Foo.*"), Pattern.compile(".*bar"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 1);
+ assertEquals((long) dump.getContainers().size(), (long) 1);
}
+ @Test
public void testPurgeReceivingLinksDoesNotRemoveSendingLink() throws Exception
{
_linkRegistry.getSendingLink("testContainerId", "testLinkName");
_linkRegistry.getReceivingLink("testContainerId", "testLinkName");
_linkRegistry.purgeReceivingLinks(Pattern.compile("testContainerId"), Pattern.compile("testLinkName"));
LinkRegistryImpl.LinkRegistryDump dump = _linkRegistry.dump();
- assertEquals(dump.getContainers().size(), 1);
- assertEquals(dump.getContainers().get("testContainerId").getReceivingLinks().size(), 0);
- assertEquals(dump.getContainers().get("testContainerId").getSendingLinks().size(), 1);
+ assertEquals((long) dump.getContainers().size(), (long) 1);
+ assertEquals((long) dump.getContainers().get("testContainerId").getReceivingLinks().size(), (long) 0);
+ assertEquals((long) dump.getContainers().get("testContainerId").getSendingLinks().size(), (long) 1);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
index 9ee7c86..090834d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.protocol.v1_0;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.qpid.server.protocol.v1_0.MessageConverter_from_1_0.getContentType;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -36,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;
@@ -56,9 +60,9 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.DataSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.EncodingRetainingSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotationsSection;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
+public class MessageConverter_Internal_to_1_0Test extends UnitTestBase
{
private final MessageConverter_Internal_to_v1_0 _converter = new MessageConverter_Internal_to_v1_0();
private final AMQPDescribedTypeRegistry _typeRegistry = AMQPDescribedTypeRegistry.newInstance()
@@ -71,13 +75,13 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
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";
@@ -90,6 +94,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.TEXT_MESSAGE.getType());
}
+ @Test
public void testStringMessageWithUnknownMimeType() throws Exception
{
String content = "testContent";
@@ -102,6 +107,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.TEXT_MESSAGE.getType());
}
+ @Test
public void testStringMessageWithoutMimeType() throws Exception
{
String content = "testContent";
@@ -113,6 +119,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.TEXT_MESSAGE.getType());
}
+ @Test
public void testListMessageWithMimeType() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
@@ -124,6 +131,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.STREAM_MESSAGE.getType());
}
+ @Test
public void testListMessageWithoutMimeType() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42);
@@ -135,6 +143,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.STREAM_MESSAGE.getType());
}
+ @Test
public void testListMessageWithoutMimeTypeWithNonJmsContent() throws Exception
{
ArrayList<?> content = Lists.newArrayList("testItem", 37.5, 42, Lists.newArrayList());
@@ -146,6 +155,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
null);
}
+ @Test
public void testByteArrayMessageWithoutMimeType() throws Exception
{
byte[] content = "testContent".getBytes(UTF_8);
@@ -157,6 +167,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.BYTES_MESSAGE.getType());
}
+ @Test
public void testByteArrayMessageWithMimeType() throws Exception
{
byte[] content = "testContent".getBytes(UTF_8);
@@ -169,6 +180,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.BYTES_MESSAGE.getType());
}
+ @Test
public void testEmptyByteArrayMessageWithMimeType() throws Exception
{
byte[] content = new byte[0];
@@ -181,6 +193,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.BYTES_MESSAGE.getType());
}
+ @Test
public void testMapMessageWithMimeType() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -195,6 +208,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.MAP_MESSAGE.getType());
}
+ @Test
public void testMapMessageWithoutMimeType() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -208,6 +222,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.MAP_MESSAGE.getType());
}
+ @Test
public void testMapMessageWithMimeTypeWithNonJmsContent() throws Exception
{
HashMap<Object, Object> content = new HashMap<>();
@@ -221,6 +236,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
null);
}
+ @Test
public void testSerializableMessageWithMimeType() throws Exception
{
Serializable content = new MySerializable();
@@ -233,6 +249,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.OBJECT_MESSAGE.getType());
}
+ @Test
public void testSerializableMessageWithoutMimeType() throws Exception
{
Serializable content = new MySerializable();
@@ -244,6 +261,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.OBJECT_MESSAGE.getType());
}
+ @Test
public void testNullMessageWithoutMimeType() throws Exception
{
doTest(null,
@@ -254,6 +272,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
JmsMessageTypeAnnotation.MESSAGE.getType());
}
+ @Test
public void testUuidMessageWithMimeType() throws Exception
{
UUID content = UUID.randomUUID();
@@ -284,7 +303,7 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
{
SectionDecoder sectionDecoder = new SectionDecoderImpl(_typeRegistry.getSectionDecoderRegistry());
final List<EncodingRetainingSection<?>> sections = sectionDecoder.parseAll(content);
- assertEquals("Unexpected number of sections", expectedNumberOfSections, sections.size());
+ assertEquals("Unexpected number of sections", (long) expectedNumberOfSections, (long) sections.size());
return sections;
}
@@ -387,8 +406,8 @@ public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
else
{
assertEquals("Unexpected annotation 'x-opt-jms-msg-type'",
- expectedJmsTypeAnnotation,
- jmsMessageTypeAnnotation);
+ expectedJmsTypeAnnotation,
+ jmsMessageTypeAnnotation);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org