You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/03/06 15:15:22 UTC
svn commit: r515128 - in
/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit:
basic/ client/forwardall/ client/message/
Author: ritchiem
Date: Tue Mar 6 06:15:21 2007
New Revision: 515128
URL: http://svn.apache.org/viewvc?view=rev&rev=515128
Log:
QPID-405 Reduce excess output during tests
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java Tue Mar 6 06:15:21 2007
@@ -44,9 +44,12 @@
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 @@
send(_count);
waitFor(_count);
check();
- System.out.println("Completed without failure");
+ _logger.info("Completed without failure");
}
finally
{
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java Tue Mar 6 06:15:21 2007
@@ -105,7 +105,7 @@
send(count);
waitFor(count);
check();
- System.out.println("Completed without failure");
+ _logger.info("Completed without failure");
_connection.close();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java Tue Mar 6 06:15:21 2007
@@ -33,9 +33,12 @@
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 @@
try
{
waitForCompletion(messages, 5000, receivers);
- System.out.println("All receivers received all expected messages");
+ _logger.info("All receivers received all expected messages");
}
finally
{
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java Tue Mar 6 06:15:21 2007
@@ -39,9 +39,12 @@
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 @@
send(count);
waitFor(count);
check();
- System.out.println("Completed without failure");
+ _logger.info("Completed without failure");
_connection.close();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Tue Mar 6 06:15:21 2007
@@ -97,7 +97,7 @@
send(count);
waitFor(count);
check();
- System.out.println("Completed without failure");
+ _logger.info("Completed without failure");
_connection.close();
}
@@ -132,7 +132,7 @@
}
else
{
- q = new AMQQueue(_connection,"TestReply");
+ q = new AMQQueue(_connection, "TestReply");
}
m.setJMSReplyTo(q);
@@ -157,7 +157,7 @@
void waitFor(int count) throws InterruptedException
{
- synchronized(received)
+ synchronized (received)
{
while (received.size() < count)
{
@@ -248,7 +248,7 @@
public void onMessage(Message message)
{
- synchronized(received)
+ synchronized (received)
{
received.add((JMSTextMessage) message);
received.notify();
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java Tue Mar 6 06:15:21 2007
@@ -61,7 +61,7 @@
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 @@
_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)
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java Tue Mar 6 06:15:21 2007
@@ -32,9 +32,12 @@
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 @@
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 @@
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
{
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Tue Mar 6 06:15:21 2007
@@ -96,7 +96,7 @@
send(count);
waitFor(count);
check();
- System.out.println("Completed without failure");
+ _logger.info("Completed without failure");
_connection.close();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java Tue Mar 6 06:15:21 2007
@@ -27,6 +27,7 @@
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 @@
*/
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 synchronized void onMessage(Message response)
{
- System.out.println("Received " + (++_count) + " of " + _expected + " responses.");
+ _logger.info("Received " + (++_count) + " of " + _expected + " responses.");
if(_count == _expected)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java Tue Mar 6 06:15:21 2007
@@ -23,6 +23,7 @@
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 @@
*/
public class CombinedTest extends TestCase
{
+ private static final Logger _logger = Logger.getLogger(CombinedTest.class);
protected void setUp() throws Exception
{
@@ -47,11 +49,11 @@
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()
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java Tue Mar 6 06:15:21 2007
@@ -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 @@
_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);
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?view=diff&rev=515128&r1=515127&r2=515128
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Tue Mar 6 06:15:21 2007
@@ -38,9 +38,12 @@
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 @@
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 @@
}
else
{
- System.out.println("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
+ _logger.error("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
items.add(message);
}
}