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:34 UTC
[27/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-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
index 37b6871..fef48f3 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
@@ -20,6 +20,9 @@
package org.apache.qpid.server.consumer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.inOrder;
@@ -30,6 +33,8 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.InOrder;
import org.apache.qpid.server.message.MessageContainer;
@@ -46,9 +51,9 @@ import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AbstractConsumerTargetTest extends QpidTestCase
+public class AbstractConsumerTargetTest extends UnitTestBase
{
private TestAbstractConsumerTarget _consumerTarget;
@@ -58,10 +63,9 @@ public class AbstractConsumerTargetTest extends QpidTestCase
private AMQPSession<?,TestAbstractConsumerTarget> _session = mock(AMQPSession.class);
private MessageInstance _messageInstance;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_connection.getContextValue(eq(Long.class),
eq(Consumer.SUSPEND_NOTIFICATION_PERIOD))).thenReturn(1000000L);
@@ -77,26 +81,33 @@ public class AbstractConsumerTargetTest extends QpidTestCase
_consumerTarget.consumerAdded(_consumer);
}
+ @Test
public void testClose() throws Exception
{
_consumerTarget = new TestAbstractConsumerTarget();
- assertEquals("Unexpected number of consumers", 0, _consumerTarget.getConsumers().size());
+ assertEquals("Unexpected number of consumers", (long) 0, (long) _consumerTarget.getConsumers().size());
_consumerTarget.consumerAdded(_consumer);
- assertEquals("Unexpected number of consumers after add", 1, _consumerTarget.getConsumers().size());
+ assertEquals("Unexpected number of consumers after add",
+ (long) 1,
+ (long) _consumerTarget.getConsumers().size());
+
_consumerTarget.close();
- assertEquals("Unexpected number of consumers after close", 0, _consumerTarget.getConsumers().size());
+ assertEquals("Unexpected number of consumers after close",
+ (long) 0,
+ (long) _consumerTarget.getConsumers().size());
verify(_consumer, times(1)).close();
}
+ @Test
public void testNotifyWork() throws Exception
{
InOrder order = inOrder(_consumer);
_consumerTarget = new TestAbstractConsumerTarget();
- assertEquals("Unexpected number of consumers", 0, _consumerTarget.getConsumers().size());
+ assertEquals("Unexpected number of consumers", (long) 0, (long) _consumerTarget.getConsumers().size());
_consumerTarget.consumerAdded(_consumer);
@@ -119,6 +130,7 @@ public class AbstractConsumerTargetTest extends QpidTestCase
verifyNoMoreInteractions(_consumer);
}
+ @Test
public void testConversionExceptionPolicyClose() throws Exception
{
configureBehaviour(true, MessageSource.MessageConversionExceptionHandlingPolicy.CLOSE);
@@ -130,14 +142,15 @@ public class AbstractConsumerTargetTest extends QpidTestCase
}
catch (ConnectionScopedRuntimeException e)
{
+ final boolean condition = e.getCause() instanceof MessageConversionException;
assertTrue(String.format("ConnectionScopedRuntimeException has unexpected cause '%s'",
- e.getCause().getClass().getSimpleName()),
- e.getCause() instanceof MessageConversionException);
+ e.getCause().getClass().getSimpleName()), condition);
}
assertTrue("message credit was not restored", _consumerTarget.isCreditRestored());
verify(_messageInstance, never()).routeToAlternate(any(Action.class), any(ServerTransaction.class));
}
+ @Test
public void testConversionExceptionPolicyCloseForNonAcquiringConsumer() throws Exception
{
configureBehaviour(false, MessageSource.MessageConversionExceptionHandlingPolicy.CLOSE);
@@ -149,14 +162,15 @@ public class AbstractConsumerTargetTest extends QpidTestCase
}
catch (ConnectionScopedRuntimeException e)
{
+ final boolean condition = e.getCause() instanceof MessageConversionException;
assertTrue(String.format("ConnectionScopedRuntimeException has unexpected cause '%s'",
- e.getCause().getClass().getSimpleName()),
- e.getCause() instanceof MessageConversionException);
+ e.getCause().getClass().getSimpleName()), condition);
}
assertTrue("message credit was not restored", _consumerTarget.isCreditRestored());
verify(_messageInstance, never()).routeToAlternate(any(Action.class), any(ServerTransaction.class));
}
+ @Test
public void testConversionExceptionPolicyReroute() throws Exception
{
configureBehaviour(true, MessageSource.MessageConversionExceptionHandlingPolicy.ROUTE_TO_ALTERNATE);
@@ -166,6 +180,7 @@ public class AbstractConsumerTargetTest extends QpidTestCase
verify(_messageInstance).routeToAlternate(any(Action.class), any(ServerTransaction.class));
}
+ @Test
public void testConversionExceptionPolicyRerouteForNonAcquiringConsumer() throws Exception
{
configureBehaviour(false, MessageSource.MessageConversionExceptionHandlingPolicy.ROUTE_TO_ALTERNATE);
@@ -175,6 +190,7 @@ public class AbstractConsumerTargetTest extends QpidTestCase
verify(_messageInstance, never()).routeToAlternate(any(Action.class), any(ServerTransaction.class));
}
+ @Test
public void testConversionExceptionPolicyReject() throws Exception
{
configureBehaviour(true, MessageSource.MessageConversionExceptionHandlingPolicy.REJECT);
@@ -186,6 +202,7 @@ public class AbstractConsumerTargetTest extends QpidTestCase
verify(_messageInstance).release(_consumer);
}
+ @Test
public void testConversionExceptionPolicyRejectForNonAcquiringConsumer() throws Exception
{
configureBehaviour(false, MessageSource.MessageConversionExceptionHandlingPolicy.REJECT);
@@ -196,6 +213,7 @@ public class AbstractConsumerTargetTest extends QpidTestCase
verify(_messageInstance).release(_consumer);
}
+ @Test
public void testConversionExceptionPolicyWhenOwningResourceIsNotMessageSource() throws Exception
{
final TransactionLogResource owningResource = mock(TransactionLogResource.class);
@@ -208,9 +226,9 @@ public class AbstractConsumerTargetTest extends QpidTestCase
}
catch (ConnectionScopedRuntimeException e)
{
+ final boolean condition = e.getCause() instanceof MessageConversionException;
assertTrue(String.format("ConnectionScopedRuntimeException has unexpected cause '%s'",
- e.getCause().getClass().getSimpleName()),
- e.getCause() instanceof MessageConversionException);
+ e.getCause().getClass().getSimpleName()), condition);
}
assertTrue("message credit was not restored", _consumerTarget.isCreditRestored());
verify(_messageInstance, never()).routeToAlternate(any(Action.class), any(ServerTransaction.class));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
index e23ed39..1269232 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
@@ -20,6 +20,12 @@
package org.apache.qpid.server.exchange;
import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,6 +34,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
@@ -44,21 +54,20 @@ import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.MessageDestinationIsAlternateException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.UnknownAlternateBindingException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class DirectExchangeTest extends QpidTestCase
+public class DirectExchangeTest extends UnitTestBase
{
private DirectExchange<?> _exchange;
private VirtualHost<?> _vhost;
private InstanceProperties _instanceProperties;
private ServerMessage<?> _messageWithNoHeaders;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
- _vhost = BrokerTestHelper.createVirtualHost(getName());
+ _vhost = BrokerTestHelper.createVirtualHost(getTestName(), this);
Map<String,Object> attributes = new HashMap<>();
attributes.put(Exchange.NAME, "test");
@@ -71,7 +80,7 @@ public class DirectExchangeTest extends QpidTestCase
_messageWithNoHeaders = createTestMessage(Collections.emptyMap());
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -84,10 +93,10 @@ public class DirectExchangeTest extends QpidTestCase
finally
{
BrokerTestHelper.tearDown();
- super.tearDown();
}
}
+ @Test
public void testCreationOfExchangeWithReservedExchangePrefixRejected() throws Exception
{
Map<String, Object> attributes = new HashMap<>();
@@ -107,9 +116,11 @@ public class DirectExchangeTest extends QpidTestCase
}
}
+ @Test
public void testAmqpDirectRecreationRejected() throws Exception
{
DirectExchangeImpl amqpDirect = (DirectExchangeImpl) _vhost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME);
+
assertNotNull(amqpDirect);
assertSame(amqpDirect, _vhost.getChildById(Exchange.class, amqpDirect.getId()));
@@ -134,9 +145,9 @@ public class DirectExchangeTest extends QpidTestCase
// QPID-6599, defect would mean that the existing exchange was removed from the in memory model.
assertSame(amqpDirect, _vhost.getChildById(Exchange.class, amqpDirect.getId()));
assertSame(amqpDirect, _vhost.getChildByName(Exchange.class, amqpDirect.getName()));
-
}
+ @Test
public void testDeleteOfExchangeSetAsAlternate() throws Exception
{
Map<String, Object> attributes = new HashMap<>();
@@ -149,6 +160,7 @@ public class DirectExchangeTest extends QpidTestCase
assertEquals("Unexpected alternate exchange on queue", _exchange, queue.getAlternateBindingDestination());
+
try
{
_exchange.delete();
@@ -163,6 +175,7 @@ public class DirectExchangeTest extends QpidTestCase
assertEquals("Unexpected desired exchange state", State.ACTIVE, _exchange.getDesiredState());
}
+ @Test
public void testAlternateBindingValidationRejectsNonExistingDestination()
{
Map<String, Object> attributes = new HashMap<>();
@@ -183,6 +196,7 @@ public class DirectExchangeTest extends QpidTestCase
}
}
+ @Test
public void testAlternateBindingValidationRejectsSelf()
{
Map<String, String> alternateBinding = Collections.singletonMap(AlternateBinding.DESTINATION, _exchange.getName());
@@ -198,6 +212,7 @@ public class DirectExchangeTest extends QpidTestCase
}
}
+ @Test
public void testDurableExchangeRejectsNonDurableAlternateBinding()
{
Map<String, Object> dlqAttributes = new HashMap<>();
@@ -223,6 +238,7 @@ public class DirectExchangeTest extends QpidTestCase
}
}
+ @Test
public void testAlternateBinding()
{
Map<String, Object> attributes = new HashMap<>();
@@ -235,10 +251,11 @@ public class DirectExchangeTest extends QpidTestCase
Exchange newExchange = _vhost.createChild(Exchange.class, attributes);
assertEquals("Unexpected alternate binding",
- _exchange.getName(),
- newExchange.getAlternateBinding().getDestination());
+ _exchange.getName(),
+ newExchange.getAlternateBinding().getDestination());
}
+ @Test
public void testRouteToQueue()
{
String boundKey = "key";
@@ -261,6 +278,7 @@ public class DirectExchangeTest extends QpidTestCase
assertFalse("Message unexpectedly routed to queue after unbind", result.hasRoutes());
}
+ @Test
public void testRouteToQueueWithSelector()
{
String boundKey = "key";
@@ -285,9 +303,12 @@ public class DirectExchangeTest extends QpidTestCase
assertTrue("Unbind operation should be successful", unbind);
result = _exchange.route(matchingMessage, boundKey, instanceProperties);
- assertFalse("Message with matching selector unexpectedly routed to queue after unbind", result.hasRoutes());
+ assertFalse("Message with matching selector unexpectedly routed to queue after unbind",
+ result.hasRoutes());
+
}
+ @Test
public void testRouteToQueueViaTwoExchanges()
{
String boundKey = "key";
@@ -312,11 +333,13 @@ public class DirectExchangeTest extends QpidTestCase
}
+ @Test
public void testDestinationDeleted()
{
String boundKey = "key";
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
+
assertFalse(_exchange.isBound(boundKey));
assertFalse(_exchange.isBound(boundKey, queue));
assertFalse(_exchange.isBound(queue));
@@ -346,6 +369,7 @@ public class DirectExchangeTest extends QpidTestCase
return message;
}
+ @Test
public void testRouteToMultipleQueues()
{
String boundKey = "key";
@@ -356,23 +380,32 @@ public class DirectExchangeTest extends QpidTestCase
assertTrue("Bind operation to queue1 should be successful", bind1);
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders, boundKey, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.bind(queue2.getName(), boundKey, Collections.singletonMap(JMS_SELECTOR.toString(), "prop is null"), false);
result = _exchange.route(_messageWithNoHeaders, boundKey, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 2, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 2,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue1.getName(), boundKey);
result = _exchange.route(_messageWithNoHeaders, boundKey, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue2.getName(), boundKey);
result = _exchange.route(_messageWithNoHeaders, boundKey, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKey()
{
Map<String, Object> viaExchangeArguments = new HashMap<>();
@@ -397,6 +430,7 @@ public class DirectExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKeyAndFiltering()
{
Map<String, Object> viaExchangeArguments = new HashMap<>();
@@ -423,6 +457,7 @@ public class DirectExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(createTestMessage(Collections.singletonMap("prop", true)),
"key1",
_instanceProperties);
+
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
result = _exchange.route(createTestMessage(Collections.singletonMap("prop", false)),
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
index cb4cadf..016f75f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
@@ -21,6 +21,9 @@
package org.apache.qpid.server.exchange;
import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
+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.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,6 +32,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.RoutingResult;
@@ -39,22 +46,21 @@ import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FanoutExchangeTest extends QpidTestCase
+public class FanoutExchangeTest extends UnitTestBase
{
private FanoutExchange<?> _exchange;
private VirtualHost<?> _vhost;
private InstanceProperties _instanceProperties;
private ServerMessage<?> _messageWithNoHeaders;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
- _vhost = BrokerTestHelper.createVirtualHost(getName());
+ _vhost = BrokerTestHelper.createVirtualHost(getTestName(), this);
Map<String,Object> attributes = new HashMap<>();
attributes.put(Exchange.NAME, "test");
@@ -68,7 +74,7 @@ public class FanoutExchangeTest extends QpidTestCase
_messageWithNoHeaders = createTestMessage(Collections.emptyMap());
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -81,10 +87,10 @@ public class FanoutExchangeTest extends QpidTestCase
finally
{
BrokerTestHelper.tearDown();
- super.tearDown();
}
}
+ @Test
public void testRouteToQueue() throws Exception
{
String bindingKey = "mybinding";
@@ -105,9 +111,9 @@ public class FanoutExchangeTest extends QpidTestCase
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
assertFalse("Message unexpectedly routed to queue after unbind", result.hasRoutes());
-
}
+ @Test
public void testRouteToQueueWithSelector()
{
String bindingKey = "mybinding";
@@ -133,9 +139,11 @@ public class FanoutExchangeTest extends QpidTestCase
assertTrue("Unbind operation should be successful", unbind);
result = _exchange.route(matchingMessage, null, instanceProperties);
- assertFalse("Message with matching selector unexpectedly routed to queue after unbind", result.hasRoutes());
+ assertFalse("Message with matching selector unexpectedly routed to queue after unbind",
+ result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchanges()
{
String bindingKey = "key";
@@ -159,6 +167,7 @@ public class FanoutExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKey()
{
Map<String, Object> attributes = new HashMap<>();
@@ -183,6 +192,7 @@ public class FanoutExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKeyAndFiltering()
{
Map<String, Object> viaExchangeArguments = new HashMap<>();
@@ -217,6 +227,7 @@ public class FanoutExchangeTest extends QpidTestCase
assertFalse("Message unexpectedly routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToMultipleQueue()
{
String bindingKey = "key";
@@ -227,23 +238,32 @@ public class FanoutExchangeTest extends QpidTestCase
assertTrue("Bind operation to queue1 should be successful", bind1);
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.bind(queue2.getName(), bindingKey, Collections.singletonMap(JMS_SELECTOR.toString(), "prop is null"), false);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 2, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 2,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue1.getName(), bindingKey);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue2.getName(), bindingKey);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
}
+ @Test
public void testRouteToQueueBoundMultipleTimesUsingTheSameBindingKey()
{
String bindingKey = "key";
@@ -253,46 +273,63 @@ public class FanoutExchangeTest extends QpidTestCase
assertTrue("Bind operation to queue1 should be successful", bind1);
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
boolean bind2 = _exchange.bind(queue.getName(), bindingKey, Collections.emptyMap(), true);
assertTrue("Bind operation to queue1 should be successful", bind2);
RoutingResult<ServerMessage<?>> result2 = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result2.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result2.getNumberOfRoutes());
+
_exchange.unbind(queue.getName(), bindingKey);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
}
+ @Test
public void testRouteToQueueBoundMultipleTimesUsingDifferentBindingKeys()
{
String bindingKey1 = "key1";
String bindingKey2 = "key2";
- Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
+ Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() +
+ "_queue"));
boolean bind1 = _exchange.bind(queue.getName(), bindingKey1, Collections.emptyMap(), false);
assertTrue("Bind operation to queue1 should be successful", bind1);
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
boolean bind2 = _exchange.bind(queue.getName(), bindingKey2, Collections.emptyMap(), true);
assertTrue("Bind operation to queue1 should be successful", bind2);
RoutingResult<ServerMessage<?>> result2 = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result2.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues", (long) 1, (long) result2.getNumberOfRoutes
+ ());
_exchange.unbind(queue.getName(), bindingKey1);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue.getName(), bindingKey2);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
}
+ @Test
public void testRouteToQueueBoundMultipleTimesUsingFilteredAndUnfilteredBindings()
{
String bindingKey1 = "key1";
@@ -307,31 +344,43 @@ public class FanoutExchangeTest extends QpidTestCase
final ServerMessage<?> messageMatchingSelector =
createTestMessage(Collections.singletonMap("prop", true));
RoutingResult<ServerMessage<?>> result = _exchange.route(messageMatchingSelector, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
boolean bind2 = _exchange.bind(queue.getName(), bindingKey2, Collections.emptyMap(), true);
assertTrue("Bind operation to queue1 should be successful", bind2);
RoutingResult<ServerMessage<?>> result2 = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result2.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result2.getNumberOfRoutes());
_exchange.unbind(queue.getName(), bindingKey2);
result = _exchange.route(_messageWithNoHeaders, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
result = _exchange.route(messageMatchingSelector, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 1, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
_exchange.unbind(queue.getName(), bindingKey1);
result = _exchange.route(messageMatchingSelector, null, _instanceProperties);
- assertEquals("Message routed to unexpected number of queues", 0, result.getNumberOfRoutes());
+ assertEquals("Message routed to unexpected number of queues",
+ (long) 0,
+ (long) result.getNumberOfRoutes());
}
+ @Test
public void testIsBound()
{
String boundKey = "key";
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
+
assertFalse(_exchange.isBound(boundKey));
assertFalse(_exchange.isBound(boundKey, queue));
assertFalse(_exchange.isBound(queue));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 68152d3..126c07d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.exchange;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,6 +30,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
@@ -36,11 +41,12 @@ import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
*/
-public class HeadersBindingTest extends QpidTestCase
+public class HeadersBindingTest extends UnitTestBase
{
@@ -168,8 +174,8 @@ public class HeadersBindingTest extends QpidTestCase
private Queue<?> _queue;
private Exchange<?> _exchange;
- @Override
- protected void setUp()
+ @Before
+ public void setUp() throws Exception
{
_count++;
_queue = mock(Queue.class);
@@ -200,6 +206,7 @@ public class HeadersBindingTest extends QpidTestCase
return "Queue" + _count;
}
+ @Test
public void testDefault_1()
{
bindHeaders.put("A", "Value of A");
@@ -211,6 +218,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testDefault_2()
{
bindHeaders.put("A", "Value of A");
@@ -223,6 +231,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testDefault_3()
{
bindHeaders.put("A", "Value of A");
@@ -234,6 +243,7 @@ public class HeadersBindingTest extends QpidTestCase
assertFalse(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAll_1()
{
bindHeaders.put("X-match", "all");
@@ -246,6 +256,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAll_2()
{
bindHeaders.put("X-match", "all");
@@ -259,6 +270,7 @@ public class HeadersBindingTest extends QpidTestCase
assertFalse(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAll_3()
{
bindHeaders.put("X-match", "all");
@@ -273,6 +285,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAll_4()
{
bindHeaders.put("X-match", "all");
@@ -288,6 +301,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAll_5()
{
bindHeaders.put("X-match", "all");
@@ -303,6 +317,7 @@ public class HeadersBindingTest extends QpidTestCase
assertFalse(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_1()
{
bindHeaders.put("X-match", "any");
@@ -315,6 +330,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_2()
{
bindHeaders.put("X-match", "any");
@@ -328,6 +344,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_3()
{
bindHeaders.put("X-match", "any");
@@ -342,6 +359,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_4()
{
bindHeaders.put("X-match", "any");
@@ -357,6 +375,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_5()
{
bindHeaders.put("X-match", "any");
@@ -372,6 +391,7 @@ public class HeadersBindingTest extends QpidTestCase
assertTrue(new HeadersBinding(b, bindHeaders).matches(matchHeaders));
}
+ @Test
public void testAny_6()
{
bindHeaders.put("X-match", "any");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index ced6924..166e486 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -21,6 +21,8 @@
package org.apache.qpid.server.exchange;
import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,6 +37,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.filter.AMQPFilterTypes;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
@@ -47,21 +53,20 @@ import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class HeadersExchangeTest extends QpidTestCase
+public class HeadersExchangeTest extends UnitTestBase
{
private HeadersExchange<?> _exchange;
private QueueManagingVirtualHost<?> _virtualHost;
private InstanceProperties _instanceProperties;
private ServerMessage<?> _messageWithNoHeaders;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
- _virtualHost = BrokerTestHelper.createVirtualHost("test");
+ _virtualHost = BrokerTestHelper.createVirtualHost("test", this);
Map<String,Object> attributes = new HashMap<>();
attributes.put(Exchange.NAME, "test");
@@ -76,15 +81,13 @@ public class HeadersExchangeTest extends QpidTestCase
}
- @Override
+ @After
public void tearDown() throws Exception
{
if (_virtualHost != null)
{
_virtualHost.close();
}
- super.tearDown();
-
}
private void routeAndTest(ServerMessage msg, Queue<?>... expected) throws Exception
@@ -97,7 +100,7 @@ public class HeadersExchangeTest extends QpidTestCase
List<BaseQueue> missing = new ArrayList<>(Arrays.asList(expected));
missing.removeAll(results);
assertTrue("Message not delivered to expected queues: " + missing, missing.isEmpty());
- assertTrue("Duplicates " + results, results.size()==(new HashSet<>(results)).size());
+ assertTrue("Duplicates " + results, results.size() == (new HashSet<>(results)).size());
}
@@ -135,6 +138,7 @@ public class HeadersExchangeTest extends QpidTestCase
}
+ @Test
public void testSimple() throws Exception
{
Queue<?> q1 = createAndBind("Q1", "F0000");
@@ -156,6 +160,7 @@ public class HeadersExchangeTest extends QpidTestCase
}
+ @Test
public void testAny() throws Exception
{
Queue<?> q1 = createAndBind("Q1", "F0000", "F0001", "X-match=any");
@@ -172,6 +177,7 @@ public class HeadersExchangeTest extends QpidTestCase
routeAndTest(createTestMessage(getArgsMapFromStrings("F0002")));
}
+ @Test
public void testOnUnbind() throws Exception
{
Queue<?> q1 = createAndBind("Q1", "F0000");
@@ -189,6 +195,7 @@ public class HeadersExchangeTest extends QpidTestCase
}
+ @Test
public void testWithSelectors() throws Exception
{
Queue<?> q1 = _virtualHost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, "Q1"));
@@ -217,6 +224,7 @@ public class HeadersExchangeTest extends QpidTestCase
}
+ @Test
public void testRouteToQueueViaTwoExchanges()
{
String bindingKey = "key";
@@ -240,6 +248,7 @@ public class HeadersExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKey()
{
Map<String, Object> attributes = new HashMap<>();
@@ -269,6 +278,7 @@ public class HeadersExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKeyAndFiltering()
{
String bindingKey = "key1";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index a4a3823..200b20d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -21,6 +21,9 @@
package org.apache.qpid.server.exchange;
import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
+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.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,7 +32,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
@@ -41,9 +46,9 @@ import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class TopicExchangeTest extends QpidTestCase
+public class TopicExchangeTest extends UnitTestBase
{
private TopicExchange<?> _exchange;
@@ -51,12 +56,11 @@ public class TopicExchangeTest extends QpidTestCase
private InstanceProperties _instanceProperties;
private ServerMessage<?> _messageWithNoHeaders;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
- _vhost = BrokerTestHelper.createVirtualHost(getName());
+ _vhost = BrokerTestHelper.createVirtualHost(getTestName(), this);
Map<String,Object> attributes = new HashMap<>();
attributes.put(Exchange.NAME, "test");
@@ -71,7 +75,7 @@ public class TopicExchangeTest extends QpidTestCase
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -84,11 +88,11 @@ public class TopicExchangeTest extends QpidTestCase
finally
{
BrokerTestHelper.tearDown();
- super.tearDown();
}
}
/* Thus the routing pattern *.stock.# matches the routing keys usd.stock and eur.stock.db but not stock.nasdaq. */
+ @Test
public void testNoRoute() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -101,6 +105,7 @@ public class TopicExchangeTest extends QpidTestCase
assertFalse("Message unexpected routed to queue after bind", result.hasRoutes());
}
+ @Test
public void testDirectMatch() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -111,15 +116,18 @@ public class TopicExchangeTest extends QpidTestCase
"a.b",
_instanceProperties);
- assertEquals("Message unexpected routed to queue after bind", 1, result.getNumberOfRoutes());
+ assertEquals("Message unexpected routed to queue after bind",
+ (long) 1,
+ (long) result.getNumberOfRoutes());
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.c", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
}
/** * matches a single word */
+ @Test
public void testStarMatch() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -129,19 +137,20 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.b",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.bb", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.b.c", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
}
/** # matches zero or more words */
+ @Test
public void testHashMatch() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -150,22 +159,23 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.b",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.bb", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.b.c", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "b", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
}
+ @Test
public void testMidHash() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -174,15 +184,16 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.c.d.b",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.c.d.d.b", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.c.b", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
}
+ @Test
public void testMatchAfterHash() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -191,19 +202,20 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.c.b.b",
_instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.a.b.c", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.b.c.b", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.b.c.b.c", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
}
+ @Test
public void testHashAfterHash() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -213,15 +225,16 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.c.b.b.c",
_instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders,
"a.a.b.c.d",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
}
+ @Test
public void testHashHash() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -230,15 +243,16 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.c.b.b.c",
_instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.c.b.b.c", _instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.a.b.c.d", _instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
}
+ @Test
public void testSubMatchFails() throws Exception
{
Queue<?> queue = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue"));
@@ -247,9 +261,10 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.b.c",
_instanceProperties);
- Assert.assertEquals(0, result.getNumberOfRoutes());
+ assertEquals(0, result.getNumberOfRoutes());
}
+ @Test
public void testRouteToManyQueues() throws Exception
{
Queue<?> queue1 = _vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue1"));
@@ -260,22 +275,23 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.b",
_instanceProperties);
- Assert.assertEquals(2, result.getNumberOfRoutes());
+ assertEquals(2, result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders,
"a.c",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
_exchange.deleteBinding("a.b", queue1);
result = _exchange.route(_messageWithNoHeaders,
"a.b",
_instanceProperties);
- Assert.assertEquals(1, result.getNumberOfRoutes());
+ assertEquals(1, result.getNumberOfRoutes());
}
+ @Test
public void testRouteToQueueWithSelector()
{
String bindingKey = "mybinding";
@@ -301,9 +317,12 @@ public class TopicExchangeTest extends QpidTestCase
assertTrue("Unbind operation should be successful", unbind);
result = _exchange.route(matchingMessage, "mybinding", instanceProperties);
- assertFalse("Message with matching selector unexpectedly routed to queue after unbind", result.hasRoutes());
+ assertFalse("Message with matching selector unexpectedly routed to queue after unbind",
+ result.hasRoutes());
+
}
+ @Test
public void testRouteToQueueViaTwoExchanges()
{
String bindingKey = "key";
@@ -327,6 +346,7 @@ public class TopicExchangeTest extends QpidTestCase
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKey()
{
Map<String, Object> attributes = new HashMap<>();
@@ -353,11 +373,11 @@ public class TopicExchangeTest extends QpidTestCase
_instanceProperties);
assertTrue("Message unexpectedly not routed to queue", result.hasRoutes());
-
result = _exchange.route(_messageWithNoHeaders, replacementKey, _instanceProperties);
assertFalse("Message unexpectedly was routed to queue", result.hasRoutes());
}
+ @Test
public void testRouteToQueueViaTwoExchangesWithReplacementRoutingKeyAndFiltering()
{
String bindingKey = "key1";
@@ -396,6 +416,7 @@ public class TopicExchangeTest extends QpidTestCase
}
+ @Test
public void testHierachicalRouteToQueueViaTwoExchangesWithReplacementRoutingKey()
{
Map<String, Object> attributes = new HashMap<>();
@@ -414,37 +435,38 @@ public class TopicExchangeTest extends QpidTestCase
String replacementKey2 = "key2";
assertTrue("Exchange to exchange bind operation should be successful", _exchange.bind(via.getName(),
- bindingKey1,
- Collections.singletonMap(
+ bindingKey1,
+ Collections.singletonMap(
Binding.BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY,
replacementKey1),
- false));
+ false));
assertTrue("Exchange to exchange bind operation should be successful", _exchange.bind(via.getName(),
- bindingKey2,
- Collections.singletonMap(
+ bindingKey2,
+ Collections.singletonMap(
Binding.BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY,
replacementKey2),
- false));
+ false));
assertTrue("Exchange to queue1 bind operation should be successful",
- via.bind(queue1.getName(), replacementKey1, Collections.emptyMap(), false));
+ via.bind(queue1.getName(), replacementKey1, Collections.emptyMap(), false));
assertTrue("Exchange to queue2 bind operation should be successful",
- via.bind(queue2.getName(), replacementKey2, Collections.emptyMap(), false));
+ via.bind(queue2.getName(), replacementKey2, Collections.emptyMap(), false));
RoutingResult<ServerMessage<?>> result = _exchange.route(_messageWithNoHeaders,
"a.b",
_instanceProperties);
- assertEquals("Unexpected number of routes", 2, result.getNumberOfRoutes());
+ assertEquals("Unexpected number of routes", (long) 2, (long) result.getNumberOfRoutes());
result = _exchange.route(_messageWithNoHeaders, "a.b.c", _instanceProperties);
- assertEquals("Unexpected number of routes", 1, result.getNumberOfRoutes());
+ assertEquals("Unexpected number of routes", (long) 1, (long) result.getNumberOfRoutes());
assertTrue("Message is not routed into 'queue1'", result.getRoutes().contains(queue1));
}
+ @Test
public void testUpdateBindingReplacingSelector() throws Exception
{
String bindingKey = "mybinding";
@@ -462,7 +484,6 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(matchingMessage, bindingKey, instanceProperties);
assertTrue("Message with matching selector not routed to queue", result.hasRoutes());
-
_exchange.replaceBinding(bindingKey, queue, Collections.singletonMap(JMS_SELECTOR.toString(), "prop = False"));
result = _exchange.route(matchingMessage, bindingKey, instanceProperties);
@@ -476,6 +497,7 @@ public class TopicExchangeTest extends QpidTestCase
assertTrue("Message not routed to queue", result.hasRoutes());
}
+ @Test
public void testUpdateBindingRemovingSelector() throws Exception
{
String bindingKey = "mybinding";
@@ -493,13 +515,13 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(message, bindingKey, instanceProperties);
assertFalse("Message that does not match selector routed to queue", result.hasRoutes());
-
_exchange.replaceBinding(bindingKey, queue, Collections.emptyMap());
result = _exchange.route(message, bindingKey, instanceProperties);
assertTrue("Message not routed to queue after rebind", result.hasRoutes());
}
+ @Test
public void testUpdateBindingAddingSelector() throws Exception
{
String bindingKey = "mybinding";
@@ -517,17 +539,16 @@ public class TopicExchangeTest extends QpidTestCase
RoutingResult<ServerMessage<?>> result = _exchange.route(message, bindingKey, instanceProperties);
assertTrue("Message not routed to queue", result.hasRoutes());
-
_exchange.replaceBinding(bindingKey, queue, Collections.singletonMap(JMS_SELECTOR.toString(), "prop = false"));
result = _exchange.route(message, bindingKey, instanceProperties);
assertTrue("Message that matches selector not routed to queue after rebind", result.hasRoutes());
-
result = _exchange.route(message = createTestMessage(Collections.singletonMap("prop", true)), bindingKey, instanceProperties);
assertFalse("Message that does not match selector routed to queue after rebind", result.hasRoutes());
}
+ @Test
public void testUpdateBindingChangeReplacementKey() throws Exception
{
String bindingKey = "mybinding";
@@ -556,7 +577,6 @@ public class TopicExchangeTest extends QpidTestCase
_instanceProperties);
assertFalse("Message unexpectedly routed to queue", result.hasRoutes());
-
_exchange.bind(via.getName(),
bindingKey,
Collections.singletonMap(Binding.BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY, replacementKey),
@@ -569,7 +589,8 @@ public class TopicExchangeTest extends QpidTestCase
Queue<?> queue2 =
_vhost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, getTestName() + "_queue2"));
assertTrue("Binding of queue2 failed",
- via.bind(queue2.getName(), replacementKey2, Collections.emptyMap(), false));
+ via.bind(queue2.getName(), replacementKey2, Collections.emptyMap(), false));
+
_exchange.bind(via.getName(),
bindingKey,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactoryTest.java
index 7c3cee0..b1f14d7 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactoryTest.java
@@ -20,15 +20,20 @@
*/
package org.apache.qpid.server.filter;
+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.Collections;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
-public class ArrivalTimeFilterFactoryTest extends QpidTestCase
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class ArrivalTimeFilterFactoryTest extends UnitTestBase
{
+ @Test
public void testNewInstance() throws Exception
{
long currentTime = System.currentTimeMillis();
@@ -40,10 +45,11 @@ public class ArrivalTimeFilterFactoryTest extends QpidTestCase
when(message.getArrivalTime()).thenReturn(currentTime - periodInSeconds * 1000 - 1);
assertFalse("Message arrived before '1 minute before filter creation' should not be accepted",
- filter.matches(message));
+ filter.matches(message));
+
when(message.getArrivalTime()).thenReturn(currentTime - periodInSeconds * 1000 / 2);
assertTrue("Message arrived after '1 minute before filter creation' should be accepted",
- filter.matches(message));
+ filter.matches(message));
when(message.getArrivalTime()).thenReturn(System.currentTimeMillis());
assertTrue("Message arrived after filter creation should be accepted", filter.matches(message));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java b/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
index fbeb594..d4fc7a9 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
@@ -18,10 +18,16 @@
*/
package org.apache.qpid.server.filter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-public class JMSSelectorFilterTest extends QpidTestCase
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class JMSSelectorFilterTest extends UnitTestBase
{
+ @Test
public void testEqualsAndHashCodeUsingSelectorString() throws Exception
{
final String selectorString = "1 = 1";
@@ -45,7 +51,9 @@ public class JMSSelectorFilterTest extends QpidTestCase
assertEquals(message, filter2, filter1);
assertEquals("HashCodes of " + filter1 + " and " + filter2 + " should be equal",
- filter1.hashCode(), filter2.hashCode());
+ (long) filter1.hashCode(),
+ (long) filter2.hashCode());
+
}
private void assertNotEqual(JMSSelectorFilter filter, JMSSelectorFilter differentFilter)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
index 67d5f8a..cdac7b8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
@@ -20,49 +20,52 @@
*/
package org.apache.qpid.server.logging;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
import java.util.List;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
+
/**
* Test: UnitTestMessageLoggerTest
- *
+ * <p>
* This test verifies that UnitTestMessageLogger adheres to its interface.
- *
+ * <p>
* Messages are logged, and Throwables recorded in an array that can be
* retrieved and cleared.
- *
*/
-public class UnitTestMessageLoggerTest extends QpidTestCase
+public class UnitTestMessageLoggerTest extends UnitTestBase
{
private static final String TEST_MESSAGE = "Test";
private static final String TEST_THROWABLE = "Test Throwable";
private static final String TEST_HIERARCHY = "test.hierarchy";
+ @Test
public void testRawMessage()
{
UnitTestMessageLogger logger = new UnitTestMessageLogger();
- assertEquals("Messages logged before test start", 0,
- logger.getLogMessages().size());
+ assertEquals("Messages logged before test start", (long) 0, (long) logger.getLogMessages().size());
// Log a message
logger.rawMessage(TEST_MESSAGE, TEST_HIERARCHY);
List<Object> messages = logger.getLogMessages();
- assertEquals("Expected to have 1 messages logged", 1, messages.size());
+ assertEquals("Expected to have 1 messages logged", (long) 1, (long) messages.size());
- assertEquals("First message not what was logged",
- TEST_MESSAGE, messages.get(0));
+ assertEquals("First message not what was logged", TEST_MESSAGE, messages.get(0));
}
+ @Test
public void testRawMessageWithThrowable()
{
UnitTestMessageLogger logger = new UnitTestMessageLogger();
- assertEquals("Messages logged before test start", 0,
- logger.getLogMessages().size());
+ assertEquals("Messages logged before test start", (long) 0, (long) logger.getLogMessages().size());
// Log a message
Throwable throwable = new Throwable(TEST_THROWABLE);
@@ -71,33 +74,32 @@ public class UnitTestMessageLoggerTest extends QpidTestCase
List<Object> messages = logger.getLogMessages();
- assertEquals("Expected to have 2 entries", 2, messages.size());
+ assertEquals("Expected to have 2 entries", (long) 2, (long) messages.size());
- assertEquals("Message text not what was logged",
- TEST_MESSAGE, messages.get(0));
+ assertEquals("Message text not what was logged", TEST_MESSAGE, messages.get(0));
assertEquals("Message throwable not what was logged",
- TEST_THROWABLE, ((Throwable) messages.get(1)).getMessage());
+ TEST_THROWABLE,
+ ((Throwable) messages.get(1)).getMessage());
}
+ @Test
public void testClear()
{
UnitTestMessageLogger logger = new UnitTestMessageLogger();
- assertEquals("Messages logged before test start", 0,
- logger.getLogMessages().size());
+ assertEquals("Messages logged before test start", (long) 0, (long) logger.getLogMessages().size());
// Log a message
logger.rawMessage(TEST_MESSAGE, null, TEST_HIERARCHY);
- assertEquals("Expected to have 1 messages logged",
- 1, logger.getLogMessages().size());
+ assertEquals("Expected to have 1 messages logged", (long) 1, (long) logger.getLogMessages().size());
logger.clearLogMessages();
assertEquals("Expected to have no messages after a clear",
- 0, logger.getLogMessages().size());
-
+ (long) 0,
+ (long) logger.getLogMessages().size());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index e6b65c6..41fa8fe 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
@@ -29,6 +29,10 @@ import java.security.PrivilegedAction;
import java.util.Collections;
import java.util.List;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* Test : AMQPConnectionActorTest
* Validate the AMQPConnectionActor class.
@@ -40,7 +44,7 @@ import java.util.List;
*/
public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
{
- @Override
+ @Before
public void setUp()
{
//Prevent logger creation
@@ -54,6 +58,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
* The log message should be fully replaced (no '{n}' values) and should
* not contain any channel identification.
*/
+ @Test
public void testConnection() throws Exception
{
super.setUp();
@@ -64,26 +69,25 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
List<Object> logs = getRawLogger().getLogMessages();
- assertEquals("Message log size not as expected.", 1, logs.size());
+ Assert.assertEquals("Message log size not as expected.", (long) 1, (long) logs.size());
// Verify that the logged message is present in the output
- assertTrue("Message was not found in log message",
- logs.get(0).toString().contains(message));
+ Assert.assertTrue("Message was not found in log message", logs.get(0).toString().contains(message));
// Verify that the message has the correct type
- assertTrue("Message does not contain the [con: prefix",
- logs.get(0).toString().contains("[con:"));
+ Assert.assertTrue("Message does not contain the [con: prefix", logs.get(0).toString().contains("[con:"));
// Verify that all the values were presented to the MessageFormatter
// so we will not end up with '{n}' entries in the log.
- assertFalse("Verify that the string does not contain any '{'.",
- logs.get(0).toString().contains("{"));
+ Assert.assertFalse("Verify that the string does not contain any '{'.", logs.get(0).toString().contains("{"));
// Verify that the logged message does not contains the 'ch:' marker
- assertFalse("Message was logged with a channel identifier." + logs.get(0),
- logs.get(0).toString().contains("/ch:"));
+ Assert.assertFalse("Message was logged with a channel identifier." + logs.get(0),
+ logs.get(0).toString().contains("/ch:"));
+
}
+ @Test
public void testConnectionLoggingOff() throws Exception
{
setStatusUpdatesEnabled(false);
@@ -94,8 +98,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
List<Object> logs = getRawLogger().getLogMessages();
- assertEquals("Message log size not as expected.", 0, logs.size());
-
+ Assert.assertEquals("Message log size not as expected.", (long) 0, (long) logs.size());
}
private String sendLogMessage()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index b817953..6408ed0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -20,39 +20,41 @@
*/
package org.apache.qpid.server.logging.actors;
+import org.junit.After;
+import org.junit.Before;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
-public abstract class BaseActorTestCase extends QpidTestCase
+public abstract class BaseActorTestCase extends UnitTestBase
{
private boolean _statusUpdatesEnabled = true;
private UnitTestMessageLogger _rawLogger;
private EventLogger _eventLogger;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_rawLogger = new UnitTestMessageLogger(_statusUpdatesEnabled);
_eventLogger = new EventLogger(_rawLogger);
}
- @Override
+ @After
public void tearDown() throws Exception
{
if(_rawLogger != null)
{
_rawLogger.clearLogMessages();
}
- super.tearDown();
}
public String sendTestLogMessage()
{
- String message = "Test logging: " + getName();
+ String message = "Test logging: " + getTestName();
sendTestLogMessage(message);
return message;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index b942153..42b4449 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.actors;
+import org.junit.After;
+import org.junit.Before;
+
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.transport.AMQPConnection;
@@ -29,13 +32,13 @@ public abstract class BaseConnectionActorTestCase extends BaseActorTestCase
private AMQPConnection<?> _connection;
private VirtualHost<?> _virtualHost;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
BrokerTestHelper.setUp();
_connection = BrokerTestHelper.createConnection();
- _virtualHost = BrokerTestHelper.createVirtualHost("test");
+ _virtualHost = BrokerTestHelper.createVirtualHost("test", this);
}
public VirtualHost<?> getVirtualHost()
@@ -43,7 +46,7 @@ public abstract class BaseConnectionActorTestCase extends BaseActorTestCase
return _virtualHost;
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
index 63af555..89a0100 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.logging.actors;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.PrivilegedAction;
@@ -28,11 +32,13 @@ import java.util.List;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.security.auth.ManagementConnectionPrincipal;
import org.apache.qpid.server.security.auth.SocketConnectionMetaData;
import org.apache.qpid.server.security.auth.TestPrincipalUtils;
-
public class HttpManagementActorTest extends BaseActorTestCase
{
public static final LogMessage EMPTY_MESSAGE = new LogMessage()
@@ -59,7 +65,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
private ManagementConnectionPrincipal _connectionPrincipal;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
@@ -97,6 +103,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
};
}
+ @Test
public void testSubjectPrincipalNameAppearance()
{
Subject subject = TestPrincipalUtils.createTestSubject(TEST_USER);
@@ -115,16 +122,17 @@ public class HttpManagementActorTest extends BaseActorTestCase
assertNotNull("Test log message is not created!", message);
List<Object> logs = getRawLogger().getLogMessages();
- assertEquals("Message log size not as expected.", 1, logs.size());
+ assertEquals("Message log size not as expected.", (long) 1, (long) logs.size());
String logMessage = logs.get(0).toString();
assertTrue("Message was not found in log message", logMessage.contains(message));
assertTrue("Message does not contain expected value: " + logMessage,
- logMessage.startsWith(String.format(FORMAT, SESSION_ID, TEST_USER)));
+ logMessage.startsWith(String.format(FORMAT, SESSION_ID, TEST_USER)));
}
/** It's necessary to test successive calls because HttpManagementActor caches
* its log message based on principal name */
+ @Test
public void testGetLogMessageCaching()
{
assertLogMessageWithoutPrincipal();
@@ -147,12 +155,10 @@ public class HttpManagementActorTest extends BaseActorTestCase
{
getEventLogger().message(EMPTY_MESSAGE);
List<Object> logs = getRawLogger().getLogMessages();
- assertEquals("Message log size not as expected.", 1, logs.size());
+ assertEquals("Message log size not as expected.", (long) 1, (long) logs.size());
String logMessage = logs.get(0).toString();
- assertEquals("Unexpected log message",
- String.format(FORMAT, SESSION_ID, NA),
- logMessage);
+ assertEquals("Unexpected log message", String.format(FORMAT, SESSION_ID, NA), logMessage);
return null;
}
@@ -172,7 +178,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
{
getEventLogger().message(EMPTY_MESSAGE);
List<Object> logs = getRawLogger().getLogMessages();
- assertEquals("Message log size not as expected.", 1, logs.size());
+ assertEquals("Message log size not as expected.", (long) 1, (long) logs.size());
String logMessage = logs.get(0).toString();
@@ -180,6 +186,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
}
});
- assertTrue("Unexpected log message", message.startsWith(String.format(FORMAT, SESSION_ID, principalName)));
+ assertTrue("Unexpected log message",
+ message.startsWith(String.format(FORMAT, SESSION_ID, principalName)));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
index b715841..9312f01 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.messages;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
@@ -27,31 +30,32 @@ import org.apache.qpid.server.logging.UnitTestMessageLogger;
import org.apache.qpid.server.logging.subjects.TestBlankSubject;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
import java.util.List;
-public abstract class AbstractTestMessages extends QpidTestCase
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class AbstractTestMessages extends UnitTestBase
{
protected LogMessage _logMessage = null;
protected UnitTestMessageLogger _logger;
protected LogSubject _logSubject = new TestBlankSubject();
private EventLogger _eventLogger;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
-
BrokerTestHelper.setUp();
_logger = new UnitTestMessageLogger();
_eventLogger = new EventLogger(_logger);
}
- @Override
+ @After
public void tearDown() throws Exception
{
BrokerTestHelper.tearDown();
- super.tearDown();
}
protected List<Object> getLog()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org