diff options
Diffstat (limited to 'qpid/java/systests/src/test/java')
10 files changed, 66 insertions, 51 deletions
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java index 3025414e4a..0acdd2509d 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java @@ -20,12 +20,6 @@ */ package org.apache.qpid.client; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - import javax.jms.Connection; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -33,13 +27,19 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.test.utils.QpidBrokerTestCase; + public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase { private Connection con; private Session session; private AMQQueue queue; private MessageConsumer consumer; - private int numMessages; + private int _numMessages; private static final Logger _logger = LoggerFactory.getLogger(AMQQueueDeferredOrderingTest.class); @@ -86,7 +86,7 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase { super.setUp(); - numMessages = isBrokerStorePersistent() ? 300 : 1000; + _numMessages = isBrokerStorePersistent() ? 300 : 1000; _logger.info("Create Connection"); con = getConnection(); @@ -106,30 +106,31 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase // Setup initial messages _logger.info("Creating first producer thread"); - producerThread = new ASyncProducer(queue, 0, numMessages / 2); + producerThread = new ASyncProducer(queue, 0, _numMessages / 2); producerThread.start(); // Wait for them to be done producerThread.join(); // Setup second set of messages to produce while we consume _logger.info("Creating second producer thread"); - producerThread = new ASyncProducer(queue, numMessages / 2, numMessages); + producerThread = new ASyncProducer(queue, _numMessages / 2, _numMessages); producerThread.start(); // Start consuming and checking they're in order _logger.info("Consuming messages"); - for (int i = 0; i < numMessages; i++) + for (int i = 0; i < _numMessages; i++) { Message msg = consumer.receive(3000); + assertNotNull("Message " + i + " should not be null", msg); assertTrue("Message " + i + " should be a text message", msg instanceof TextMessage); - assertEquals("Message content " + i + "does not match expected", Integer.toString(i), ((TextMessage) msg).getText()); + assertEquals("Message content " + i + " does not match expected", Integer.toString(i), ((TextMessage) msg).getText()); } } protected void tearDown() throws Exception { - _logger.info("Interuptting producer thread"); + _logger.info("Interrupting producer thread"); producerThread.interrupt(); _logger.info("Closing connection"); con.close(); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java index a13bf71d5e..74b1f8a572 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java @@ -70,6 +70,9 @@ public class AsynchMessageListenerTest extends QpidBrokerTestCase } + + + public void testMessageListener() throws Exception { CountingMessageListener countingMessageListener = new CountingMessageListener(MSG_COUNT); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java index 72dea9b18b..5357f4bcce 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java @@ -290,7 +290,8 @@ public class SSLTest extends QpidBrokerTestCase ByteArrayOutputStream bout = new ByteArrayOutputStream(); e.printStackTrace(new PrintStream(bout)); String strace = bout.toString(); - assertTrue("Correct exception not thrown", strace.contains(expectedString)); + assertTrue("Correct exception not thrown, expecting : " + expectedString + " got : " +e, + strace.contains(expectedString)); } public void testVerifyLocalHost() throws Exception diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java index 007772e8be..a1e30ac83e 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java @@ -33,7 +33,6 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.Set; -import org.apache.qpid.protocol.ServerProtocolEngine; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; @@ -41,7 +40,7 @@ import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; -import org.apache.qpid.transport.Sender; +import org.apache.qpid.transport.ByteBufferSender; import org.apache.qpid.transport.network.NetworkConnection; public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase @@ -161,7 +160,7 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase when(port.getContextValue(eq(Long.class),eq(Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY))).thenReturn(10000l); MultiVersionProtocolEngineFactory factory = - new MultiVersionProtocolEngineFactory(_broker, null, false, false, protocols, null, port, + new MultiVersionProtocolEngineFactory(_broker, protocols, null, port, org.apache.qpid.server.model.Transport.TCP); //create a dummy to retrieve the 'current' ID number @@ -215,7 +214,7 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase try { - new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, Protocol.AMQP_0_9, null, + new MultiVersionProtocolEngineFactory(_broker, versions, Protocol.AMQP_0_9, null, org.apache.qpid.server.model.Transport.TCP); fail("should not have been allowed to create the factory"); } @@ -230,16 +229,12 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase private String _remoteHost = "127.0.0.1"; private String _localHost = "127.0.0.1"; private int _port = 1; - private final Sender<ByteBuffer> _sender; + private final ByteBufferSender _sender; public TestNetworkConnection() { - _sender = new Sender<ByteBuffer>() + _sender = new ByteBufferSender() { - public void setIdleTimeout(int i) - { - } - public void send(ByteBuffer msg) { } @@ -300,7 +295,7 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase } @Override - public Sender<ByteBuffer> getSender() + public ByteBufferSender getSender() { return _sender; } diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java index 32de06186a..b243769b32 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java @@ -386,7 +386,7 @@ public class VirtualHostMessageStoreTest extends QpidTestCase assertEquals("Incorrect number of exchanges registered after second recovery", origExchangeCount, _virtualHost.getExchanges().size()); assertNull("Durable exchange was not removed:" + directExchangeName, - _virtualHost.getExchange(directExchangeName)); + _virtualHost.getExchange(directExchangeName)); } /** diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java index 67af3e17e4..ee9f2070d3 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java @@ -23,13 +23,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Queue; -import javax.jms.Session; +import javax.jms.*; import javax.management.JMException; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; @@ -74,6 +68,38 @@ public class ConnectionManagementTest extends QpidBrokerTestCase } } + public void testManagementClosesConnection() throws Exception + { + assertEquals("Expected no managed connections", 0, getManagedConnections().size()); + + _connection = getConnection(); + assertEquals("Expected one managed connection", 1, getManagedConnections().size()); + + + ManagedConnection managedConnection = getManagedConnections().get(0); + + managedConnection.closeConnection(); + + assertEquals("Expected no managed connections", 0, getManagedConnections().size()); + + /* + try + { + + _connection.start(); + fail("Exception not thrown"); + } + catch (javax.jms.IllegalStateException ise) + { + ise.printStackTrace(); + // PASS + }*/ + + } + + + + public void testNumberOfManagedConnectionsMatchesNumberOfClientConnections() throws Exception { assertEquals("Expected no managed connections", 0, getManagedConnections().size()); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java index 4d06c7b624..4ca3b2ba5c 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java @@ -36,7 +36,6 @@ public class LogRecordsRestTest extends QpidRestTestCase assertNotNull("Message id cannot be null", record.get("id")); assertNotNull("Message timestamp cannot be null", record.get("timestamp")); assertEquals("Unexpected log level", "INFO", record.get("level")); - assertEquals("Unexpected thread", "main", record.get("thread")); assertEquals("Unexpected logger", "qpid.message.broker.ready", record.get("logger")); } diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java index 6b6b4a7b3c..8a4e22783f 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java @@ -148,7 +148,6 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase assertEquals("Session reports Queue expectedDepth not as expected", expectedDepth, queueDepth); - // Browse the queue to get a second opinion int msgCount = 0; Enumeration msgs = queueBrowser.getEnumeration(); @@ -268,7 +267,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase //validate all browsers get right message count. for (int count = 0; count < browserEnumerationCount; count++) { - assertEquals(msgCount[count], expectedMessages); + assertEquals("Unexpected count for browser " + count, expectedMessages, msgCount[count]); } try @@ -317,7 +316,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase //Close this new connection connection.close(); - _logger.info("All messages recevied from queue"); + _logger.info("All messages received from queue"); //ensure no message left. checkQueueDepth(0); @@ -344,7 +343,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase /* * Test Messages Remain on Queue - * Create a queu and send messages to it. Browse them and then receive them all to verify they were still there + * Create a queue and send messages to it. Browse them and then receive them all to verify they were still there * */ public void testQueueBrowserMsgsRemainOnQueue() throws Exception diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java index 3ffa73b9b7..54e5a5c9bc 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java @@ -32,7 +32,7 @@ import org.apache.qpid.client.protocol.AMQProtocolHandler; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.transport.Sender; +import org.apache.qpid.transport.ByteBufferSender; import org.apache.qpid.transport.network.NetworkConnection; public class AMQProtocolSessionTest extends QpidBrokerTestCase @@ -107,18 +107,13 @@ public class AMQProtocolSessionTest extends QpidBrokerTestCase private String _localHost = "127.0.0.1"; private int _port = 1; private SocketAddress _localAddress = null; - private final Sender<ByteBuffer> _sender; + private final ByteBufferSender _sender; public TestNetworkConnection() { - _sender = new Sender<ByteBuffer>() + _sender = new ByteBufferSender() { - public void setIdleTimeout(int i) - { - - } - public void send(ByteBuffer msg) { @@ -186,7 +181,7 @@ public class AMQProtocolSessionTest extends QpidBrokerTestCase _localAddress = address; } - public Sender<ByteBuffer> getSender() + public ByteBufferSender getSender() { return _sender; } diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java index f76203887c..5928a41025 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java @@ -313,14 +313,10 @@ public class MaxFrameSizeTest extends QpidBrokerTestCase _maxFrameSize, actualHeartbeatInterval); - int idleTimeout = (int)(actualHeartbeatInterval * 1000 * heartbeatTimeoutFactor); conn.getNetworkConnection().setMaxReadIdle((int)(actualHeartbeatInterval*heartbeatTimeoutFactor)); conn.getNetworkConnection().setMaxWriteIdle(actualHeartbeatInterval); conn.setMaxFrameSize(_maxFrameSize); - - conn.setIdleTimeout(idleTimeout); - int channelMax = tune.getChannelMax(); conn.setChannelMax(channelMax == 0 ? Connection.MAX_CHANNEL_MAX : channelMax); |