diff options
Diffstat (limited to 'java/client/src/test')
33 files changed, 1100 insertions, 1118 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java b/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java index 1d85ea47fd..7cca22de6c 100644 --- a/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java @@ -20,9 +20,13 @@ */ package org.apache.qpid.client; -import java.util.Hashtable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import junit.framework.TestCase; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -36,11 +40,9 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.spi.InitialContextFactory; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import java.util.Hashtable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * QPID-293 Setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery queue @@ -56,7 +58,7 @@ import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; */ public class DispatcherTest extends TestCase { - private static final Logger _logger = Logger.getLogger(DispatcherTest.class); + private static final Logger _logger = LoggerFactory.getLogger(DispatcherTest.class); Context _context; @@ -68,8 +70,8 @@ public class DispatcherTest extends TestCase MessageProducer _producer; Session _clientSession, _producerSession; - private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(1); //all messages Sent Lock - private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(1); //all messages Sent Lock + private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(1); // all messages Sent Lock + private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(1); // all messages Sent Lock private volatile boolean _connectionStopped = false; @@ -89,14 +91,14 @@ public class DispatcherTest extends TestCase Queue queue = (Queue) _context.lookup("queue"); - //Create Client 1 + // Create Client 1 _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); _consumer = _clientSession.createConsumer(queue); - //Create Producer + // Create Producer _producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _producerConnection.start(); @@ -109,7 +111,6 @@ public class DispatcherTest extends TestCase { _producer.send(_producerSession.createTextMessage("Message " + msg)); } - } protected void tearDown() throws Exception @@ -122,67 +123,63 @@ public class DispatcherTest extends TestCase TransportConnection.killAllVMBrokers(); } - public void testAsynchronousRecieve() { - _logger.info("Test Start"); - assertTrue(!((AMQConnection) _clientConnection).started()); - //Set default Message Listener + // Set default Message Listener try { _consumer.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 1 ML 1 Received Message(" + _receivedCount + "):" + message); + public void onMessage(Message message) + { + _logger.info("Client 1 ML 1 Received Message(" + _receivedCount + "):" + message); - _receivedCount++; + _receivedCount++; - if (_receivedCount == MSG_COUNT) - { - _allFirstMessagesSent.countDown(); - } + if (_receivedCount == MSG_COUNT) + { + _allFirstMessagesSent.countDown(); + } - if (_connectionStopped) - { - _logger.info("Running with Message:" + _receivedCount); - } + if (_connectionStopped) + { + _logger.info("Running with Message:" + _receivedCount); + } - if (_connectionStopped && _allFirstMessagesSent.getCount() == 0) - { - _receivedCountWhileStopped++; - } + if (_connectionStopped && (_allFirstMessagesSent.getCount() == 0)) + { + _receivedCountWhileStopped++; + } - if (_allFirstMessagesSent.getCount() == 0) - { - if (_receivedCount == MSG_COUNT * 2) + if (_allFirstMessagesSent.getCount() == 0) { - _allSecondMessagesSent.countDown(); + if (_receivedCount == (MSG_COUNT * 2)) + { + _allSecondMessagesSent.countDown(); + } } } - } - }); - + }); + assertTrue("Connecion should not be started", !((AMQConnection) _clientConnection).started()); - _clientConnection.start(); + _clientConnection.start(); } catch (JMSException e) { _logger.error("Error Setting Default ML on consumer1"); } - try { _allFirstMessagesSent.await(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - //do nothing + // do nothing } try @@ -196,7 +193,6 @@ public class DispatcherTest extends TestCase _logger.error("Error stopping connection"); } - try { _logger.error("Send additional messages"); @@ -211,14 +207,13 @@ public class DispatcherTest extends TestCase _logger.error("Unable to send additional messages", e); } - try { Thread.sleep(1000); } catch (InterruptedException e) { - //ignore + // ignore } try @@ -233,7 +228,6 @@ public class DispatcherTest extends TestCase _logger.error("Error Setting Better ML on consumer1", e); } - _logger.info("Waiting upto 2 seconds for messages"); try @@ -242,17 +236,15 @@ public class DispatcherTest extends TestCase } catch (InterruptedException e) { - //do nothing + // do nothing } assertEquals("Messages not received correctly", 0, _allFirstMessagesSent.getCount()); assertEquals("Messages not received correctly", 0, _allSecondMessagesSent.getCount()); assertEquals("Client didn't get all messages", MSG_COUNT * 2, _receivedCount); assertEquals("Messages received while stopped is not 0", 0, _receivedCountWhileStopped); - } - public static junit.framework.Test suite() { return new junit.framework.TestSuite(DispatcherTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java index 9e48914431..7461f6c200 100644 --- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java +++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java @@ -20,27 +20,6 @@ */ package org.apache.qpid.client; -import java.util.Hashtable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.naming.Context; -import javax.naming.spi.InitialContextFactory; - -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; - /** * QPID-293 Setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery * queue <p/> The message delivery process: Mina puts a message on _queue in AMQSession and the dispatcher thread @@ -52,17 +31,12 @@ import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; */ public class MessageListenerMultiConsumerImmediatePrefetch extends MessageListenerMultiConsumerTest { - - protected void setUp() throws Exception { - System.setProperty(AMQSession.IMMEDIATE_PREFETCH, "true"); super.setUp(); - } - public static junit.framework.Test suite() { return new junit.framework.TestSuite(MessageListenerMultiConsumerImmediatePrefetch.class); diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java index c9407d8ff6..20632e245f 100644 --- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java @@ -20,9 +20,13 @@ */ package org.apache.qpid.client; -import java.util.Hashtable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import junit.framework.TestCase; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -35,11 +39,9 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.spi.InitialContextFactory; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import java.util.Hashtable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * QPID-293 Setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery @@ -52,7 +54,7 @@ import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; */ public class MessageListenerMultiConsumerTest extends TestCase { - private static final Logger _logger = Logger.getLogger(MessageListenerMultiConsumerTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageListenerMultiConsumerTest.class); Context _context; @@ -64,8 +66,7 @@ public class MessageListenerMultiConsumerTest extends TestCase private MessageConsumer _consumer2; private Session _clientSession1; private Queue _queue; - private final CountDownLatch _allMessagesSent = new CountDownLatch(2); //all messages Sent Lock - + private final CountDownLatch _allMessagesSent = new CountDownLatch(2); // all messages Sent Lock protected void setUp() throws Exception { @@ -77,13 +78,13 @@ public class MessageListenerMultiConsumerTest extends TestCase Hashtable<String, String> env = new Hashtable<String, String>(); env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/test?brokerlist='vm://:1'"); - env.put("queue.queue", "direct://amq.direct//"+this.getClass().getName()); + env.put("queue.queue", "direct://amq.direct//" + this.getClass().getName()); _context = factory.getInitialContext(env); _queue = (Queue) _context.lookup("queue"); - //Create Client 1 + // Create Client 1 _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _clientConnection.start(); @@ -92,17 +93,16 @@ public class MessageListenerMultiConsumerTest extends TestCase _consumer1 = _clientSession1.createConsumer(_queue); - //Create Client 2 + // Create Client 2 Session clientSession2 = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); _consumer2 = clientSession2.createConsumer(_queue); - //Create Producer + // Create Producer Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); producerConnection.start(); - Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = producerSession.createProducer(_queue); @@ -124,18 +124,18 @@ public class MessageListenerMultiConsumerTest extends TestCase TransportConnection.killAllVMBrokers(); } - public void testRecieveInterleaved() throws Exception { int msg = 0; int MAX_LOOPS = MSG_COUNT * 2; - for (int loops = 0; msg < MSG_COUNT || loops < MAX_LOOPS; loops++) + for (int loops = 0; (msg < MSG_COUNT) || (loops < MAX_LOOPS); loops++) { if (_consumer1.receive(100) != null) { msg++; } + if (_consumer2.receive(100) != null) { msg++; @@ -145,39 +145,37 @@ public class MessageListenerMultiConsumerTest extends TestCase assertEquals("Not all messages received.", MSG_COUNT, msg); } - public void testAsynchronousRecieve() throws Exception { _consumer1.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 1 Received Message(" + receivedCount1 + "):" + message); + public void onMessage(Message message) + { + _logger.info("Client 1 Received Message(" + receivedCount1 + "):" + message); - receivedCount1++; + receivedCount1++; - if (receivedCount1 == MSG_COUNT / 2) - { - _allMessagesSent.countDown(); - } + if (receivedCount1 == (MSG_COUNT / 2)) + { + _allMessagesSent.countDown(); + } - } - }); + } + }); _consumer2.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 2 Received Message(" + receivedCount2 + "):" + message); - - receivedCount2++; - if (receivedCount2 == MSG_COUNT / 2) + public void onMessage(Message message) { - _allMessagesSent.countDown(); - } - } - }); + _logger.info("Client 2 Received Message(" + receivedCount2 + "):" + message); + receivedCount2++; + if (receivedCount2 == (MSG_COUNT / 2)) + { + _allMessagesSent.countDown(); + } + } + }); _logger.info("Waiting upto 2 seconds for messages"); @@ -187,7 +185,7 @@ public class MessageListenerMultiConsumerTest extends TestCase } catch (InterruptedException e) { - //do nothing + // do nothing } assertEquals(MSG_COUNT, receivedCount1 + receivedCount2); @@ -195,34 +193,37 @@ public class MessageListenerMultiConsumerTest extends TestCase public void testRecieveC2Only() throws Exception { - if (!Boolean.parseBoolean(System.getProperties(). - getProperty(AMQSession.IMMEDIATE_PREFETCH, AMQSession.IMMEDIATE_PREFETCH_DEFAULT))) + if ( + !Boolean.parseBoolean( + System.getProperties().getProperty(AMQSession.IMMEDIATE_PREFETCH, + AMQSession.IMMEDIATE_PREFETCH_DEFAULT))) { _logger.info("Performing Receive only on C2"); for (int msg = 0; msg < MSG_COUNT; msg++) { - assertTrue(MSG_COUNT + " msg should be received. Only received:" + msg, - _consumer2.receive(1000) != null); + assertTrue(MSG_COUNT + " msg should be received. Only received:" + msg, _consumer2.receive(1000) != null); } } } public void testRecieveBoth() throws Exception { - if (!Boolean.parseBoolean(System.getProperties(). - getProperty(AMQSession.IMMEDIATE_PREFETCH, AMQSession.IMMEDIATE_PREFETCH_DEFAULT))) + if ( + !Boolean.parseBoolean( + System.getProperties().getProperty(AMQSession.IMMEDIATE_PREFETCH, + AMQSession.IMMEDIATE_PREFETCH_DEFAULT))) { _logger.info("Performing Receive only with two consumers on one session "); MessageConsumer consumer2 = _clientSession1.createConsumer(_queue); - for (int msg = 0; msg < MSG_COUNT / 2; msg++) + for (int msg = 0; msg < (MSG_COUNT / 2); msg++) { assertTrue(_consumer1.receive() != null); } - for (int msg = 0; msg < MSG_COUNT / 2; msg++) + for (int msg = 0; msg < (MSG_COUNT / 2); msg++) { assertTrue(consumer2.receive() != null); } @@ -231,20 +232,19 @@ public class MessageListenerMultiConsumerTest extends TestCase { _logger.info("Performing Receive only on both C1 and C2"); - for (int msg = 0; msg < MSG_COUNT / 2; msg++) + for (int msg = 0; msg < (MSG_COUNT / 2); msg++) { assertTrue(_consumer1.receive() != null); } - for (int msg = 0; msg < MSG_COUNT / 2; msg++) + for (int msg = 0; msg < (MSG_COUNT / 2); msg++) { assertTrue(_consumer2.receive() != null); } } } - public static junit.framework.Test suite() { return new junit.framework.TestSuite(MessageListenerMultiConsumerTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java index b15742f3aa..87630fad5b 100644 --- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java @@ -14,15 +14,19 @@ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. + * * - * */ package org.apache.qpid.client; -import java.util.Hashtable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import junit.framework.TestCase; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -35,13 +39,9 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.spi.InitialContextFactory; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; -import org.apache.qpid.url.BindingURL; -import org.apache.qpid.url.AMQBindingURL; +import java.util.Hashtable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * QPID-293 Setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery @@ -54,7 +54,7 @@ import org.apache.qpid.url.AMQBindingURL; */ public class MessageListenerTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(MessageListenerTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class); Context _context; @@ -73,6 +73,7 @@ public class MessageListenerTest extends TestCase implements MessageListener { TransportConnection.createVMBroker(1); } + InitialContextFactory factory = new PropertiesFileInitialContextFactory(); Hashtable<String, String> env = new Hashtable<String, String>(); @@ -84,7 +85,7 @@ public class MessageListenerTest extends TestCase implements MessageListener Queue queue = (Queue) _context.lookup("queue"); - //Create Client + // Create Client _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _clientConnection.start(); @@ -93,7 +94,7 @@ public class MessageListenerTest extends TestCase implements MessageListener _consumer = clientSession.createConsumer(queue); - //Create Producer + // Create Producer Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); @@ -123,7 +124,6 @@ public class MessageListenerTest extends TestCase implements MessageListener } } - public void testSynchronousRecieve() throws Exception { for (int msg = 0; msg < MSG_COUNT; msg++) @@ -144,9 +144,9 @@ public class MessageListenerTest extends TestCase implements MessageListener } catch (InterruptedException e) { - //do nothing + // do nothing } - //Should have recieved all async messages + // Should have recieved all async messages assertEquals(MSG_COUNT, receivedCount); } @@ -156,11 +156,11 @@ public class MessageListenerTest extends TestCase implements MessageListener _logger.error("Test disabled as initial receive is not called first"); // Perform initial receive to start connection -// assertTrue(_consumer.receive(2000) != null); -// receivedCount++; + // assertTrue(_consumer.receive(2000) != null); + // receivedCount++; // Sleep to ensure remaining 4 msgs end up on _synchronousQueue -// Thread.sleep(1000); + // Thread.sleep(1000); // Set the message listener and wait for the messages to come in. _consumer.setMessageListener(this); @@ -173,14 +173,13 @@ public class MessageListenerTest extends TestCase implements MessageListener } catch (InterruptedException e) { - //do nothing + // do nothing } - //Should have recieved all async messages + // Should have recieved all async messages assertEquals(MSG_COUNT, receivedCount); } - public void onMessage(Message message) { _logger.info("Received Message(" + receivedCount + "):" + message); diff --git a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java index 97fbf9876f..5f7ca69554 100644 --- a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java @@ -20,9 +20,13 @@ */ package org.apache.qpid.client; -import java.util.Hashtable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import junit.framework.TestCase; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -36,11 +40,9 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.spi.InitialContextFactory; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import java.util.Hashtable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * QPID-293 Setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery @@ -53,7 +55,7 @@ import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; */ public class ResetMessageListenerTest extends TestCase { - private static final Logger _logger = Logger.getLogger(ResetMessageListenerTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ResetMessageListenerTest.class); Context _context; @@ -67,8 +69,8 @@ public class ResetMessageListenerTest extends TestCase MessageProducer _producer; Session _clientSession, _producerSession; - private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(2); //all messages Sent Lock - private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(2); //all messages Sent Lock + private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(2); // all messages Sent Lock + private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(2); // all messages Sent Lock protected void setUp() throws Exception { @@ -88,17 +90,17 @@ public class ResetMessageListenerTest extends TestCase Queue queue = (Queue) _context.lookup("queue"); - //Create Client 1 + // Create Client 1 _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); _consumer1 = _clientSession.createConsumer(queue); - //Create Client 2 on same session + // Create Client 2 on same session _consumer2 = _clientSession.createConsumer(queue); - //Create Producer + // Create Producer _producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection(); _producerConnection.start(); @@ -129,57 +131,55 @@ public class ResetMessageListenerTest extends TestCase TransportConnection.killAllVMBrokers(); } - public void testAsynchronousRecieve() { _logger.info("Test Start"); - //Set default Message Listener + // Set default Message Listener try { _consumer1.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 1 ML 1 Received Message(" + receivedCount1ML1 + "):" + message); - - receivedCount1ML1++; - if (receivedCount1ML1 == MSG_COUNT / 2) + public void onMessage(Message message) { - _allFirstMessagesSent.countDown(); + _logger.info("Client 1 ML 1 Received Message(" + receivedCount1ML1 + "):" + message); + + receivedCount1ML1++; + if (receivedCount1ML1 == (MSG_COUNT / 2)) + { + _allFirstMessagesSent.countDown(); + } } - } - }); + }); } catch (JMSException e) { _logger.error("Error Setting Default ML on consumer1"); } - try { _consumer2.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 2 Received Message(" + receivedCount2 + "):" + message); - - receivedCount2++; - if (receivedCount2 == MSG_COUNT / 2) + public void onMessage(Message message) { - _logger.info("Client 2 received all its messages1"); - _allFirstMessagesSent.countDown(); + _logger.info("Client 2 Received Message(" + receivedCount2 + "):" + message); + + receivedCount2++; + if (receivedCount2 == (MSG_COUNT / 2)) + { + _logger.info("Client 2 received all its messages1"); + _allFirstMessagesSent.countDown(); + } + + if (receivedCount2 == MSG_COUNT) + { + _logger.info("Client 2 received all its messages2"); + _allSecondMessagesSent.countDown(); + } } - - if (receivedCount2 == MSG_COUNT) - { - _logger.info("Client 2 received all its messages2"); - _allSecondMessagesSent.countDown(); - } - } - }); + }); _clientConnection.start(); } @@ -189,7 +189,6 @@ public class ResetMessageListenerTest extends TestCase } - try { _allFirstMessagesSent.await(1000, TimeUnit.MILLISECONDS); @@ -197,7 +196,7 @@ public class ResetMessageListenerTest extends TestCase } catch (InterruptedException e) { - //do nothing + // do nothing } try @@ -213,18 +212,18 @@ public class ResetMessageListenerTest extends TestCase try { _consumer1.setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _logger.info("Client 1 ML2 Received Message(" + receivedCount1ML1 + "):" + message); - - receivedCount1ML2++; - if (receivedCount1ML2 == MSG_COUNT / 2) + public void onMessage(Message message) { - _allSecondMessagesSent.countDown(); + _logger.info("Client 1 ML2 Received Message(" + receivedCount1ML1 + "):" + message); + + receivedCount1ML2++; + if (receivedCount1ML2 == (MSG_COUNT / 2)) + { + _allSecondMessagesSent.countDown(); + } } - } - }); + }); _clientConnection.start(); } @@ -260,11 +259,10 @@ public class ResetMessageListenerTest extends TestCase } catch (InterruptedException e) { - //do nothing + // do nothing } } - public static junit.framework.Test suite() { return new junit.framework.TestSuite(ResetMessageListenerTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java index 4667a2b3fa..b6f46b4acc 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java @@ -19,32 +19,30 @@ */ package org.apache.qpid.test.unit.ack; -import java.util.concurrent.atomic.AtomicInteger; +import junit.framework.TestCase; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.jms.Session; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.MessageProducer; import javax.jms.Queue; - import javax.jms.TextMessage; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.jms.Session; +import java.util.concurrent.atomic.AtomicInteger; public class RecoverTest extends TestCase { - private static final Logger _logger = Logger.getLogger(RecoverTest.class); + private static final Logger _logger = LoggerFactory.getLogger(RecoverTest.class); private Exception _error; private AtomicInteger count; @@ -64,16 +62,17 @@ public class RecoverTest extends TestCase count = null; } - public void testRecoverResendsMsgs() throws Exception { AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); - Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(),new AMQShortString("someQ"), new AMQShortString("someQ"), false, true); + Queue queue = + new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("someQ"), + new AMQShortString("someQ"), false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); - //force synch to ensure the consumer has resulted in a bound queue - //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); + // force synch to ensure the consumer has resulted in a bound queue + // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); // This is the default now AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); @@ -122,16 +121,17 @@ public class RecoverTest extends TestCase con.close(); } - public void testRecoverResendsMsgsAckOnEarlier() throws Exception { AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); - Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false, true); + Queue queue = + new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("someQ"), + new AMQShortString("someQ"), false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); - //force synch to ensure the consumer has resulted in a bound queue - //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); + // force synch to ensure the consumer has resulted in a bound queue + // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); // This is the default now AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); @@ -164,7 +164,6 @@ public class RecoverTest extends TestCase TextMessage tm4 = (TextMessage) consumer.receive(3000); assertEquals("msg4", tm4.getText()); - _logger.info("Received redelivery of two messages. calling acknolwedgeThis() first of those message"); ((org.apache.qpid.jms.Message) tm3).acknowledgeThis(); @@ -180,7 +179,6 @@ public class RecoverTest extends TestCase // all acked so no messages to be delivered consumerSession.recover(); - tm = (TextMessage) consumer.receiveNoWait(); assertNull(tm); _logger.info("No messages redelivered as is expected"); @@ -193,8 +191,12 @@ public class RecoverTest extends TestCase AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); - Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), false, true); - Queue queue2 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q2"), new AMQShortString("Q2"), false, true); + Queue queue = + new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), + false, true); + Queue queue2 = + new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q2"), new AMQShortString("Q2"), + false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); MessageConsumer consumer2 = consumerSession.createConsumer(queue2); @@ -232,68 +234,72 @@ public class RecoverTest extends TestCase AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); final Session consumerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q3"), new AMQShortString("Q3"), false, true); + Queue queue = + new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q3"), new AMQShortString("Q3"), + false, true); MessageConsumer consumer = consumerSession.createConsumer(queue); MessageProducer producer = consumerSession.createProducer(queue); producer.send(consumerSession.createTextMessage("hello")); - final Object lock = new Object(); consumer.setMessageListener(new MessageListener() - { - - - - public void onMessage(Message message) { - try + + public void onMessage(Message message) { - count.incrementAndGet(); - if (count.get() == 1) + try { - if(message.getJMSRedelivered()) + count.incrementAndGet(); + if (count.get() == 1) { - setError(new Exception("Message marked as redilvered on what should be first delivery attempt")); + if (message.getJMSRedelivered()) + { + setError( + new Exception("Message marked as redilvered on what should be first delivery attempt")); + } + + consumerSession.recover(); } - consumerSession.recover(); - } - else if (count.get() == 2) - { - if(!message.getJMSRedelivered()) + else if (count.get() == 2) { - setError(new Exception("Message not marked as redilvered on what should be second delivery attempt")); + if (!message.getJMSRedelivered()) + { + setError( + new Exception( + "Message not marked as redilvered on what should be second delivery attempt")); + } + } + else + { + System.err.println(message); + fail("Message delivered too many times!: " + count); } } - else + catch (JMSException e) { - System.err.println(message); - fail("Message delivered too many times!: " + count); + _logger.error("Error recovering session: " + e, e); + setError(e); + } + + synchronized (lock) + { + lock.notify(); } } - catch (JMSException e) - { - _logger.error("Error recovering session: " + e, e); - setError(e); - } - synchronized(lock) - { - lock.notify(); - } - } - }); + }); con.start(); long waitTime = 300000L; long waitUntilTime = System.currentTimeMillis() + waitTime; - synchronized(lock) + synchronized (lock) { - while((count.get() <= 1) && (waitTime > 0)) + while ((count.get() <= 1) && (waitTime > 0)) { lock.wait(waitTime); - if(count.get() <= 1) + if (count.get() <= 1) { waitTime = waitUntilTime - System.currentTimeMillis(); } @@ -302,15 +308,16 @@ public class RecoverTest extends TestCase Thread.sleep(1000); - if(count.get() != 2) + if (count.get() != 2) { System.err.println("Count != 2 : " + count); } - assertTrue(count.get() == 2); + + assertTrue(count.get() == 2); con.close(); - if(_error != null) + if (_error != null) { throw _error; } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java index a350330c71..da1b46ee2c 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,9 +19,20 @@ */ package org.apache.qpid.test.unit.basic; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.apache.mina.common.ByteBuffer; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.message.JMSBytesMessage; +import org.apache.qpid.testutil.VMBrokerSetup; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -34,21 +45,13 @@ import javax.jms.MessageNotWriteableException; import javax.jms.MessageProducer; import javax.jms.Session; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.mina.common.ByteBuffer; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.message.JMSBytesMessage; -import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class BytesMessageTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(BytesMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(BytesMessageTest.class); private Connection _connection; private Destination _destination; @@ -102,7 +105,7 @@ public class BytesMessageTest extends TestCase implements MessageListener void send(int count) throws JMSException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -115,7 +118,7 @@ public class BytesMessageTest extends TestCase implements MessageListener } catch (MessageNotReadableException mnwe) { - //normal execution + // normal execution } byte[] data = ("Message " + i).getBytes(); @@ -127,7 +130,7 @@ public class BytesMessageTest extends TestCase implements MessageListener void waitFor(int count) throws InterruptedException { - synchronized(received) + synchronized (received) { while (received.size() < count) { @@ -146,8 +149,7 @@ public class BytesMessageTest extends TestCase implements MessageListener buffer.get(data); actual.add(data); - - //Check Body Write Status + // Check Body Write Status try { m.writeBoolean(true); @@ -155,7 +157,7 @@ public class BytesMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearBody(); @@ -169,8 +171,7 @@ public class BytesMessageTest extends TestCase implements MessageListener Assert.fail("Message should be writeable"); } - - //Check property write status + // Check property write status try { m.setStringProperty("test", "test"); @@ -178,7 +179,7 @@ public class BytesMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearProperties(); @@ -219,6 +220,7 @@ public class BytesMessageTest extends TestCase implements MessageListener { errors.add("Found " + actual.next() + " but no more expected values."); } + if (!errors.isEmpty()) { throw new RuntimeException(errors.toString()); @@ -231,6 +233,7 @@ public class BytesMessageTest extends TestCase implements MessageListener { throw new RuntimeException("Expected length " + expected.length + " got " + actual.length); } + for (int i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) @@ -242,7 +245,7 @@ public class BytesMessageTest extends TestCase implements MessageListener public void onMessage(Message message) { - synchronized(received) + synchronized (received) { received.add((JMSBytesMessage) message); received.notify(); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java index 9e2918770a..aff496becf 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,19 +20,10 @@ */ package org.apache.qpid.test.unit.basic; -import java.io.IOException; -import java.util.ArrayList; - -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; - import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.apache.mina.common.ByteBuffer; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; @@ -43,10 +34,21 @@ import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.FieldTableFactory; import org.apache.qpid.testutil.VMBrokerSetup; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.BytesMessage; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; + +import java.io.IOException; +import java.util.ArrayList; + public class FieldTableMessageTest extends TestCase implements MessageListener { - - private static final Logger _logger = Logger.getLogger(FieldTableMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(FieldTableMessageTest.class); private AMQConnection _connection; private AMQDestination _destination; @@ -67,10 +69,9 @@ public class FieldTableMessageTest extends TestCase implements MessageListener super.tearDown(); } - private void init(AMQConnection connection) throws Exception { - init(connection, new AMQQueue(connection,randomize("FieldTableMessageTest"), true)); + init(connection, new AMQQueue(connection, randomize("FieldTableMessageTest"), true)); } private void init(AMQConnection connection, AMQDestination destination) throws Exception @@ -79,11 +80,11 @@ public class FieldTableMessageTest extends TestCase implements MessageListener _destination = destination; _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); - //set up a slow consumer + // set up a slow consumer _session.createConsumer(destination).setMessageListener(this); connection.start(); - //_expected = new FieldTableTest().load("FieldTableTest2.properties"); + // _expected = new FieldTableTest().load("FieldTableTest2.properties"); _expected = load(); } @@ -111,7 +112,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener void send(int count) throws JMSException, IOException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -123,7 +124,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener void waitFor(int count) throws InterruptedException { - synchronized(received) + synchronized (received) { while (received.size() < count) { @@ -139,7 +140,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener ByteBuffer buffer = ((JMSBytesMessage) m).getData(); FieldTable actual = FieldTableFactory.newFieldTable(buffer, buffer.remaining()); for (String key : _expected.keys()) - { + { assertEquals("Values for " + key + " did not match", _expected.getObject(key), actual.getObject(key)); } } @@ -147,7 +148,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener public void onMessage(Message message) { - synchronized(received) + synchronized (received) { received.add((JMSBytesMessage) message); received.notify(); @@ -162,9 +163,9 @@ public class FieldTableMessageTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { FieldTableMessageTest test = new FieldTableMessageTest(); - test._connectionString = argv.length == 0 ? "vm://:1" : argv[0]; + test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0]; test.setUp(); - test._count = argv.length > 1 ? Integer.parseInt(argv[1]) : 5; + test._count = (argv.length > 1) ? Integer.parseInt(argv[1]) : 5; test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index 3830d61701..ffc7be82f0 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java @@ -14,32 +14,36 @@ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. + * * - * */ package org.apache.qpid.test.unit.basic; import junit.framework.TestCase; -import org.apache.log4j.Logger; + import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSTextMessage; +import org.apache.qpid.client.transport.TransportConnection; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Destination; -import javax.jms.Session; -import javax.jms.MessageConsumer; import javax.jms.JMSException; +import javax.jms.MessageConsumer; import javax.jms.MessageProducer; +import javax.jms.Session; import javax.jms.TextMessage; -import java.util.List; + import java.util.ArrayList; +import java.util.List; public class LargeMessageTest extends TestCase { - private static final Logger _logger = Logger.getLogger(LargeMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class); private AMQConnection _connection; private Destination _destination; @@ -68,7 +72,7 @@ public class LargeMessageTest extends TestCase private void init(AMQConnection connection) throws Exception { - Destination destination = new AMQQueue(connection,"LargeMessageTest", true); + Destination destination = new AMQQueue(connection, "LargeMessageTest", true); init(connection, destination); } @@ -84,7 +88,7 @@ public class LargeMessageTest extends TestCase // Test boundary of 1 packet to 2 packets public void test64kminus1() { - checkLargeMessage(64 * 1024 - 1); + checkLargeMessage((64 * 1024) - 1); } public void test64k() @@ -94,13 +98,13 @@ public class LargeMessageTest extends TestCase public void test64kplus1() { - checkLargeMessage(64 * 1024 + 1); + checkLargeMessage((64 * 1024) + 1); } - //Test packet boundary of 3 packtes + // Test packet boundary of 3 packtes public void test128kminus1() { - checkLargeMessage(128 * 1024 - 1); + checkLargeMessage((128 * 1024) - 1); } public void test128k() @@ -110,7 +114,7 @@ public class LargeMessageTest extends TestCase public void test128kplus1() { - checkLargeMessage(128 * 1024 + 1); + checkLargeMessage((128 * 1024) + 1); } // Testing larger messages @@ -167,10 +171,10 @@ public class LargeMessageTest extends TestCase { builder.append(ch); - if (i % 1000 == 0) + if ((i % 1000) == 0) { ch++; - if (ch == 'z' + 1) + if (ch == ('z' + 1)) { ch = 'a'; } @@ -180,7 +184,6 @@ public class LargeMessageTest extends TestCase return builder.toString(); } - public static junit.framework.Test suite() { return new junit.framework.TestSuite(LargeMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java index 75eb3a8d5e..6708fefa86 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java @@ -20,9 +20,17 @@ */ package org.apache.qpid.test.unit.basic; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.message.JMSMapMessage; +import org.apache.qpid.client.transport.TransportConnection; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Destination; import javax.jms.JMSException; @@ -34,20 +42,13 @@ import javax.jms.MessageNotWriteableException; import javax.jms.MessageProducer; import javax.jms.Session; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.message.JMSMapMessage; -import org.apache.qpid.client.transport.TransportConnection; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class MapMessageTest extends TestCase implements MessageListener { - - private static final Logger _logger = Logger.getLogger(MapMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MapMessageTest.class); private AMQConnection _connection; private Destination _destination; @@ -57,7 +58,7 @@ public class MapMessageTest extends TestCase implements MessageListener private static final String MESSAGE = "Message "; private int _count = 100; public String _connectionString = "vm://:1"; - private byte[] _bytes = {99, 98, 97, 96, 95}; + private byte[] _bytes = { 99, 98, 97, 96, 95 }; private static final float _smallfloat = 100.0f; protected void setUp() throws Exception @@ -83,7 +84,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void init(AMQConnection connection) throws Exception { - Destination destination = new AMQQueue(connection,randomize("MapMessageTest"), true); + Destination destination = new AMQQueue(connection, randomize("MapMessageTest"), true); init(connection, destination); } @@ -93,7 +94,7 @@ public class MapMessageTest extends TestCase implements MessageListener _destination = destination; _session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //set up a slow consumer + // set up a slow consumer _session.createConsumer(destination).setMessageListener(this); connection.start(); } @@ -109,7 +110,7 @@ public class MapMessageTest extends TestCase implements MessageListener void send(int count) throws JMSException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -123,7 +124,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void setMapValues(MapMessage message, int i) throws JMSException { - message.setBoolean("odd", i / 2 == 0); + message.setBoolean("odd", (i / 2) == 0); message.setByte("byte", (byte) Byte.MAX_VALUE); message.setBytes("bytes", _bytes); message.setChar("char", (char) 'c'); @@ -136,7 +137,7 @@ public class MapMessageTest extends TestCase implements MessageListener message.setShort("short", (short) Short.MAX_VALUE); message.setString("message", MESSAGE + i); - //Test Setting Object Values + // Test Setting Object Values message.setObject("object-bool", true); message.setObject("object-byte", Byte.MAX_VALUE); message.setObject("object-bytes", _bytes); @@ -147,7 +148,7 @@ public class MapMessageTest extends TestCase implements MessageListener message.setObject("object-long", Long.MAX_VALUE); message.setObject("object-short", Short.MAX_VALUE); - //Set a null String value + // Set a null String value message.setString("nullString", null); // Highlight protocol problem message.setString("emptyString", ""); @@ -159,10 +160,9 @@ public class MapMessageTest extends TestCase implements MessageListener long waitTime = 30000L; long waitUntilTime = System.currentTimeMillis() + 30000L; - - synchronized(received) + synchronized (received) { - while(received.size() < count && waitTime>0) + while ((received.size() < count) && (waitTime > 0)) { if (received.size() < count) { @@ -174,6 +174,7 @@ public class MapMessageTest extends TestCase implements MessageListener waitTime = waitUntilTime - System.currentTimeMillis(); } } + if (received.size() < count) { throw new Exception("Timed-out. Waiting for " + count + " only got " + received.size()); @@ -236,7 +237,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } try @@ -246,10 +247,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("message"); @@ -257,7 +258,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } try @@ -267,8 +268,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } + try { m.getLong("message"); @@ -276,10 +278,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getFloat("message"); @@ -287,9 +289,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("message"); @@ -297,9 +299,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (NumberFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("message"); @@ -307,7 +309,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals(MESSAGE + m.getInt("messageNumber"), m.getString("message")); @@ -316,7 +318,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void testShort(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("short"); @@ -324,7 +326,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -334,12 +336,12 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals(Short.MAX_VALUE, m.getShort("short")); - //Try bad reads + // Try bad reads try { m.getChar("short"); @@ -347,14 +349,14 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } Assert.assertEquals(Short.MAX_VALUE, m.getInt("short")); Assert.assertEquals(Short.MAX_VALUE, m.getLong("short")); - //Try bad reads + // Try bad reads try { m.getFloat("short"); @@ -362,9 +364,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("short"); @@ -372,9 +374,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("short"); @@ -382,7 +384,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Short.MAX_VALUE, m.getString("short")); @@ -391,7 +393,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void testLong(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("long"); @@ -399,7 +401,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -409,7 +411,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -419,10 +421,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("long"); @@ -430,7 +432,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } try @@ -440,12 +442,12 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals(Long.MAX_VALUE, m.getLong("long")); - //Try bad reads + // Try bad reads try { m.getFloat("long"); @@ -453,9 +455,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("long"); @@ -463,9 +465,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("long"); @@ -473,7 +475,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Long.MAX_VALUE, m.getString("long")); @@ -482,7 +484,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void testDouble(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("double"); @@ -490,7 +492,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -500,7 +502,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -510,10 +512,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("double"); @@ -521,7 +523,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } try @@ -531,8 +533,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } + try { m.getLong("double"); @@ -540,10 +543,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getFloat("double"); @@ -551,13 +554,12 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - Assert.assertEquals(Double.MAX_VALUE, m.getDouble("double")); - //Try bad reads + // Try bad reads try { m.getBytes("double"); @@ -565,17 +567,16 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Double.MAX_VALUE, m.getString("double")); } - private void testFloat(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("float"); @@ -583,7 +584,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -593,7 +594,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -603,10 +604,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("float"); @@ -614,7 +615,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } try @@ -624,8 +625,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } + try { m.getLong("float"); @@ -633,15 +635,14 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - Assert.assertEquals(Float.MAX_VALUE, m.getFloat("float")); Assert.assertEquals(_smallfloat, (float) m.getDouble("smallfloat")); - //Try bad reads + // Try bad reads try { m.getBytes("float"); @@ -649,17 +650,16 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Float.MAX_VALUE, m.getString("float")); } - private void testInt(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("int"); @@ -667,7 +667,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -677,7 +677,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -687,10 +687,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("int"); @@ -698,14 +698,14 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } Assert.assertEquals(Integer.MAX_VALUE, m.getInt("int")); Assert.assertEquals(Integer.MAX_VALUE, (int) m.getLong("int")); - //Try bad reads + // Try bad reads try { m.getFloat("int"); @@ -713,9 +713,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("int"); @@ -723,9 +723,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("int"); @@ -733,17 +733,16 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Integer.MAX_VALUE, m.getString("int")); } - private void testChar(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("char"); @@ -751,7 +750,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -761,7 +760,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -771,7 +770,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals('c', m.getChar("char")); @@ -783,8 +782,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } + try { m.getLong("char"); @@ -792,10 +792,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getFloat("char"); @@ -803,9 +803,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("char"); @@ -813,9 +813,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("char"); @@ -823,7 +823,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + 'c', m.getString("char")); @@ -831,7 +831,7 @@ public class MapMessageTest extends TestCase implements MessageListener private void testBytes(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("bytes"); @@ -839,7 +839,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -849,7 +849,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -859,10 +859,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("bytes"); @@ -870,7 +870,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } try @@ -880,7 +880,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } try @@ -890,10 +890,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getFloat("bytes"); @@ -901,9 +901,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("bytes"); @@ -911,10 +911,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - assertBytesEqual(_bytes, m.getBytes("bytes")); try @@ -924,15 +923,14 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - } private void testByte(JMSMapMessage m) throws JMSException { - //Try bad reads + // Try bad reads try { m.getBoolean("byte"); @@ -940,14 +938,14 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals(Byte.MAX_VALUE, m.getByte("byte")); Assert.assertEquals((short) Byte.MAX_VALUE, m.getShort("byte")); - //Try bad reads + // Try bad reads try { m.getChar("byte"); @@ -955,15 +953,15 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } - //Reading a byte as an int is ok + // Reading a byte as an int is ok Assert.assertEquals((short) Byte.MAX_VALUE, m.getInt("byte")); Assert.assertEquals((short) Byte.MAX_VALUE, m.getLong("byte")); - //Try bad reads + // Try bad reads try { m.getFloat("byte"); @@ -971,9 +969,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("byte"); @@ -981,9 +979,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("byte"); @@ -991,7 +989,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + Byte.MAX_VALUE, m.getString("byte")); @@ -1003,7 +1001,7 @@ public class MapMessageTest extends TestCase implements MessageListener Assert.assertEquals((m.getInt("messageNumber") / 2) == 0, m.getBoolean("odd")); - //Try bad reads + // Try bad reads try { m.getByte("odd"); @@ -1011,10 +1009,10 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getShort("odd"); @@ -1022,9 +1020,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getChar("odd"); @@ -1032,9 +1030,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException npe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getInt("odd"); @@ -1042,9 +1040,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getLong("odd"); @@ -1052,9 +1050,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getFloat("odd"); @@ -1062,9 +1060,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getDouble("odd"); @@ -1072,9 +1070,9 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } - //Try bad reads + // Try bad reads try { m.getBytes("odd"); @@ -1082,16 +1080,15 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageFormatException nfe) { - //normal execution + // normal execution } Assert.assertEquals("" + ((m.getInt("messageNumber") / 2) == 0), m.getString("odd")); } - private void testPropertyWriteStatus(JMSMapMessage m) throws JMSException { - //Check property write status + // Check property write status try { m.setStringProperty("test", "test"); @@ -1099,7 +1096,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearProperties(); @@ -1123,7 +1120,7 @@ public class MapMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearBody(); @@ -1138,54 +1135,51 @@ public class MapMessageTest extends TestCase implements MessageListener } } - - - private void testMapValues(JMSMapMessage m, int count) throws JMSException { - //Test get<Primiative> + // Test get<Primiative> - //Boolean - assertEqual(count / 2 == 0, m.getBoolean("odd")); - assertEqual("" + (count / 2 == 0), m.getString("odd")); + // Boolean + assertEqual((count / 2) == 0, m.getBoolean("odd")); + assertEqual("" + ((count / 2) == 0), m.getString("odd")); - //Byte + // Byte assertEqual(Byte.MAX_VALUE, m.getByte("byte")); assertEqual("" + Byte.MAX_VALUE, m.getString("byte")); - //Bytes + // Bytes assertBytesEqual(_bytes, m.getBytes("bytes")); - //Char + // Char assertEqual('c', m.getChar("char")); - //Double + // Double assertEqual(Double.MAX_VALUE, m.getDouble("double")); assertEqual("" + Double.MAX_VALUE, m.getString("double")); - //Float + // Float assertEqual(Float.MAX_VALUE, m.getFloat("float")); assertEqual(_smallfloat, (float) m.getDouble("smallfloat")); assertEqual("" + Float.MAX_VALUE, m.getString("float")); - //Integer + // Integer assertEqual(Integer.MAX_VALUE, m.getInt("int")); assertEqual("" + Integer.MAX_VALUE, m.getString("int")); assertEqual(count, m.getInt("messageNumber")); - //long + // long assertEqual(Long.MAX_VALUE, m.getLong("long")); assertEqual("" + Long.MAX_VALUE, m.getString("long")); - //Short + // Short assertEqual(Short.MAX_VALUE, m.getShort("short")); assertEqual("" + Short.MAX_VALUE, m.getString("short")); assertEqual((int) Short.MAX_VALUE, m.getInt("short")); - //String + // String assertEqual(MESSAGE + count, m.getString("message")); - //Test getObjects + // Test getObjects assertEqual(true, m.getObject("object-bool")); assertEqual(Byte.MAX_VALUE, m.getObject("object-byte")); assertBytesEqual(_bytes, (byte[]) m.getObject("object-bytes")); @@ -1196,7 +1190,7 @@ public class MapMessageTest extends TestCase implements MessageListener assertEqual(Long.MAX_VALUE, m.getObject("object-long")); assertEqual(Short.MAX_VALUE, m.getObject("object-short")); - //Check Special values + // Check Special values assertTrue(m.getString("nullString") == null); assertEqual("", m.getString("emptyString")); } @@ -1211,7 +1205,6 @@ public class MapMessageTest extends TestCase implements MessageListener } } - private static void assertEqual(Iterator expected, Iterator actual) { List<String> errors = new ArrayList<String>(); @@ -1234,6 +1227,7 @@ public class MapMessageTest extends TestCase implements MessageListener { errors.add("Found " + actual.next() + " but no more expected values."); } + if (!errors.isEmpty()) { throw new RuntimeException(errors.toString()); @@ -1250,7 +1244,7 @@ public class MapMessageTest extends TestCase implements MessageListener public void onMessage(Message message) { - synchronized(received) + synchronized (received) { _logger.info("****************** Recevied Messgage:" + (JMSMapMessage) message); received.add((JMSMapMessage) message); @@ -1266,12 +1260,13 @@ public class MapMessageTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { MapMessageTest test = new MapMessageTest(); - test._connectionString = argv.length == 0 ? "vm://:1" : argv[0]; + test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0]; test.setUp(); if (argv.length > 1) { test._count = Integer.parseInt(argv[1]); } + test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index ddb21ed3e5..65b3d60ad9 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java @@ -19,12 +19,6 @@ */ package org.apache.qpid.test.unit.basic; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Session; - import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; @@ -33,11 +27,19 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Session; public class MultipleConnectionTest extends TestCase { - private static final Logger _logger = Logger.getLogger(MultipleConnectionTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MultipleConnectionTest.class); public static final String _defaultBroker = "vm://:1"; public String _connectionString = _defaultBroker; @@ -64,6 +66,7 @@ public class MultipleConnectionTest extends TestCase _counters[i] = new MessageCounter(_sessions[i].toString()); _sessions[i].createConsumer(dest).setMessageListener(_counters[i]); } + _connection.start(); } @@ -128,8 +131,10 @@ public class MultipleConnectionTest extends TestCase { break; } + wait(timeLeft); } + return expected <= _count; } @@ -144,7 +149,6 @@ public class MultipleConnectionTest extends TestCase } } - protected void setUp() throws Exception { super.setUp(); @@ -183,7 +187,7 @@ public class MultipleConnectionTest extends TestCase public static void main(String[] argv) throws Exception { - String broker = argv.length > 0 ? argv[0] : _defaultBroker; + String broker = (argv.length > 0) ? argv[0] : _defaultBroker; MultipleConnectionTest test = new MultipleConnectionTest(); test._connectionString = broker; @@ -195,12 +199,9 @@ public class MultipleConnectionTest extends TestCase String broker = _connectionString; int messages = 10; - AMQTopic topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME,"amq.topic"); + AMQTopic topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, "amq.topic"); - Receiver[] receivers = new Receiver[]{ - new Receiver(broker, topic, 2), - new Receiver(broker, topic, 14) - }; + Receiver[] receivers = new Receiver[] { new Receiver(broker, topic, 2), new Receiver(broker, topic, 14) }; Publisher publisher = new Publisher(broker, topic); for (int i = 0; i < messages; i++) diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java index aee9002354..9237555734 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java @@ -19,17 +19,6 @@ */ package org.apache.qpid.test.unit.basic; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageNotWriteableException; -import javax.jms.MessageProducer; - import junit.framework.Assert; import junit.framework.TestCase; @@ -39,11 +28,24 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSObjectMessage; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageNotWriteableException; +import javax.jms.MessageProducer; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class ObjectMessageTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(ObjectMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); private AMQConnection _connection; private AMQDestination _destination; @@ -75,7 +77,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener private void init(AMQConnection connection) throws Exception { - init(connection, new AMQQueue(connection,randomize("ObjectMessageTest"), true)); + init(connection, new AMQQueue(connection, randomize("ObjectMessageTest"), true)); } private void init(AMQConnection connection, AMQDestination destination) throws Exception @@ -84,7 +86,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener _destination = destination; _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); - //set up a slow consumer + // set up a slow consumer _session.createConsumer(destination).setMessageListener(this); connection.start(); } @@ -101,7 +103,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener void send(int count) throws JMSException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -113,7 +115,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener void waitFor(int count) throws InterruptedException { - synchronized(received) + synchronized (received) { while (received.size() < count) { @@ -136,7 +138,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearBody(); @@ -150,7 +152,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener Assert.fail("Message should be writeable"); } - //Check property write status + // Check property write status try { m.setStringProperty("test", "test"); @@ -158,7 +160,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearProperties(); @@ -200,6 +202,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener { errors.add("Found " + actual.next() + " but no more expected values."); } + if (!errors.isEmpty()) { throw new RuntimeException(errors.toString()); @@ -216,7 +219,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener public void onMessage(Message message) { - synchronized(received) + synchronized (received) { received.add((JMSObjectMessage) message); received.notify(); @@ -244,7 +247,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener public boolean equals(Object o) { - return o instanceof Payload && ((Payload) o).data.equals(data); + return (o instanceof Payload) && ((Payload) o).data.equals(data); } public String toString() @@ -256,12 +259,13 @@ public class ObjectMessageTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { ObjectMessageTest test = new ObjectMessageTest(); - test._connectionString = argv.length == 0 ? "vm://:1" : argv[0]; + test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0]; test.setUp(); if (argv.length > 1) { test._count = Integer.parseInt(argv[1]); } + test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java index 90784b0772..dce9667ff2 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java @@ -20,10 +20,19 @@ */ package org.apache.qpid.test.unit.basic; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.math.BigDecimal; +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.message.AMQMessage; +import org.apache.qpid.client.message.JMSTextMessage; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.framing.AMQShortString; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Destination; import javax.jms.JMSException; @@ -33,22 +42,14 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.client.message.JMSTextMessage; -import org.apache.qpid.client.message.AMQMessage; -import org.apache.qpid.framing.AMQShortString; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class PropertyValueTest extends TestCase implements MessageListener { - - private static final Logger _logger = Logger.getLogger(PropertyValueTest.class); + private static final Logger _logger = LoggerFactory.getLogger(PropertyValueTest.class); private int count = 0; private AMQConnection _connection; @@ -83,7 +84,7 @@ public class PropertyValueTest extends TestCase implements MessageListener _destination = destination; _session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //set up a slow consumer + // set up a slow consumer _session.createConsumer(destination).setMessageListener(this); connection.start(); } @@ -136,7 +137,7 @@ public class PropertyValueTest extends TestCase implements MessageListener void send(int count) throws JMSException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -152,14 +153,14 @@ public class PropertyValueTest extends TestCase implements MessageListener m.setIntProperty("Int", (int) Integer.MAX_VALUE); m.setJMSCorrelationID("Correlation"); - //fixme the m.setJMSMessage has no effect + // fixme the m.setJMSMessage has no effect producer.setPriority(8); m.setJMSPriority(3); - // Queue + // Queue Queue q; - if (i / 2 == 0) + if ((i / 2) == 0) { q = _session.createTemporaryQueue(); } @@ -173,8 +174,8 @@ public class PropertyValueTest extends TestCase implements MessageListener _logger.trace("Message:" + m); - Assert.assertEquals("Check temp queue has been set correctly", - m.getJMSReplyTo().toString(), m.getStringProperty("TempQueue")); + Assert.assertEquals("Check temp queue has been set correctly", m.getJMSReplyTo().toString(), + m.getStringProperty("TempQueue")); m.setJMSType("Test"); m.setLongProperty("UnsignedInt", (long) 4294967295L); @@ -183,18 +184,17 @@ public class PropertyValueTest extends TestCase implements MessageListener m.setShortProperty("Short", (short) Short.MAX_VALUE); m.setStringProperty("String", "Test"); - //AMQP Specific values + // AMQP Specific values // Timestamp long nano = System.nanoTime(); m.setStringProperty("time-str", String.valueOf(nano)); ((AMQMessage) m).setTimestampProperty(new AMQShortString("time"), nano); - //Decimal + // Decimal BigDecimal bd = new BigDecimal(Integer.MAX_VALUE); ((AMQMessage) m).setDecimalProperty(new AMQShortString("decimal"), bd.setScale(Byte.MAX_VALUE)); - bd = new BigDecimal((long) Integer.MAX_VALUE + 1L); try @@ -207,10 +207,10 @@ public class PropertyValueTest extends TestCase implements MessageListener // normal path. } - try { - ((AMQMessage) m).setDecimalProperty(new AMQShortString("decimal-bad-scale"), bd.setScale(Byte.MAX_VALUE + 1)); + ((AMQMessage) m).setDecimalProperty(new AMQShortString("decimal-bad-scale"), + bd.setScale(Byte.MAX_VALUE + 1)); fail("UnsupportedOperationException should be thrown as scale can't be correctly transmitted"); } catch (UnsupportedOperationException uoe) @@ -218,7 +218,7 @@ public class PropertyValueTest extends TestCase implements MessageListener // normal path. } - //Void + // Void ((AMQMessage) m).setVoidProperty(new AMQShortString("void")); _logger.debug("Sending Msg:" + m); @@ -244,58 +244,53 @@ public class PropertyValueTest extends TestCase implements MessageListener { actual.add(m.getText()); - //Check Properties - - Assert.assertEquals("Check Boolean properties are correctly transported", - true, m.getBooleanProperty("Bool")); - Assert.assertEquals("Check Byte properties are correctly transported", - (byte) Byte.MAX_VALUE, m.getByteProperty("Byte")); - Assert.assertEquals("Check Double properties are correctly transported", - (double) Double.MAX_VALUE, m.getDoubleProperty("Double")); - Assert.assertEquals("Check Float properties are correctly transported", - (float) Float.MAX_VALUE, m.getFloatProperty("Float")); - Assert.assertEquals("Check Int properties are correctly transported", - (int) Integer.MAX_VALUE, m.getIntProperty("Int")); - Assert.assertEquals("Check CorrelationID properties are correctly transported", - "Correlation", m.getJMSCorrelationID()); - Assert.assertEquals("Check Priority properties are correctly transported", - 8, m.getJMSPriority()); + // Check Properties + + Assert.assertEquals("Check Boolean properties are correctly transported", true, m.getBooleanProperty("Bool")); + Assert.assertEquals("Check Byte properties are correctly transported", (byte) Byte.MAX_VALUE, + m.getByteProperty("Byte")); + Assert.assertEquals("Check Double properties are correctly transported", (double) Double.MAX_VALUE, + m.getDoubleProperty("Double")); + Assert.assertEquals("Check Float properties are correctly transported", (float) Float.MAX_VALUE, + m.getFloatProperty("Float")); + Assert.assertEquals("Check Int properties are correctly transported", (int) Integer.MAX_VALUE, + m.getIntProperty("Int")); + Assert.assertEquals("Check CorrelationID properties are correctly transported", "Correlation", + m.getJMSCorrelationID()); + Assert.assertEquals("Check Priority properties are correctly transported", 8, m.getJMSPriority()); // Queue - Assert.assertEquals("Check ReplyTo properties are correctly transported", - m.getStringProperty("TempQueue"), m.getJMSReplyTo().toString()); + Assert.assertEquals("Check ReplyTo properties are correctly transported", m.getStringProperty("TempQueue"), + m.getJMSReplyTo().toString()); - Assert.assertEquals("Check Type properties are correctly transported", - "Test", m.getJMSType()); + Assert.assertEquals("Check Type properties are correctly transported", "Test", m.getJMSType()); - Assert.assertEquals("Check Short properties are correctly transported", - (short) Short.MAX_VALUE, m.getShortProperty("Short")); - Assert.assertEquals("Check UnsignedInt properties are correctly transported", - (long) 4294967295L, m.getLongProperty("UnsignedInt")); - Assert.assertEquals("Check Long properties are correctly transported", - (long) Long.MAX_VALUE, m.getLongProperty("Long")); - Assert.assertEquals("Check String properties are correctly transported", - "Test", m.getStringProperty("String")); + Assert.assertEquals("Check Short properties are correctly transported", (short) Short.MAX_VALUE, + m.getShortProperty("Short")); + Assert.assertEquals("Check UnsignedInt properties are correctly transported", (long) 4294967295L, + m.getLongProperty("UnsignedInt")); + Assert.assertEquals("Check Long properties are correctly transported", (long) Long.MAX_VALUE, + m.getLongProperty("Long")); + Assert.assertEquals("Check String properties are correctly transported", "Test", m.getStringProperty("String")); // AMQP Tests Specific values - Assert.assertEquals("Check Timestamp properties are correctly transported", - m.getStringProperty("time-str"), - ((AMQMessage) m).getTimestampProperty(new AMQShortString("time")).toString()); + Assert.assertEquals("Check Timestamp properties are correctly transported", m.getStringProperty("time-str"), + ((AMQMessage) m).getTimestampProperty(new AMQShortString("time")).toString()); - //Decimal + // Decimal BigDecimal bd = new BigDecimal(Integer.MAX_VALUE); - Assert.assertEquals("Check decimal properties are correctly transported", - bd.setScale(Byte.MAX_VALUE), - ((AMQMessage) m).getDecimalProperty(new AMQShortString("decimal"))); + Assert.assertEquals("Check decimal properties are correctly transported", bd.setScale(Byte.MAX_VALUE), + ((AMQMessage) m).getDecimalProperty(new AMQShortString("decimal"))); - //Void + // Void ((AMQMessage) m).setVoidProperty(new AMQShortString("void")); Assert.assertTrue("Check void properties are correctly transported", - ((AMQMessage) m).getPropertyHeaders().containsKey("void")); + ((AMQMessage) m).getPropertyHeaders().containsKey("void")); } + received.clear(); assertEqual(messages.iterator(), actual.iterator()); @@ -325,6 +320,7 @@ public class PropertyValueTest extends TestCase implements MessageListener { errors.add("Found " + actual.next() + " but no more expected values."); } + if (!errors.isEmpty()) { throw new RuntimeException(errors.toString()); @@ -356,12 +352,13 @@ public class PropertyValueTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { PropertyValueTest test = new PropertyValueTest(); - test._connectionString = argv.length == 0 ? "vm://:1" : argv[0]; + test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0]; test.setUp(); if (argv.length > 1) { test._count = Integer.parseInt(argv[1]); } + test.testOnce(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java index cc4bb441a4..40c712c1c9 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java @@ -20,14 +20,8 @@ */ package org.apache.qpid.test.unit.basic; -import javax.jms.DeliveryMode; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; - import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; @@ -35,10 +29,17 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.BasicMessageProducer; import org.apache.qpid.client.transport.TransportConnection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.DeliveryMode; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; + public class SelectorTest extends TestCase implements MessageListener { - - private final static Logger _logger = org.apache.log4j.Logger.getLogger(SelectorTest.class); + private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class); private AMQConnection _connection; private AMQDestination _destination; @@ -70,13 +71,12 @@ public class SelectorTest extends TestCase implements MessageListener _destination = destination; connection.start(); - String selector = null; -// selector = "Cost = 2 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; -// selector = "JMSType = Special AND Cost = 2 AND AMQMessageID > 0 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; + // selector = "Cost = 2 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; + // selector = "JMSType = Special AND Cost = 2 AND AMQMessageID > 0 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT; _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); - //_session.createConsumer(destination).setMessageListener(this); + // _session.createConsumer(destination).setMessageListener(this); _session.createConsumer(destination, selector).setMessageListener(this); } @@ -103,7 +103,7 @@ public class SelectorTest extends TestCase implements MessageListener if (count == 0) { fail("Did not get message!"); - //throw new RuntimeException("Did not get message!"); + // throw new RuntimeException("Did not get message!"); } } finally @@ -128,7 +128,7 @@ public class SelectorTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { SelectorTest test = new SelectorTest(); - test._connectionString = argv.length == 0 ? "localhost:5672" : argv[0]; + test._connectionString = (argv.length == 0) ? "localhost:5672" : argv[0]; test.setUp(); test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java index 8e2d59475a..cc18169a5b 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,23 +20,25 @@ */ package org.apache.qpid.test.unit.basic; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; - import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.testutil.VMBrokerSetup; import org.apache.qpid.framing.AMQShortString; -import org.apache.log4j.Logger; +import org.apache.qpid.testutil.VMBrokerSetup; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; public class SessionStartTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(SessionStartTest.class); + private static final Logger _logger = LoggerFactory.getLogger(SessionStartTest.class); private AMQConnection _connection; private AMQDestination _destination; @@ -57,7 +59,8 @@ public class SessionStartTest extends TestCase implements MessageListener private void init(AMQConnection connection) throws Exception { - init(connection, new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("SessionStartTest")), true)); + init(connection, + new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("SessionStartTest")), true)); } private void init(AMQConnection connection, AMQDestination destination) throws Exception @@ -107,7 +110,7 @@ public class SessionStartTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { SessionStartTest test = new SessionStartTest(); - test._connectionString = argv.length == 0 ? "localhost:5672" : argv[0]; + test._connectionString = (argv.length == 0) ? "localhost:5672" : argv[0]; test.setUp(); test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java index f24355552a..000fb9ab88 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,9 +20,18 @@ */ package org.apache.qpid.test.unit.basic; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.message.JMSTextMessage; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.testutil.VMBrokerSetup; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.Destination; import javax.jms.JMSException; @@ -32,20 +41,13 @@ import javax.jms.MessageNotWriteableException; import javax.jms.MessageProducer; import javax.jms.Session; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.message.JMSTextMessage; -import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.qpid.framing.AMQShortString; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class TextMessageTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(TextMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(TextMessageTest.class); private AMQConnection _connection; private Destination _destination; @@ -75,7 +77,8 @@ public class TextMessageTest extends TestCase implements MessageListener private void init(AMQConnection connection) throws Exception { - Destination destination = new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("TextMessageTest")), true); + Destination destination = + new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("TextMessageTest")), true); init(connection, destination); } @@ -85,7 +88,7 @@ public class TextMessageTest extends TestCase implements MessageListener _destination = destination; _session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //set up a slow consumer + // set up a slow consumer _session.createConsumer(destination).setMessageListener(this); connection.start(); } @@ -102,7 +105,7 @@ public class TextMessageTest extends TestCase implements MessageListener void send(int count) throws JMSException { - //create a publisher + // create a publisher MessageProducer producer = _session.createProducer(_destination); for (int i = 0; i < count; i++) { @@ -118,7 +121,7 @@ public class TextMessageTest extends TestCase implements MessageListener void waitFor(int count) throws InterruptedException { - synchronized(received) + synchronized (received) { while (received.size() < count) { @@ -134,7 +137,7 @@ public class TextMessageTest extends TestCase implements MessageListener { actual.add(m.getText()); - //Check body write status + // Check body write status try { m.setText("Test text"); @@ -142,7 +145,7 @@ public class TextMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearBody(); @@ -156,7 +159,7 @@ public class TextMessageTest extends TestCase implements MessageListener Assert.fail("Message should be writeable"); } - //Check property write status + // Check property write status try { m.setStringProperty("test", "test"); @@ -164,7 +167,7 @@ public class TextMessageTest extends TestCase implements MessageListener } catch (MessageNotWriteableException mnwe) { - //normal execution + // normal execution } m.clearProperties(); @@ -205,6 +208,7 @@ public class TextMessageTest extends TestCase implements MessageListener { errors.add("Found " + actual.next() + " but no more expected values."); } + if (!errors.isEmpty()) { throw new RuntimeException(errors.toString()); @@ -221,7 +225,7 @@ public class TextMessageTest extends TestCase implements MessageListener public void onMessage(Message message) { - synchronized(received) + synchronized (received) { received.add((JMSTextMessage) message); received.notify(); @@ -236,12 +240,13 @@ public class TextMessageTest extends TestCase implements MessageListener public static void main(String[] argv) throws Exception { TextMessageTest test = new TextMessageTest(); - test._connectionString = argv.length == 0 ? "vm://:1" : argv[0]; + test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0]; test.setUp(); if (argv.length > 1) { test._count = Integer.parseInt(argv[1]); } + test.test(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java index 505af361bc..690ba7f01b 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java @@ -14,35 +14,35 @@ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. + * * - * */ package org.apache.qpid.test.unit.basic.close; import junit.framework.TestCase; -import org.apache.qpid.client.transport.TransportConnection; + +import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.AMQException; -import org.apache.qpid.url.URLSyntaxException; +import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.url.AMQBindingURL; -import org.apache.log4j.Logger; +import org.apache.qpid.url.URLSyntaxException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import javax.jms.Session; import javax.jms.JMSException; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; +import javax.jms.Session; public class CloseTests extends TestCase { - - private static final Logger _logger = Logger.getLogger(CloseTests.class); - + private static final Logger _logger = LoggerFactory.getLogger(CloseTests.class); private static final String BROKER = "vm://:1"; - protected void setUp() throws Exception { super.setUp(); @@ -57,12 +57,11 @@ public class CloseTests extends TestCase TransportConnection.killVMBroker(1); } - public void testCloseQueueReceiver() throws AMQException, URLSyntaxException, JMSException { AMQConnection connection = new AMQConnection(BROKER, "guest", "guest", this.getName(), "test"); - Session session = connection.createQueueSession(false,Session.AUTO_ACKNOWLEDGE); + Session session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); AMQQueue queue = new AMQQueue(new AMQBindingURL("test-queue")); MessageConsumer consumer = session.createConsumer(queue); @@ -76,6 +75,6 @@ public class CloseTests extends TestCase consumer.close(); _logger.info("Closed Consumer"); - + } } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java index 4a114321aa..85fcf6d95a 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java @@ -14,30 +14,32 @@ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. + * * - * */ package org.apache.qpid.test.unit.client.channelclose; -import org.apache.log4j.Logger; -import org.apache.qpid.client.state.AMQStateManager; -import org.apache.qpid.client.state.StateAwareMethodListener; -import org.apache.qpid.client.protocol.AMQProtocolSession; -import org.apache.qpid.client.AMQNoConsumersException; -import org.apache.qpid.client.AMQNoRouteException; -import org.apache.qpid.protocol.AMQMethodEvent; -import org.apache.qpid.protocol.AMQConstant; -import org.apache.qpid.AMQException; -import org.apache.qpid.AMQInvalidRoutingKeyException; import org.apache.qpid.AMQChannelClosedException; +import org.apache.qpid.AMQException; import org.apache.qpid.AMQInvalidArgumentException; -import org.apache.qpid.framing.ChannelCloseBody; +import org.apache.qpid.AMQInvalidRoutingKeyException; +import org.apache.qpid.client.AMQNoConsumersException; +import org.apache.qpid.client.AMQNoRouteException; +import org.apache.qpid.client.protocol.AMQProtocolSession; +import org.apache.qpid.client.state.AMQStateManager; +import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.ChannelCloseBody; +import org.apache.qpid.protocol.AMQConstant; +import org.apache.qpid.protocol.AMQMethodEvent; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListener { - private static final Logger _logger = Logger.getLogger(ChannelCloseMethodHandlerNoCloseOk.class); + private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseMethodHandlerNoCloseOk.class); private static ChannelCloseMethodHandlerNoCloseOk _handler = new ChannelCloseMethodHandlerNoCloseOk(); @@ -46,7 +48,8 @@ public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListe return _handler; } - public void methodReceived(AMQStateManager stateManager, AMQProtocolSession protocolSession, AMQMethodEvent evt) throws AMQException + public void methodReceived(AMQStateManager stateManager, AMQProtocolSession protocolSession, AMQMethodEvent evt) + throws AMQException { _logger.debug("ChannelClose method received"); ChannelCloseBody method = (ChannelCloseBody) evt.getMethod(); @@ -59,9 +62,9 @@ public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListe } // For this test Method Handler .. don't send Close-OK -// // TODO: Be aware of possible changes to parameter order as versions change. -// AMQFrame frame = ChannelCloseOkBody.createAMQFrame(evt.getChannelId(), method.getMajor(), method.getMinor()); -// protocolSession.writeFrame(frame); + // // TODO: Be aware of possible changes to parameter order as versions change. + // AMQFrame frame = ChannelCloseOkBody.createAMQFrame(evt.getChannelId(), method.getMajor(), method.getMinor()); + // protocolSession.writeFrame(frame); if (errorCode != AMQConstant.REPLY_SUCCESS) { _logger.error("Channel close received with errorCode " + errorCode + ", and reason " + reason); @@ -91,6 +94,7 @@ public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListe } } + protocolSession.channelClosed(evt.getChannelId(), errorCode, String.valueOf(reason)); } -}
\ No newline at end of file +} diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java index c7f1bb3065..6753ed48e4 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,10 +20,17 @@ */ package org.apache.qpid.test.unit.client.channelclose; -import java.util.ArrayList; -import java.util.List; +import junit.framework.TestCase; + +import junit.textui.TestRunner; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.transport.TransportConnection; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import javax.jms.Connection; import javax.jms.Destination; import javax.jms.ExceptionListener; import javax.jms.JMSException; @@ -33,14 +40,8 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import junit.framework.TestCase; -import junit.textui.TestRunner; - -import org.apache.log4j.Logger; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.transport.TransportConnection; - +import java.util.ArrayList; +import java.util.List; /** * Due to bizarre exception handling all sessions are closed if you get @@ -66,10 +67,9 @@ public class ChannelCloseOkTest extends TestCase private final List<Message> _received1 = new ArrayList<Message>(); private final List<Message> _received2 = new ArrayList<Message>(); - private final static Logger _log = Logger.getLogger(ChannelCloseOkTest.class); + private static final Logger _log = LoggerFactory.getLogger(ChannelCloseOkTest.class); public String _connectionString = "vm://:1"; - protected void setUp() throws Exception { super.setUp(); @@ -77,34 +77,34 @@ public class ChannelCloseOkTest extends TestCase TransportConnection.createVMBroker(1); _connection = new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test"); - _destination1 = new AMQQueue(_connection,"q1", true); + _destination1 = new AMQQueue(_connection, "q1", true); _destination2 = new AMQQueue(_connection, "q2", true); _session1 = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); _session1.createConsumer(_destination1).setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _log.debug("consumer 1 got message [" + getTextMessage(message) + "]"); - synchronized(_received1) + public void onMessage(Message message) { - _received1.add(message); - _received1.notify(); + _log.debug("consumer 1 got message [" + getTextMessage(message) + "]"); + synchronized (_received1) + { + _received1.add(message); + _received1.notify(); + } } - } - }); + }); _session2 = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); _session2.createConsumer(_destination2).setMessageListener(new MessageListener() - { - public void onMessage(Message message) { - _log.debug("consumer 2 got message [" + getTextMessage(message) + "]"); - synchronized(_received2) + public void onMessage(Message message) { - _received2.add(message); - _received2.notify(); + _log.debug("consumer 2 got message [" + getTextMessage(message) + "]"); + synchronized (_received2) + { + _received2.add(message); + _received2.notify(); + } } - } - }); + }); _connection.start(); } @@ -145,12 +145,12 @@ public class ChannelCloseOkTest extends TestCase public void testWithExceptionListener() throws Exception { _connection.setExceptionListener(new ExceptionListener() - { - public void onException(JMSException jmsException) { - _log.warn("onException - "+jmsException.getMessage()); - } - }); + public void onException(JMSException jmsException) + { + _log.warn("onException - " + jmsException.getMessage()); + } + }); doTest(); } @@ -175,6 +175,7 @@ public class ChannelCloseOkTest extends TestCase send(_session1, _destination1, "" + i); send(_session2, _destination2, "" + i); } + waitFor(_received1, num + 1); waitFor(_received2, num + 1); @@ -184,7 +185,7 @@ public class ChannelCloseOkTest extends TestCase } private void sendAndWait(Session session, Destination destination, String message, List<Message> received, int count) - throws JMSException, InterruptedException + throws JMSException, InterruptedException { send(session, destination, message); waitFor(received, count); @@ -199,7 +200,7 @@ public class ChannelCloseOkTest extends TestCase private void waitFor(List<Message> received, int count) throws InterruptedException { - synchronized(received) + synchronized (received) { while (received.size() < count) { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java index 51bbe7d0e6..87984e8c49 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java @@ -14,46 +14,48 @@ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. + * * - * */ package org.apache.qpid.test.unit.client.channelclose; import junit.framework.TestCase; -import javax.jms.Connection; -import javax.jms.Session; - -import javax.jms.JMSException; -import javax.jms.ExceptionListener; -import javax.jms.MessageProducer; -import javax.jms.MessageConsumer; -import javax.jms.Message; -import javax.jms.TextMessage; -import javax.jms.Queue; - -import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.AMQException; +import org.apache.qpid.AMQTimeoutException; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.AMQStateManager; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.framing.AMQFrame; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.ChannelCloseOkBody; import org.apache.qpid.framing.ChannelOpenBody; import org.apache.qpid.framing.ChannelOpenOkBody; -import org.apache.qpid.framing.AMQFrame; import org.apache.qpid.framing.ExchangeDeclareBody; import org.apache.qpid.framing.ExchangeDeclareOkBody; -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.framing.ChannelCloseOkBody; -import org.apache.qpid.AMQException; -import org.apache.qpid.AMQTimeoutException; -import org.apache.qpid.url.URLSyntaxException; -import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.jms.ConnectionListener; -import org.apache.log4j.Logger; +import org.apache.qpid.protocol.AMQConstant; +import org.apache.qpid.url.URLSyntaxException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.Connection; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; public class ChannelCloseTest extends TestCase implements ExceptionListener, ConnectionListener { - private static final Logger _logger = Logger.getLogger(ChannelCloseTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseTest.class); Connection _connection; private String _brokerlist = "vm://:1"; @@ -73,15 +75,14 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con TransportConnection.killAllVMBrokers(); } - /* close channel, use chanel with same id ensure error. - */ - public void testReusingChannelAfterFullClosure() + */ + public void testReusingChannelAfterFullClosure() throws Exception { _connection = newConnection(); - //Create Producer + // Create Producer try { _connection.start(); @@ -113,6 +114,7 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con { _logger.info("Exception occured was:" + e.getErrorCode()); } + assertEquals("Connection should be closed", AMQConstant.CHANNEL_ERROR, e.getErrorCode()); _connection = newConnection(); @@ -134,29 +136,27 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con /* close channel and send guff then send ok no errors */ - public void testSendingMethodsAfterClose() + public void testSendingMethodsAfterClose() throws Exception { try { - _connection = new AMQConnection("amqp://guest:guest@CCTTest/test?brokerlist='" - + _brokerlist + "'"); + _connection = new AMQConnection("amqp://guest:guest@CCTTest/test?brokerlist='" + _brokerlist + "'"); ((AMQConnection) _connection).setConnectionListener(this); - _connection.setExceptionListener(this); - //Change the StateManager for one that doesn't respond with Close-OKs + // Change the StateManager for one that doesn't respond with Close-OKs AMQStateManager oldStateManager = ((AMQConnection) _connection).getProtocolHandler().getStateManager(); _session = _connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); _connection.start(); - //Test connection + // Test connection checkSendingMessage(); - //Set StateManager to manager that ignores Close-oks + // Set StateManager to manager that ignores Close-oks AMQProtocolSession protocolSession = ((AMQConnection) _connection).getProtocolHandler().getProtocolSession(); AMQStateManager newStateManager = new NoCloseOKStateManager(protocolSession); newStateManager.changeState(oldStateManager.getCurrentState()); @@ -214,7 +214,7 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con createChannelAndTest(TEST_CHANNEL); - //Test connection is still ok + // Test connection is still ok checkSendingMessage(); @@ -248,9 +248,9 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con } } - private void createChannelAndTest(int channel) + private void createChannelAndTest(int channel) throws FailoverException { - //Create A channel + // Create A channel try { createChannel(channel); @@ -274,14 +274,14 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con private void sendClose(int channel) { - AMQFrame frame = ChannelCloseOkBody.createAMQFrame(channel, - ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), - ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion()); + AMQFrame frame = + ChannelCloseOkBody.createAMQFrame(channel, + ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), + ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion()); ((AMQConnection) _connection).getProtocolHandler().writeFrame(frame); } - private void checkSendingMessage() throws JMSException { TEST++; @@ -307,8 +307,7 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con AMQConnection connection = null; try { - connection = new AMQConnection("amqp://guest:guest@CCTTest/test?brokerlist='" - + _brokerlist + "'"); + connection = new AMQConnection("amqp://guest:guest@CCTTest/test?brokerlist='" + _brokerlist + "'"); connection.setConnectionListener(this); @@ -330,24 +329,24 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con fail("Creating new connection when:" + e.getMessage()); } - return connection; } - private void declareExchange(int channelId, String _type, String _name, boolean nowait) throws AMQException + private void declareExchange(int channelId, String _type, String _name, boolean nowait) + throws AMQException, FailoverException { - AMQFrame exchangeDeclare = ExchangeDeclareBody.createAMQFrame(channelId, - ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), - ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion(), - null, // arguments - false, // autoDelete - false, // durable - new AMQShortString(_name), // exchange - false, // internal - nowait, // nowait - true, // passive - 0, // ticket - new AMQShortString(_type)); // type + AMQFrame exchangeDeclare = + ExchangeDeclareBody.createAMQFrame(channelId, + ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), + ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion(), null, // arguments + false, // autoDelete + false, // durable + new AMQShortString(_name), // exchange + false, // internal + nowait, // nowait + true, // passive + 0, // ticket + new AMQShortString(_type)); // type if (nowait) { @@ -355,36 +354,31 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con } else { - ((AMQConnection) _connection).getProtocolHandler().syncWrite(exchangeDeclare, ExchangeDeclareOkBody.class, SYNC_TIMEOUT); + ((AMQConnection) _connection).getProtocolHandler().syncWrite(exchangeDeclare, ExchangeDeclareOkBody.class, + SYNC_TIMEOUT); } } - private void createChannel(int channelId) throws AMQException + private void createChannel(int channelId) throws AMQException, FailoverException { - ((AMQConnection) _connection).getProtocolHandler().syncWrite( - ChannelOpenBody.createAMQFrame(channelId, - ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), - ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion(), - null), // outOfBand - ChannelOpenOkBody.class); + ((AMQConnection) _connection).getProtocolHandler().syncWrite(ChannelOpenBody.createAMQFrame(channelId, + ((AMQConnection) _connection).getProtocolHandler().getProtocolMajorVersion(), + ((AMQConnection) _connection).getProtocolHandler().getProtocolMinorVersion(), null), // outOfBand + ChannelOpenOkBody.class); } - public void onException(JMSException jmsException) { - //_logger.info("CCT" + jmsException); + // _logger.info("CCT" + jmsException); fail(jmsException.getMessage()); } public void bytesSent(long count) - { - } + { } public void bytesReceived(long count) - { - - } + { } public boolean preFailover(boolean redirect) { @@ -397,6 +391,5 @@ public class ChannelCloseTest extends TestCase implements ExceptionListener, Con } public void failoverComplete() - { - } + { } } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java index e077bddd8d..19ef612bcc 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,14 +20,16 @@ */ package org.apache.qpid.test.unit.client.forwardall; -import javax.jms.Message; -import javax.jms.MessageListener; - import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.AMQShortString; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.Message; +import javax.jms.MessageListener; /** * Declare a private temporary response queue, @@ -37,8 +39,7 @@ import org.apache.log4j.Logger; */ public class Client implements MessageListener { - - private static final Logger _logger = Logger.getLogger(Client.class); + private static final Logger _logger = LoggerFactory.getLogger(Client.class); private final AMQConnection _connection; private final AMQSession _session; @@ -55,10 +56,11 @@ public class Client implements MessageListener _connection = connection; _expected = expected; _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); - AMQQueue response = new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("ResponseQueue"), true); + AMQQueue response = + new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("ResponseQueue"), true); _session.createConsumer(response).setMessageListener(this); _connection.start(); - AMQQueue service = new SpecialQueue(_connection,"ServiceQueue"); + AMQQueue service = new SpecialQueue(_connection, "ServiceQueue"); Message request = _session.createTextMessage("Request!"); request.setJMSReplyTo(response); _session.createProducer(service).send(request); @@ -72,27 +74,27 @@ public class Client implements MessageListener public synchronized void onMessage(Message response) { - - _logger.info("Received " + (++_count) + " of " + _expected + " responses."); - if(_count == _expected) + + _logger.info("Received " + (++_count) + " of " + _expected + " responses."); + if (_count == _expected) { notifyAll(); } - } synchronized void waitUntilComplete() throws Exception { - if(_count < _expected) + if (_count < _expected) { wait(10000L); } - if(_count < _expected) + + if (_count < _expected) { - throw new Exception("Didn't receive all messages... got " + _count + " expected " + _expected); + throw new Exception("Didn't receive all messages... got " + _count + " expected " + _expected); } } @@ -105,7 +107,8 @@ public class Client implements MessageListener { final String connectionString; final int expected; - if (argv.length == 0) { + if (argv.length == 0) + { connectionString = "localhost:5672"; expected = 100; } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java index 69c5fc3aa9..9c354ee260 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +23,9 @@ package org.apache.qpid.test.unit.client.forwardall; import junit.framework.TestCase; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Runs the Service's and Client parts of the test in the same process @@ -31,7 +33,7 @@ import org.apache.log4j.Logger; */ public class CombinedTest extends TestCase { - private static final Logger _logger = Logger.getLogger(CombinedTest.class); + private static final Logger _logger = LoggerFactory.getLogger(CombinedTest.class); protected void setUp() throws Exception { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java index 8482227961..be16f6b7ae 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,14 +20,14 @@ */ package org.apache.qpid.test.unit.client.forwardall; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jms.JMSException; public class ServiceCreator implements Runnable { - private static final Logger _logger = Logger.getLogger(ServiceCreator.class); - + private static final Logger _logger = LoggerFactory.getLogger(ServiceCreator.class); private static Thread[] threads; private static ServiceCreator[] _services; @@ -67,7 +67,7 @@ public class ServiceCreator implements Runnable } catch (JMSException e) { - //ignore + // ignore } } } @@ -77,7 +77,7 @@ public class ServiceCreator implements Runnable threads = new Thread[services]; _services = new ServiceCreator[services]; ServiceCreator runner = new ServiceCreator(broker); - //start services + // start services _logger.info("Starting " + services + " services..."); for (int i = 0; i < services; i++) { @@ -106,6 +106,7 @@ public class ServiceCreator implements Runnable connectionString = argv[0]; services = Integer.parseInt(argv[1]); } + start(connectionString, services); } } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index 11a6b4b5c5..cd03b523d1 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,17 +20,6 @@ */ package org.apache.qpid.test.unit.client.message; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; - import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; @@ -38,11 +27,24 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; public class ObjectMessageTest extends TestCase implements MessageListener { - private static final Logger _logger = Logger.getLogger(ObjectMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); private AMQConnection connection; private AMQDestination destination; @@ -59,15 +61,15 @@ public class ObjectMessageTest extends TestCase implements MessageListener { super.setUp(); connection = new AMQConnection(_broker, "guest", "guest", randomize("Client"), "test"); - destination = new AMQQueue(connection,randomize("LatencyTest"), true); + destination = new AMQQueue(connection, randomize("LatencyTest"), true); session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); - //set up a consumer + // set up a consumer session.createConsumer(destination).setMessageListener(this); connection.start(); - //create a publisher - producer = session.createProducer(destination, false, false, true); + // create a publisher + producer = session.createProducer(destination, false, false, true); A a1 = new A(1, "A"); A a2 = new A(2, "a"); B b = new B(1, "B"); @@ -77,7 +79,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener c.put("B", b); c.put("String", "String"); - data = new Serializable[]{a1, a2, b, c, "Hello World!", new Integer(1001)}; + data = new Serializable[] { a1, a2, b, c, "Hello World!", new Integer(1001) }; } protected void tearDown() throws Exception @@ -86,8 +88,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener } public ObjectMessageTest() - { - } + { } ObjectMessageTest(String broker) throws Exception { @@ -118,60 +119,60 @@ public class ObjectMessageTest extends TestCase implements MessageListener { String testStringProperty = "TestStringProperty"; ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestStringProperty",testStringProperty); + msg.setObjectProperty("TestStringProperty", testStringProperty); assertEquals(testStringProperty, msg.getObjectProperty("TestStringProperty")); } public void testSetObjectPropertyForBoolean() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestBooleanProperty",Boolean.TRUE); + msg.setObjectProperty("TestBooleanProperty", Boolean.TRUE); assertEquals(Boolean.TRUE, msg.getObjectProperty("TestBooleanProperty")); } public void testSetObjectPropertyForByte() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestByteProperty",Byte.MAX_VALUE); + msg.setObjectProperty("TestByteProperty", Byte.MAX_VALUE); assertEquals(Byte.MAX_VALUE, msg.getObjectProperty("TestByteProperty")); } public void testSetObjectPropertyForShort() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestShortProperty",Short.MAX_VALUE); + msg.setObjectProperty("TestShortProperty", Short.MAX_VALUE); assertEquals(Short.MAX_VALUE, msg.getObjectProperty("TestShortProperty")); } + public void testSetObjectPropertyForInteger() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestIntegerProperty",Integer.MAX_VALUE); + msg.setObjectProperty("TestIntegerProperty", Integer.MAX_VALUE); assertEquals(Integer.MAX_VALUE, msg.getObjectProperty("TestIntegerProperty")); } public void testSetObjectPropertyForDouble() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestDoubleProperty",Double.MAX_VALUE); + msg.setObjectProperty("TestDoubleProperty", Double.MAX_VALUE); assertEquals(Double.MAX_VALUE, msg.getObjectProperty("TestDoubleProperty")); } public void testSetObjectPropertyForFloat() throws Exception { ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestFloatProperty",Float.MAX_VALUE); + msg.setObjectProperty("TestFloatProperty", Float.MAX_VALUE); assertEquals(Float.MAX_VALUE, msg.getObjectProperty("TestFloatProperty")); } public void testSetObjectPropertyForByteArray() throws Exception { - byte[] array = {1,2,3,4,5}; + byte[] array = { 1, 2, 3, 4, 5 }; ObjectMessage msg = session.createObjectMessage(data[0]); - msg.setObjectProperty("TestByteArrayProperty",array); - assertTrue(Arrays.equals(array,(byte[])msg.getObjectProperty("TestByteArrayProperty"))); + msg.setObjectProperty("TestByteArrayProperty", array); + assertTrue(Arrays.equals(array, (byte[]) msg.getObjectProperty("TestByteArrayProperty"))); } - public void testSetObjectForNull() throws Exception { ObjectMessage msg = session.createObjectMessage(); @@ -179,13 +180,12 @@ public class ObjectMessageTest extends TestCase implements MessageListener assertNull(msg.getObject()); } - private void send() throws Exception { for (int i = 0; i < data.length; i++) { ObjectMessage msg; - if (i % 2 == 0) + if ((i % 2) == 0) { msg = session.createObjectMessage(data[i]); } @@ -194,6 +194,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener msg = session.createObjectMessage(); msg.setObject(data[i]); } + producer.send(msg); } } @@ -205,16 +206,19 @@ public class ObjectMessageTest extends TestCase implements MessageListener { throw new Exception("Expected " + data.length + " objects, got " + actual.length); } + for (int i = 0; i < data.length; i++) { if (actual[i] instanceof Exception) { throw new Exception("Error on receive of " + data[i], ((Exception) actual[i])); } + if (actual[i] == null) { throw new Exception("Expected " + data[i] + " got null"); } + if (!data[i].equals(actual[i])) { throw new Exception("Expected " + data[i] + " got " + actual[i]); @@ -222,7 +226,6 @@ public class ObjectMessageTest extends TestCase implements MessageListener } } - private void close() throws Exception { session.close(); @@ -236,6 +239,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener { wait(); } + waiting = false; } @@ -260,21 +264,21 @@ public class ObjectMessageTest extends TestCase implements MessageListener items.add(e); } - synchronized(this) - { - received++; - notify(); - } + synchronized (this) + { + received++; + notify(); + } } - public static void main(String[] argv) throws Exception { - String broker = argv.length > 0 ? argv[0] : "vm://:1"; + String broker = (argv.length > 0) ? argv[0] : "vm://:1"; if ("-help".equals(broker)) { System.out.println("Usage: <broker>"); } + new ObjectMessageTest(broker).testSendAndReceive(); } @@ -296,12 +300,12 @@ public class ObjectMessageTest extends TestCase implements MessageListener public boolean equals(Object o) { - return o instanceof A && equals((A) o); + return (o instanceof A) && equals((A) o); } protected boolean equals(A a) { - return areEqual(a.sValue, sValue) && a.iValue == iValue; + return areEqual(a.sValue, sValue) && (a.iValue == iValue); } } @@ -317,17 +321,16 @@ public class ObjectMessageTest extends TestCase implements MessageListener protected boolean equals(A a) { - return super.equals(a) && a instanceof B && time == ((B) a).time; + return super.equals(a) && (a instanceof B) && (time == ((B) a).time); } } private static class C extends HashMap implements Serializable - { - } + { } private static boolean areEqual(Object a, Object b) { - return a == null ? b == null : a.equals(b); + return (a == null) ? (b == null) : a.equals(b); } private static String randomize(String in) diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java index 117696196e..5a61480f6a 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java @@ -20,22 +20,23 @@ */
package org.apache.qpid.test.unit.close;
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.transport.TransportConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import uk.co.thebadgerset.junit.concurrency.TestRunnable;
import uk.co.thebadgerset.junit.concurrency.ThreadTestCoordinator;
+import javax.jms.Connection;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Session;
+
/**
* This test forces the situation where a session is closed whilst a message consumer is still in its onMessage method.
* Running in AUTO_ACK mode, the close call ought to wait until the onMessage method completes, and the ack is sent
@@ -46,7 +47,7 @@ import uk.co.thebadgerset.junit.concurrency.ThreadTestCoordinator; */
public class CloseBeforeAckTest extends TestCase
{
- private static final Logger log = Logger.getLogger(CloseBeforeAckTest.class);
+ private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class);
Connection connection;
Session session;
@@ -64,34 +65,34 @@ public class CloseBeforeAckTest extends TestCase public void onMessage(Message message)
{
// Give thread 2 permission to close the session.
- allow(new int[]{1});
+ allow(new int[] { 1 });
// Wait until thread 2 has closed the connection, or is blocked waiting for this to complete.
- waitFor(new int[]{1}, true);
+ waitFor(new int[] { 1 }, true);
}
}
TestThread1 testThread1 = new TestThread1();
TestRunnable testThread2 =
- new TestRunnable()
+ new TestRunnable()
+ {
+ public void runWithExceptions() throws Exception
{
- public void runWithExceptions() throws Exception
- {
- // Send a message to be picked up by thread 1.
- session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),
- session.createTextMessage("Hi there thread 1!"));
-
- // Wait for thread 1 to pick up the message and give permission to continue.
- waitFor(new int[]{0}, false);
-
- // Close the connection.
- session.close();
-
- // Allow thread 1 to continue to completion, if it is erronously still waiting.
- allow(new int[]{1});
- }
- };
+ // Send a message to be picked up by thread 1.
+ session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),
+ session.createTextMessage("Hi there thread 1!"));
+
+ // Wait for thread 1 to pick up the message and give permission to continue.
+ waitFor(new int[] { 0 }, false);
+
+ // Close the connection.
+ session.close();
+
+ // Allow thread 1 to continue to completion, if it is erronously still waiting.
+ allow(new int[] { 1 });
+ }
+ };
public void testCloseBeforeAutoAck_QPID_397() throws Exception
{
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java index d52707d965..a297011acd 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java @@ -22,34 +22,28 @@ package org.apache.qpid.test.unit.close; import junit.framework.TestCase; -import java.util.concurrent.atomic.AtomicInteger; +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.message.AbstractJMSMessage; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidClientConnection; +import org.apache.qpid.url.URLSyntaxException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import javax.jms.ExceptionListener; -import javax.jms.Session; import javax.jms.Connection; import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.MessageProducer; import javax.jms.Message; -import javax.jms.TextMessage; import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.Session; -import org.apache.qpid.client.AMQConnectionFactory; -import org.apache.qpid.client.AMQConnectionURL; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.message.AbstractJMSMessage; -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.url.URLSyntaxException; -import org.apache.qpid.AMQException; -import org.apache.qpid.testutil.QpidClientConnection; -import org.apache.log4j.Logger; -import org.apache.log4j.Level; +import java.util.concurrent.atomic.AtomicInteger; public class MessageRequeueTest extends TestCase { - - private static final Logger _logger = Logger.getLogger(MessageRequeueTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageRequeueTest.class); protected static AtomicInteger consumerIds = new AtomicInteger(0); protected final Integer numTestMessages = 150; @@ -86,7 +80,7 @@ public class MessageRequeueTest extends TestCase { super.tearDown(); - if (!passed) // clean up + if (!passed) // clean up { QpidClientConnection conn = new QpidClientConnection(BROKER); @@ -96,6 +90,7 @@ public class MessageRequeueTest extends TestCase conn.disconnect(); } + TransportConnection.killVMBroker(1); } @@ -117,7 +112,7 @@ public class MessageRequeueTest extends TestCase final MessageConsumer consumer = conn.getSession().createConsumer(q); int messagesReceived = 0; - long messageLog[] = new long[numTestMessages + 1]; + long[] messageLog = new long[numTestMessages + 1]; _logger.info("consuming..."); Message msg = consumer.receive(1000); @@ -130,15 +125,13 @@ public class MessageRequeueTest extends TestCase int msgindex = msg.getIntProperty("index"); if (messageLog[msgindex] != 0) { - _logger.error("Received Message(" + msgindex + ":" + ((AbstractJMSMessage) msg).getDeliveryTag() + - ") more than once."); + _logger.error("Received Message(" + msgindex + ":" + ((AbstractJMSMessage) msg).getDeliveryTag() + + ") more than once."); } if (_logger.isInfoEnabled()) { - _logger.info("Received Message(" + System.identityHashCode(msgindex) + ") " + - "DT:" + dt + - "IN:" + msgindex); + _logger.info("Received Message(" + System.identityHashCode(msgindex) + ") " + "DT:" + dt + "IN:" + msgindex); } if (dt == 0) @@ -148,7 +141,7 @@ public class MessageRequeueTest extends TestCase messageLog[msgindex] = dt; - //get Next message + // get Next message msg = consumer.receive(1000); } @@ -163,7 +156,7 @@ public class MessageRequeueTest extends TestCase for (long b : messageLog) { - if (b == 0 && index != 0) //delivery tag of zero shouldn't exist + if ((b == 0) && (index != 0)) // delivery tag of zero shouldn't exist { _logger.error("Index: " + index + " was not received."); list.append(" "); @@ -175,6 +168,7 @@ public class MessageRequeueTest extends TestCase index++; } + assertEquals(list.toString(), 0, failed); _logger.info("consumed: " + messagesReceived); conn.disconnect(); @@ -199,7 +193,7 @@ public class MessageRequeueTest extends TestCase t1.start(); t2.start(); t3.start(); -// t4.start(); + // t4.start(); try { @@ -228,7 +222,7 @@ public class MessageRequeueTest extends TestCase for (long b : receieved) { - if (b == 0 && index != 0) //delivery tag of zero shouldn't exist (and we don't have msg 0) + if ((b == 0) && (index != 0)) // delivery tag of zero shouldn't exist (and we don't have msg 0) { _logger.error("Index: " + index + " was not received."); list.append(" "); @@ -237,8 +231,10 @@ public class MessageRequeueTest extends TestCase list.append(b); failed++; } + index++; } + assertEquals(list.toString() + "-" + numTestMessages + "-" + totalConsumed, 0, failed); assertEquals("number of consumed messages does not match initial data", numTestMessages, totalConsumed); passed = true; @@ -278,15 +274,14 @@ public class MessageRequeueTest extends TestCase int msgindex = result.getIntProperty("index"); if (receieved[msgindex] != 0) { - _logger.error("Received Message(" + msgindex + ":" + ((AbstractJMSMessage) result).getDeliveryTag() + - ") more than once."); + _logger.error("Received Message(" + msgindex + ":" + + ((AbstractJMSMessage) result).getDeliveryTag() + ") more than once."); } if (_logger.isInfoEnabled()) { - _logger.info("Received Message(" + System.identityHashCode(msgindex) + ") " + - "DT:" + dt + - "IN:" + msgindex); + _logger.info("Received Message(" + System.identityHashCode(msgindex) + ") " + "DT:" + dt + + "IN:" + msgindex); } if (dt == 0) @@ -297,9 +292,8 @@ public class MessageRequeueTest extends TestCase receieved[msgindex] = dt; } - count++; - if (count % 100 == 0) + if ((count % 100) == 0) { _logger.info("consumer-" + id + ": got " + result + ", new count is " + count); } @@ -328,11 +322,10 @@ public class MessageRequeueTest extends TestCase } } - public void testRequeue() throws JMSException, AMQException, URLSyntaxException { int run = 0; -// while (run < 10) + // while (run < 10) { run++; @@ -359,7 +352,6 @@ public class MessageRequeueTest extends TestCase assertNotNull("Message should not be null", msg); - // As we have not ack'd message will be requeued. _logger.debug("Close Consumer"); consumer.close(); @@ -369,4 +361,4 @@ public class MessageRequeueTest extends TestCase } } -}
\ No newline at end of file +} diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java index a2cd2e4da3..66e0cad1a9 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java @@ -1,28 +1,29 @@ package org.apache.qpid.test.unit.message;
-import javax.jms.Connection;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.framing.AMQShortString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
/**
* @author Apache Software Foundation
*/
public class JMSDestinationTest extends TestCase
{
-
- private static final Logger _logger = Logger.getLogger(JMSDestinationTest.class);
+ private static final Logger _logger = LoggerFactory.getLogger(JMSDestinationTest.class);
public String _connectionString = "vm://:1";
@@ -32,7 +33,6 @@ public class JMSDestinationTest extends TestCase TransportConnection.createVMBroker(1);
}
-
protected void tearDown() throws Exception
{
super.tearDown();
@@ -43,7 +43,9 @@ public class JMSDestinationTest extends TestCase {
AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- Queue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
+ Queue queue =
+ new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,
+ true);
MessageConsumer consumer = consumerSession.createConsumer(queue);
Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
@@ -64,7 +66,7 @@ public class JMSDestinationTest extends TestCase TextMessage rm = (TextMessage) consumer.receive();
assertNotNull(rm);
- assertEquals(rm.getJMSDestination(),queue);
+ assertEquals(rm.getJMSDestination(), queue);
con.close();
}
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java index dad1666299..3012909daa 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,17 +20,8 @@ */ package org.apache.qpid.test.unit.message; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.Session; - import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; @@ -38,13 +29,23 @@ import org.apache.qpid.client.message.NonQpidObjectMessage; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.AMQShortString; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.Destination; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.Session; + /** * @author Apache Software Foundation */ public class JMSPropertiesTest extends TestCase { - private static final Logger _logger = Logger.getLogger(JMSPropertiesTest.class); + private static final Logger _logger = LoggerFactory.getLogger(JMSPropertiesTest.class); public String _connectionString = "vm://:1"; @@ -52,14 +53,12 @@ public class JMSPropertiesTest extends TestCase public static final int JMS_DELIV_MODE = 1; public static final String JMS_TYPE = "test.jms.type"; - protected void setUp() throws Exception { super.setUp(); TransportConnection.createVMBroker(1); } - protected void tearDown() throws Exception { super.tearDown(); @@ -70,36 +69,38 @@ public class JMSPropertiesTest extends TestCase { AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE); - Queue queue = new AMQQueue(con.getDefaultQueueExchangeName(),new AMQShortString("someQ"), new AMQShortString("someQ"), false, true); + Queue queue = + new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false, + true); MessageConsumer consumer = consumerSession.createConsumer(queue); AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageProducer producer = producerSession.createProducer(queue); - Destination JMS_REPLY_TO = new AMQQueue(con2,"my.replyto"); - //create a test message to send + Destination JMS_REPLY_TO = new AMQQueue(con2, "my.replyto"); + // create a test message to send ObjectMessage sentMsg = new NonQpidObjectMessage(); sentMsg.setJMSCorrelationID(JMS_CORR_ID); sentMsg.setJMSDeliveryMode(JMS_DELIV_MODE); sentMsg.setJMSType(JMS_TYPE); sentMsg.setJMSReplyTo(JMS_REPLY_TO); - //send it + // send it producer.send(sentMsg); con2.close(); con.start(); - //get message and check JMS properties + // get message and check JMS properties ObjectMessage rm = (ObjectMessage) consumer.receive(); assertNotNull(rm); - assertEquals("JMS Correlation ID mismatch",sentMsg.getJMSCorrelationID(),rm.getJMSCorrelationID()); - //TODO: Commented out as always overwritten by send delivery mode value - prob should not set in conversion - //assertEquals("JMS Delivery Mode mismatch",sentMsg.getJMSDeliveryMode(),rm.getJMSDeliveryMode()); - assertEquals("JMS Type mismatch",sentMsg.getJMSType(),rm.getJMSType()); - assertEquals("JMS Reply To mismatch",sentMsg.getJMSReplyTo(),rm.getJMSReplyTo()); + assertEquals("JMS Correlation ID mismatch", sentMsg.getJMSCorrelationID(), rm.getJMSCorrelationID()); + // TODO: Commented out as always overwritten by send delivery mode value - prob should not set in conversion + // assertEquals("JMS Delivery Mode mismatch",sentMsg.getJMSDeliveryMode(),rm.getJMSDeliveryMode()); + assertEquals("JMS Type mismatch", sentMsg.getJMSType(), rm.getJMSType()); + assertEquals("JMS Reply To mismatch", sentMsg.getJMSReplyTo(), rm.getJMSReplyTo()); con.close(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java index fb5ea58174..9c4f2af107 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java @@ -20,37 +20,39 @@ */ package org.apache.qpid.test.unit.message; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageEOFException; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.StreamMessage; - import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQHeadersExchange; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.FieldTable; import org.apache.qpid.url.AMQBindingURL; import org.apache.qpid.url.BindingURL; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.Connection; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageEOFException; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.StreamMessage; + /** * @author Apache Software Foundation */ public class StreamMessageTest extends TestCase { - private static final Logger _logger = Logger.getLogger(StreamMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(StreamMessageTest.class); public String _connectionString = "vm://:1"; @@ -60,7 +62,6 @@ public class StreamMessageTest extends TestCase TransportConnection.createVMBroker(1); } - protected void tearDown() throws Exception { super.tearDown(); @@ -72,15 +73,18 @@ public class StreamMessageTest extends TestCase Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE); - - AMQHeadersExchange queue = new AMQHeadersExchange(new AMQBindingURL(ExchangeDefaults.HEADERS_EXCHANGE_CLASS+"://"+ExchangeDefaults.HEADERS_EXCHANGE_NAME+"/test/queue1?"+ BindingURL.OPTION_ROUTING_KEY+"='F0000=1'")); + AMQHeadersExchange queue = + new AMQHeadersExchange(new AMQBindingURL( + ExchangeDefaults.HEADERS_EXCHANGE_CLASS + "://" + ExchangeDefaults.HEADERS_EXCHANGE_NAME + + "/test/queue1?" + BindingURL.OPTION_ROUTING_KEY + "='F0000=1'")); FieldTable ft = new FieldTable(); - ft.setString("F1000","1"); - MessageConsumer consumer = consumerSession.createConsumer(queue, AMQSession.DEFAULT_PREFETCH_LOW_MARK, AMQSession.DEFAULT_PREFETCH_HIGH_MARK, false, false, (String)null, ft); + ft.setString("F1000", "1"); + MessageConsumer consumer = + consumerSession.createConsumer(queue, AMQSession.DEFAULT_PREFETCH_LOW_MARK, + AMQSession.DEFAULT_PREFETCH_HIGH_MARK, false, false, (String) null, ft); - - //force synch to ensure the consumer has resulted in a bound queue - //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS); + // force synch to ensure the consumer has resulted in a bound queue + // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS); // This is the default now Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); @@ -91,21 +95,18 @@ public class StreamMessageTest extends TestCase _logger.info("Starting producer connection"); con2.start(); - MessageProducer mandatoryProducer = producerSession.createProducer(queue); // Third test - should be routed _logger.info("Sending isBound message"); - StreamMessage msg = producerSession.createStreamMessage(); + StreamMessage msg = producerSession.createStreamMessage(); - msg.setStringProperty("F1000","1"); + msg.setStringProperty("F1000", "1"); - msg.writeByte((byte)42); + msg.writeByte((byte) 42); mandatoryProducer.send(msg); - - _logger.info("Starting consumer connection"); con.start(); @@ -129,23 +130,24 @@ public class StreamMessageTest extends TestCase AMQQueue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("testQ")); MessageConsumer consumer = consumerSession.createConsumer(queue); consumer.setMessageListener(new MessageListener() - { - - public void onMessage(Message message) { - StreamMessage sm = (StreamMessage) message; - try - { - sm.clearBody(); - sm.writeString("dfgjshfslfjshflsjfdlsjfhdsljkfhdsljkfhsd"); - } - catch (JMSException e) + + public void onMessage(Message message) { - _logger.error("Error when writing large string to received msg: " + e, e); - fail("Error when writing large string to received msg" + e); + StreamMessage sm = (StreamMessage) message; + try + { + sm.clearBody(); + sm.writeString("dfgjshfslfjshflsjfdlsjfhdsljkfhdsljkfhsd"); + } + catch (JMSException e) + { + _logger.error("Error when writing large string to received msg: " + e, e); + fail("Error when writing large string to received msg" + e); + } } - } - }); + }); + Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageProducer mandatoryProducer = producerSession.createProducer(queue); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index 15cb9678e4..c8d43a47a5 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,14 +20,6 @@ */ package org.apache.qpid.test.unit.topic; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.TopicSubscriber; - import junit.framework.TestCase; import org.apache.qpid.AMQException; @@ -36,11 +28,21 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.url.URLSyntaxException; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.TopicSubscriber; public class DurableSubscriptionTest extends TestCase { - private static final Logger _logger = Logger.getLogger(DurableSubscriptionTest.class); + private static final Logger _logger = LoggerFactory.getLogger(DurableSubscriptionTest.class); protected void setUp() throws Exception { @@ -84,7 +86,6 @@ public class DurableSubscriptionTest extends TestCase msg = consumer1.receive(1000); assertEquals(null, msg); - _logger.info("Receive message on consumer 1:expecting A"); msg = consumer2.receive(); assertEquals("A", ((TextMessage) msg).getText()); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 0e718da19b..df2a38d0fc 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -21,18 +21,21 @@ package org.apache.qpid.test.unit.transacted; import junit.framework.TestCase; + +import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.AMQException; import org.apache.qpid.url.URLSyntaxException; -import org.apache.log4j.Logger; -import javax.jms.Session; -import javax.jms.MessageProducer; -import javax.jms.MessageConsumer; -import javax.jms.Queue; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.jms.JMSException; import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import javax.jms.TextMessage; /** @@ -52,7 +55,7 @@ public class CommitRollbackTest extends TestCase private MessageConsumer _consumer; Queue _jmsQueue; - private static final Logger _logger = Logger.getLogger(CommitRollbackTest.class); + private static final Logger _logger = LoggerFactory.getLogger(CommitRollbackTest.class); private static final String BROKER = "vm://:1"; protected void setUp() throws Exception @@ -62,10 +65,10 @@ public class CommitRollbackTest extends TestCase { TransportConnection.createVMBroker(1); } + testMethod++; queue += testMethod; - newConnection(); } @@ -106,7 +109,6 @@ public class CommitRollbackTest extends TestCase assertTrue("session is not transacted", _session.getTransacted()); assertTrue("session is not transacted", _pubSession.getTransacted()); - _logger.info("sending test message"); String MESSAGE_TEXT = "testPutThenDisconnect"; _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); @@ -119,7 +121,7 @@ public class CommitRollbackTest extends TestCase _logger.info("receiving result"); Message result = _consumer.receive(1000); - //commit to ensure message is removed from queue + // commit to ensure message is removed from queue _session.commit(); assertNull("test message was put and disconnected before commit, but is still present", result); @@ -135,7 +137,6 @@ public class CommitRollbackTest extends TestCase assertTrue("session is not transacted", _session.getTransacted()); assertTrue("session is not transacted", _pubSession.getTransacted()); - _logger.info("sending test message"); String MESSAGE_TEXT = "testPutThenDisconnect"; _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); @@ -151,7 +152,7 @@ public class CommitRollbackTest extends TestCase _logger.info("receiving result"); Message result = _consumer.receive(1000); - //commit to ensure message is removed from queue + // commit to ensure message is removed from queue _session.commit(); assertNull("test message was put and disconnected before commit, but is still present", result); @@ -168,7 +169,6 @@ public class CommitRollbackTest extends TestCase assertTrue("session is not transacted", _session.getTransacted()); assertTrue("session is not transacted", _pubSession.getTransacted()); - _logger.info("sending test message"); String MESSAGE_TEXT = "testPutThenRollback"; _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); @@ -335,13 +335,12 @@ public class CommitRollbackTest extends TestCase assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered()); } - /** * Test that rolling back a session purges the dispatcher queue, and the messages arrive in the correct order * * @throws Exception On error */ - public void testSend2ThenRollback() throws Exception + /*public void testSend2ThenRollback() throws Exception { assertTrue("session is not transacted", _session.getTransacted()); assertTrue("session is not transacted", _pubSession.getTransacted()); @@ -391,7 +390,7 @@ public class CommitRollbackTest extends TestCase } assertNull("test message should be null", result); - } + }*/ public void testSend2ThenCloseAfter1andTryAgain() throws Exception { @@ -428,7 +427,7 @@ public class CommitRollbackTest extends TestCase { assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered()); } - else // or it will be msg 2 arriving the first time due to latency. + else // or it will be msg 2 arriving the first time due to latency. { _logger.info("Message 2 wasn't prefetched so wasn't rejected"); assertEquals("2", ((TextMessage) result).getText()); @@ -445,7 +444,6 @@ public class CommitRollbackTest extends TestCase } - public void testPutThenRollbackThenGet() throws Exception { assertTrue("session is not transacted", _session.getTransacted()); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java index d994d4c141..929621c496 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,24 +20,24 @@ */ package org.apache.qpid.test.unit.transacted; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.TextMessage; - import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.jms.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.TextMessage; + public class TransactedTest extends TestCase { private AMQQueue queue1; @@ -56,7 +56,7 @@ public class TransactedTest extends TestCase private Session testSession; private MessageConsumer testConsumer1; private MessageConsumer testConsumer2; - private static final Logger _logger = Logger.getLogger(TransactedTest.class); + private static final Logger _logger = LoggerFactory.getLogger(TransactedTest.class); protected void setUp() throws Exception { @@ -68,13 +68,15 @@ public class TransactedTest extends TestCase _logger.info("Create Session"); session = con.createSession(true, Session.SESSION_TRANSACTED); _logger.info("Create Q1"); - queue1 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), false, true); + queue1 = + new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), false, + true); _logger.info("Create Q2"); queue2 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q2"), false); _logger.info("Create Consumer of Q1"); consumer1 = session.createConsumer(queue1); - //Dummy just to create the queue. + // Dummy just to create the queue. _logger.info("Create Consumer of Q2"); MessageConsumer consumer2 = session.createConsumer(queue2); _logger.info("Close Consumer of Q2"); @@ -98,7 +100,6 @@ public class TransactedTest extends TestCase _logger.info("Create prep connection start"); prepCon.start(); - _logger.info("Create test connection"); testCon = new AMQConnection("vm://:1", "guest", "guest", "TestConnection", "test"); _logger.info("Create test session"); @@ -122,7 +123,7 @@ public class TransactedTest extends TestCase public void testCommit() throws Exception { - //add some messages + // add some messages _logger.info("Send prep A"); prepProducer1.send(prepSession.createTextMessage("A")); _logger.info("Send prep B"); @@ -130,7 +131,7 @@ public class TransactedTest extends TestCase _logger.info("Send prep C"); prepProducer1.send(prepSession.createTextMessage("C")); - //send and receive some messages + // send and receive some messages _logger.info("Send X to Q2"); producer2.send(session.createTextMessage("X")); _logger.info("Send Y to Q2"); @@ -138,7 +139,6 @@ public class TransactedTest extends TestCase _logger.info("Send Z to Q2"); producer2.send(session.createTextMessage("Z")); - _logger.info("Read A from Q1"); expect("A", consumer1.receive(1000)); _logger.info("Read B from Q1"); @@ -146,13 +146,13 @@ public class TransactedTest extends TestCase _logger.info("Read C from Q1"); expect("C", consumer1.receive(1000)); - //commit + // commit _logger.info("session commit"); session.commit(); _logger.info("Start test Connection"); testCon.start(); - //ensure sent messages can be received and received messages are gone + // ensure sent messages can be received and received messages are gone _logger.info("Read X from Q2"); expect("X", testConsumer2.receive(1000)); _logger.info("Read Y from Q2"); @@ -170,7 +170,7 @@ public class TransactedTest extends TestCase public void testRollback() throws Exception { - //add some messages + // add some messages _logger.info("Send prep A"); prepProducer1.send(prepSession.createTextMessage("A")); _logger.info("Send prep B"); @@ -178,7 +178,7 @@ public class TransactedTest extends TestCase _logger.info("Send prep C"); prepProducer1.send(prepSession.createTextMessage("C")); - //Quick sleep to ensure all three get pre-fetched + // Quick sleep to ensure all three get pre-fetched Thread.sleep(500); _logger.info("Sending X Y Z"); @@ -188,14 +188,14 @@ public class TransactedTest extends TestCase _logger.info("Receiving A B"); expect("A", consumer1.receive(1000)); expect("B", consumer1.receive(1000)); - //Don't consume 'C' leave it in the prefetch cache to ensure rollback removes it. + // Don't consume 'C' leave it in the prefetch cache to ensure rollback removes it. - //rollback + // rollback _logger.info("rollback"); session.rollback(); _logger.info("Receiving A B C"); - //ensure sent messages are not visible and received messages are requeued + // ensure sent messages are not visible and received messages are requeued expect("A", consumer1.receive(1000), true); expect("B", consumer1.receive(1000), true); expect("C", consumer1.receive(1000), true); @@ -211,7 +211,7 @@ public class TransactedTest extends TestCase _logger.info("Testing we have no messages left after commit"); assertTrue(null == testConsumer1.receive(1000)); - assertTrue(null == testConsumer2.receive(1000)); + assertTrue(null == testConsumer2.receive(1000)); } public void testResendsMsgsAfterSessionClose() throws Exception diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java index 195ed79dab..061c1ef7a4 100644 --- a/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java +++ b/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java @@ -1,26 +1,27 @@ package org.apache.qpid.testutil; +import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.client.AMQConnectionURL; -import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.JMSAMQException; import org.apache.qpid.url.URLSyntaxException; -import org.apache.log4j.Logger; -import javax.jms.ExceptionListener; -import javax.jms.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.jms.Connection; +import javax.jms.ExceptionListener; import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.MessageProducer; import javax.jms.Message; import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import javax.jms.TextMessage; public class QpidClientConnection implements ExceptionListener { - - private static final Logger _logger = Logger.getLogger(QpidClientConnection.class); + private static final Logger _logger = LoggerFactory.getLogger(QpidClientConnection.class); private boolean transacted = true; private int ackMode = Session.CLIENT_ACKNOWLEDGE; @@ -40,17 +41,16 @@ public class QpidClientConnection implements ExceptionListener setPrefetch(5000); } - public void connect() throws JMSException { if (!connected) { /* - * amqp://[user:pass@][clientid]/virtualhost? - * brokerlist='[transport://]host[:port][?option='value'[&option='value']];' - * [&failover='method[?option='value'[&option='value']]'] - * [&option='value']" - */ + * amqp://[user:pass@][clientid]/virtualhost? + * brokerlist='[transport://]host[:port][?option='value'[&option='value']];' + * [&failover='method[?option='value'[&option='value']]'] + * [&option='value']" + */ String brokerUrl = "amqp://guest:guest@" + virtualHost + "?brokerlist='" + brokerlist + "'"; try { @@ -63,7 +63,6 @@ public class QpidClientConnection implements ExceptionListener session = ((AMQConnection) connection).createSession(transacted, ackMode, prefetch); - _logger.info("starting connection"); connection.start(); @@ -124,7 +123,6 @@ public class QpidClientConnection implements ExceptionListener this.prefetch = prefetch; } - /** override as necessary */ public void onException(JMSException exception) { @@ -266,4 +264,3 @@ public class QpidClientConnection implements ExceptionListener _logger.info("consumed: " + messagesReceived); } } - |