QPID-405 Reduce excess output during tests

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@515128 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 46 insertions, 20 deletions

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 0f336998f0..a350330c71 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
@@ -44,9 +44,12 @@ 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;
 
 public class BytesMessageTest extends TestCase implements MessageListener
 {
+    private static final Logger _logger = Logger.getLogger(BytesMessageTest.class);
+
     private Connection _connection;
     private Destination _destination;
     private Session _session;
@@ -89,7 +92,7 @@ public class BytesMessageTest extends TestCase implements MessageListener
             send(_count);
             waitFor(_count);
             check();
-            System.out.println("Completed without failure");
+            _logger.info("Completed without failure");
         }
         finally
         {
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 1b32b73dbe..9e2918770a 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
@@ -105,7 +105,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener
         send(count);
         waitFor(count);
         check();
-        System.out.println("Completed without failure");
+        _logger.info("Completed without failure");
         _connection.close();
     }
 
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 c4e4753c21..ddb21ed3e5 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
@@ -33,9 +33,12 @@ 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;
 
 public class MultipleConnectionTest extends TestCase
 {
+    private static final Logger _logger = Logger.getLogger(MultipleConnectionTest.class);
+
     public static final String _defaultBroker = "vm://:1";
     public String _connectionString = _defaultBroker;
 
@@ -208,7 +211,7 @@ public class MultipleConnectionTest extends TestCase
         try
         {
             waitForCompletion(messages, 5000, receivers);
-            System.out.println("All receivers received all expected messages");
+            _logger.info("All receivers received all expected messages");
         }
         finally
         {
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 099433e779..aee9002354 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
@@ -39,9 +39,12 @@ 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;
 
 public class ObjectMessageTest extends TestCase implements MessageListener
 {
+    private static final Logger _logger = Logger.getLogger(ObjectMessageTest.class);
+
     private AMQConnection _connection;
     private AMQDestination _destination;
     private AMQSession _session;
@@ -92,7 +95,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
         send(count);
         waitFor(count);
         check();
-        System.out.println("Completed without failure");
+        _logger.info("Completed without failure");
         _connection.close();
     }
 
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 463cdca17b..fe15fa5155 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
@@ -97,7 +97,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
         send(count);
         waitFor(count);
         check();
-        System.out.println("Completed without failure");
+        _logger.info("Completed without failure");
         _connection.close();
     }
 
@@ -132,7 +132,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
             }
             else
             {
-                q = new AMQQueue(_connection,"TestReply");
+                q = new AMQQueue(_connection, "TestReply");
             }
 
             m.setJMSReplyTo(q);
@@ -157,7 +157,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
 
     void waitFor(int count) throws InterruptedException
     {
-        synchronized(received)
+        synchronized (received)
         {
             while (received.size() < count)
             {
@@ -248,7 +248,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
 
     public void onMessage(Message message)
     {
-        synchronized(received)
+        synchronized (received)
         {
             received.add((JMSTextMessage) message);
             received.notify();
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 0cdafebb1c..cc4bb441a4 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
@@ -61,7 +61,7 @@ public class SelectorTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(connection,randomize("SessionStartTest"), true));
+        init(connection, new AMQQueue(connection, randomize("SessionStartTest"), true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
@@ -92,7 +92,7 @@ public class SelectorTest extends TestCase implements MessageListener
             _logger.info("Sending Message:" + msg);
 
             ((BasicMessageProducer) _session.createProducer(_destination)).send(msg, DeliveryMode.NON_PERSISTENT);
-            System.out.println("Message sent, waiting for response...");
+            _logger.info("Message sent, waiting for response...");
             wait(1000);
 
             if (count > 0)
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 6cf64499aa..8e2d59475a 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
@@ -32,9 +32,12 @@ 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;
 
 public class SessionStartTest extends TestCase implements MessageListener
 {
+    private static final Logger _logger = Logger.getLogger(SessionStartTest.class);
+
     private AMQConnection _connection;
     private AMQDestination _destination;
     private AMQSession _session;
@@ -54,7 +57,7 @@ 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
@@ -72,11 +75,11 @@ public class SessionStartTest extends TestCase implements MessageListener
         try
         {
             _session.createProducer(_destination).send(_session.createTextMessage("Message"));
-            System.out.println("Message sent, waiting for response...");
+            _logger.info("Message sent, waiting for response...");
             wait(1000);
             if (count > 0)
             {
-                System.out.println("Got message");
+                _logger.info("Got message");
             }
             else
             {
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 24c93a0af8..f24355552a 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
@@ -96,7 +96,7 @@ public class TextMessageTest extends TestCase implements MessageListener
         send(count);
         waitFor(count);
         check();
-        System.out.println("Completed without failure");
+        _logger.info("Completed without failure");
         _connection.close();
     }
 
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 2e63bf4739..e077bddd8d 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
@@ -27,6 +27,7 @@ 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;
 
 /**
  * Declare a private temporary response queue,
@@ -36,6 +37,9 @@ import org.apache.qpid.framing.AMQShortString;
  */
 public class Client implements MessageListener
 {
+
+    private static final Logger _logger = Logger.getLogger(Client.class);
+
     private final AMQConnection _connection;
     private final AMQSession _session;
     private final int _expected;
@@ -69,7 +73,7 @@ public class Client implements MessageListener
     public synchronized void onMessage(Message response)
     {
        
-        System.out.println("Received " + (++_count) + " of " + _expected  + " responses.");
+        _logger.info("Received " + (++_count) + " of " + _expected  + " responses.");
         if(_count == _expected)
         {
 
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 fc97f65078..69c5fc3aa9 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
@@ -23,6 +23,7 @@ package org.apache.qpid.test.unit.client.forwardall;
 import junit.framework.TestCase;
 
 import org.apache.qpid.testutil.VMBrokerSetup;
+import org.apache.log4j.Logger;
 
 /**
  * Runs the Service's and Client parts of the test in the same process
@@ -30,6 +31,7 @@ import org.apache.qpid.testutil.VMBrokerSetup;
  */
 public class CombinedTest extends TestCase
 {
+    private static final Logger _logger = Logger.getLogger(CombinedTest.class);
 
     protected void setUp() throws Exception
     {
@@ -47,11 +49,11 @@ public class CombinedTest extends TestCase
         int services = 2;
         ServiceCreator.start("vm://:1", services);
 
-        System.out.println("Starting client...");
+        _logger.info("Starting client...");
 
         new Client("vm://:1", services).shutdownWhenComplete();
 
-        System.out.println("Completed successfully!");
+        _logger.info("Completed successfully!");
     }
 
     public static junit.framework.Test suite()
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 4cb6fab91f..8482227961 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
@@ -20,10 +20,15 @@
  */
 package org.apache.qpid.test.unit.client.forwardall;
 
+import org.apache.log4j.Logger;
+
 import javax.jms.JMSException;
 
 public class ServiceCreator implements Runnable
 {
+    private static final Logger _logger = Logger.getLogger(ServiceCreator.class);
+
+
     private static Thread[] threads;
     private static ServiceCreator[] _services;
 
@@ -73,7 +78,7 @@ public class ServiceCreator implements Runnable
         _services = new ServiceCreator[services];
         ServiceCreator runner = new ServiceCreator(broker);
         //start services
-        System.out.println("Starting " + services + " services...");
+        _logger.info("Starting " + services + " services...");
         for (int i = 0; i < services; i++)
         {
             threads[i] = new Thread(runner);
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 6d131cd52e..11a6b4b5c5 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
@@ -38,9 +38,12 @@ 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;
 
 public class ObjectMessageTest extends TestCase implements MessageListener
 {
+    private static final Logger _logger = Logger.getLogger(ObjectMessageTest.class);
+
     private AMQConnection connection;
     private AMQDestination destination;
     private AMQSession session;
@@ -98,7 +101,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
             send();
             waitUntilReceived(data.length);
             check();
-            System.out.println("All " + data.length + " items matched.");
+            _logger.info("All " + data.length + " items matched.");
         }
         catch (Exception e)
         {
@@ -247,7 +250,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
             }
             else
             {
-                System.out.println("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
+                _logger.error("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
                 items.add(message);
             }
         }