diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-22 16:04:13 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-22 16:04:13 +0000 |
| commit | 1c7a129ba58a45726a7d14377fb8ebe447457319 (patch) | |
| tree | a547fa1721135dd59607ff55609795bb84dc1627 /qpid/java/systests/src | |
| parent | 51a25d7f950fd2220542727593fa48d24961a1a1 (diff) | |
| download | qpid-python-1c7a129ba58a45726a7d14377fb8ebe447457319.tar.gz | |
QPID-5048: logging and build output cleanup
Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560398 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
27 files changed, 108 insertions, 268 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java index 0ca90ac2ea..b274edf164 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.ra; +import org.apache.log4j.Logger; import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; @@ -33,6 +34,8 @@ import org.apache.qpid.ra.QpidResourceAdapter; public class QpidRAConnectionTest extends QpidBrokerTestCase { + private static final Logger _logger = Logger.getLogger(QpidRAConnectionTest.class); + private static final String BROKER_PORT = "15672"; private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''"; @@ -55,7 +58,7 @@ public class QpidRAConnectionTest extends QpidBrokerTestCase } catch(Exception e) { - e.printStackTrace(); + _logger.error("Commit threw exception", e); assertTrue(e instanceof javax.jms.IllegalStateException); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java index 69b529cf40..9f145cd62c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java @@ -60,7 +60,7 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp if (workdir == null || workdir.equals("")) { String tempdir = System.getProperty("java.io.tmpdir"); - System.out.println("QPID_WORK not set using tmp directory: " + tempdir); + _logger.info("QPID_WORK not set using tmp directory: " + tempdir); System.setProperty("QPID_WORK", tempdir); } } @@ -290,14 +290,7 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp { Exception linkedException = null; - try - { - linkedException = jmsException.getLinkedException(); - } - catch (Exception e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + linkedException = jmsException.getLinkedException(); if (linkedException instanceof AMQNoRouteException) { AMQNoRouteException noRoute = (AMQNoRouteException) linkedException; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java index a6c9885568..7b2dd3239d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.server.queue; +import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; @@ -246,6 +247,8 @@ public class PriorityQueueTest extends QpidBrokerTestCase private static class ReflectingMessageListener implements MessageListener { + private static final Logger _logger = Logger.getLogger(PriorityQueueTest.ReflectingMessageListener.class); + private Session _prodSess; private Session _consSess; private CountDownLatch _latch; @@ -270,7 +273,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase { _latch.countDown(); long msgNum = _origCount - _latch.getCount(); - System.out.println("Received message " + msgNum + " with ID: " + message.getIntProperty("msg")); + _logger.info("Received message " + msgNum + " with ID: " + message.getIntProperty("msg")); if(_latch.getCount() > 0) { @@ -287,7 +290,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase } catch(Throwable t) { - t.printStackTrace(); + _logger.error(t.getMessage(), t); _lastThrown = t; } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java index 8bebcc703d..427508954d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java @@ -37,6 +37,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; +import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; @@ -47,6 +48,8 @@ import org.apache.qpid.test.utils.JMXTestUtils; public class ProducerFlowControlTest extends AbstractTestLogging { + private static final Logger _logger = Logger.getLogger(ProducerFlowControlTest.class); + private static final int TIMEOUT = 10000; private Connection producerConnection; @@ -94,7 +97,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging } catch (IOException e) { - e.printStackTrace(); + _logger.error("Error closing jmxUtils", e); } } producerConnection.close(); @@ -426,7 +429,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging } catch (AMQException e) { - e.printStackTrace(); + _logger.error("Error performing sync", e); throw new RuntimeException(e); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java index f89e33ccc4..07f0d0c369 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Collections; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.framing.AMQShortString; @@ -76,6 +77,8 @@ import static org.mockito.Mockito.when; */ public class MessageStoreTest extends QpidTestCase { + private static final Logger _logger = Logger.getLogger(MessageStoreTest.class); + public static final int DEFAULT_PRIORTY_LEVEL = 5; public static final String SELECTOR_VALUE = "Test = 'MST'"; public static final String LVQ_KEY = "MST-LVQ-KEY"; @@ -179,7 +182,7 @@ public class MessageStoreTest extends QpidTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Error closing virtual host", e); fail(e.getMessage()); } } @@ -190,7 +193,7 @@ public class MessageStoreTest extends QpidTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Error creating virtual host", e); fail(e.getMessage()); } @@ -659,7 +662,7 @@ public class MessageStoreTest extends QpidTestCase } catch (AMQException e) { - e.printStackTrace(); + _logger.error("Problem enqueing message", e); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java index c4b16133f0..31e6a5613f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java @@ -346,7 +346,7 @@ public class StoreOverfullTest extends QpidBrokerTestCase } catch (AMQException e) { - e.printStackTrace(); + _logger.error(e); throw new RuntimeException(e); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java index b7732a8270..941c1d9499 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java @@ -23,8 +23,12 @@ package org.apache.qpid.server.util; import java.util.Collection; import java.util.concurrent.Callable; +import org.apache.log4j.Logger; + public class AveragedRun implements Callable<RunStats> { + private static final Logger _logger = Logger.getLogger(AveragedRun.class); + private final RunStats stats = new RunStats(); private final TimedRun test; private final int iterations; @@ -46,7 +50,7 @@ public class AveragedRun implements Callable<RunStats> public void run() throws Exception { - System.out.println(test + ": " + call()); + _logger.info(test + ": " + call()); } public String toString() diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java index 2ed3f356d3..54c3225cec 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java @@ -150,7 +150,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase } catch (JMSException e) { - System.out.println("Error:" + e.getMessage()); + _logger.error("Error:" + e.getMessage(), e); exceptions[(int)count.getCount()] = e; } catch (AssertionFailedError cf) @@ -161,9 +161,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase count.countDown(); } - System.out.println("Error:" + cf.getMessage()); - System.err.println(cf.getMessage()); - cf.printStackTrace(); + _logger.error("Error:" + cf.getMessage(), cf); failed.set(true); } } @@ -177,8 +175,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase { if (e != null) { - System.err.println(e.getMessage()); - e.printStackTrace(); + _logger.error("Encountered exception", e); failed.set(true); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java index 5dcf678510..38fb1622b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java @@ -126,7 +126,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener } else { - System.out.println("SUCCESS!!"); + _logger.debug("SUCCESS!!"); } } catch (InterruptedException e) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java index 1b4407f255..602eb5137a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java @@ -125,7 +125,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message Exception cause = _causeOfFailure.get(); if (cause != null) { - cause.printStackTrace(); + _logger.error("Cause of failure is: ", cause); fail(cause.getMessage()); } else @@ -142,7 +142,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message Exception cause = _causeOfFailure.get(); if (cause != null) { - cause.printStackTrace(); + _logger.error("Failed due to following exception", cause); fail(cause.getMessage()); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java index a121b39a56..01f4cdbb05 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java @@ -271,8 +271,8 @@ public class BytesMessageTest extends QpidBrokerTestCase implements MessageListe count = Integer.parseInt(argv[1]); } - System.out.println("connectionString = " + connectionString); - System.out.println("count = " + count); + _logger.info("connectionString = " + connectionString); + _logger.info("count = " + count); BytesMessageTest test = new BytesMessageTest(); test._connectionString = connectionString; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index 7bd737ee53..ace8324dab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java @@ -155,8 +155,8 @@ public class LargeMessageTest extends QpidBrokerTestCase } catch (JMSException e) { - e.printStackTrace(); - fail("Excpetion occured:" + e.getCause()); + _logger.error("Exception occured", e); + fail("Exception occured:" + e.getCause()); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java index 52213d15c4..dc963da680 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java @@ -197,7 +197,6 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList catch (Exception e) { _logger.error(e.getMessage(), e); - e.printStackTrace(); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java index 0a568d57ad..57b689a291 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java @@ -95,7 +95,7 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen } catch (Throwable e) { - e.printStackTrace(); + _logger.error("Error creating consumer", e); } connection.start(); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java index 0650531d2b..6ea1582bb8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java @@ -73,7 +73,7 @@ public class ConnectionStartTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Connection to " + _broker + " should succeed.", e); fail("Connection to " + _broker + " should succeed. Reason: " + e); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index 728ef85bd2..99dc5ff216 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java @@ -104,7 +104,7 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList } catch (Exception e) { - e.printStackTrace(); + _logger.error("This Test should succeed but failed", e); fail("This Test should succeed but failed due to: " + e); } } @@ -254,7 +254,7 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList } catch (JMSException e) { - e.printStackTrace(); + _logger.error("Error getting object from message", e); items.add(e); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java index a4e9a992b4..5895d670a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java @@ -312,7 +312,7 @@ public class MessageRequeueTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Consumer run error",e); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java deleted file mode 100644 index 3b30b7d63f..0000000000 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.qpid.test.unit.close; - -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQConnectionFactory; -import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; - -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.naming.InitialContext; -import java.util.ArrayList; - -/** - * QPID-1791 - * - * The threading model in the Java broker (at least till 0.5) allows for the - * close to be handled immediately even if the broker is still processing state - * for that Session. - * - * This test verifys that QPID-1791 is has been handled. - * - * The problem was that the whilst the Session is busy processing Acks from the - * client the Close frame jumps in and clears the unAcknowledgeMap in an - * attempt to start processing them for closing the connection. - * - * If the session had a consumer consuming from a temporary queue. The closing - * thread dequeues and deletes the message that were on the uncknowledgedMap. - * - * However, the Acking thread currently does: - * queuEntry = unackedMap.get(messageID) - * - * dequeueAndDelete(queueEntry) - * - * unackedMap.remove(messageID) - * - * As a result the queueEntry is sitting in the unackedMap whilst it is being - * dequeuedAndDeleted which leaves the opportunity for the close thread to - * remove contents of the unackedMap for processing. The close thread will then - * dequeueAndDelete all these values one of which the acking thread is currently - * processing. - * - * - * Test Approach - * - * Send a lot of persistent messages (5000), the goal of which is to fill the - * pretch and to provide the broker with a lot of acks to process - * - * Using client ack and prefetch buffer of 5000 use receive to get 2500 - * Use AMQMessage.acknowledgeThis() to send a single ack frame back to the - * broker per message so 2500 ack frames. - * This will give the broker a lot to process, - * Immediately send the consumer close after the acks are all gone. - * This will cause the remaining 2500 prefetched messages plus any that have - * not yet had their acks processed - * to be collected by the requeue() process potentially - */ -public class VerifyAckingOkDuringClose -{ - - static final int MESSAGE_SENT = 5000; - - public static void main(String[] args) throws Exception - { - //Check that we have the InitialContext Configured - - if (System.getProperty(InitialContext.INITIAL_CONTEXT_FACTORY) == null) - { - System.setProperty(InitialContext.INITIAL_CONTEXT_FACTORY, PropertiesFileInitialContextFactory.class.getName()); - } - - if (System.getProperty(InitialContext.PROVIDER_URL) == null) - { - System.err.println(InitialContext.PROVIDER_URL + ": Is not set and is required to contain a 'default' ConnectionFactory."); - System.exit(1); - } - - //Retreive the local factory from the properties file - // when used with perftest.properties this will be localhost:5672 - AMQConnectionFactory factory = (AMQConnectionFactory) new InitialContext().lookup("default"); - - AMQConnection connection = (AMQConnection) factory.createConnection("guest", "guest"); - - //Use the AMQConnection Interface to set the prefetch to the number - // we are sending - Session session = connection.createSession(false, - Session.CLIENT_ACKNOWLEDGE, - MESSAGE_SENT); - - Queue queue = session.createTemporaryQueue(); - - MessageConsumer consumer = session.createConsumer(queue); - connection.start(); - - MessageProducer producer = session.createProducer(queue); - - Message message = session.createTextMessage("Close"); - - for (int i = 0; i < MESSAGE_SENT; i++) - { - message.setIntProperty("SequenceNumber", i); - - producer.send(message); - } - - // Put a reasonable about of data on the queue. - - //Receive all the messags - ArrayList<Message> received = new ArrayList<Message>(); - - message = consumer.receive(2000); - - while (message != null) - { - received.add(message); - message = consumer.receive(2000); - } - - //Check we have all the messages - if (received.size() != MESSAGE_SENT) - { - System.err.println("Test Failed Not all the messages received:" + received.size()); - System.exit(1); - } - - //individually ack the first half then close - for (int i = 0; i < MESSAGE_SENT / 2; i++) - { - ((org.apache.qpid.jms.Message) received.get(i)).acknowledgeThis(); - } - - // Close the Session to force a requeue on the server of the unackedMsgs - - System.out.println("Killing client to force requeue on broker"); - - System.exit(1); - } - -} diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index 4b61b6269c..cc8bfb9433 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java @@ -284,7 +284,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase { if(!isBrokerStorePersistent()) { - System.out.println("The broker store is not persistent, skipping this test."); + _logger.warn("The broker store is not persistent, skipping this test"); return; } @@ -784,7 +784,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Receive error",e); } conn.stop(); @@ -852,7 +852,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Receive error",e); } conn.stop(); @@ -914,7 +914,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Error creating durable subscriber",e); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java index 6bf20d7708..c2ea3a5695 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java @@ -297,7 +297,7 @@ public class TopicSessionTest extends QpidBrokerTestCase m = (TextMessage) noLocal.receive(1000); if (m != null) { - System.out.println("Message:" + m.getText()); + _logger.info("Message:" + m.getText()); } assertNull(m); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 0be4f7ff1d..610628a02d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -634,7 +634,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("OnMessage error",e); } } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java index 4f7d592958..78c76602c5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java @@ -108,7 +108,7 @@ public class TransactedTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("setup error",e); stopBroker(); throw e; } @@ -127,7 +127,7 @@ public class TransactedTest extends QpidBrokerTestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("tear down error",e); } finally { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java index b5d1bff842..92df1bd331 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java @@ -112,7 +112,7 @@ public abstract class AbstractXATestCase extends QpidBrokerTestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("Producer error",e); fail("cannot create message producer: " + e.getMessage()); } // create standard consumer diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java index 39973e12c7..c5fa217aa9 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java @@ -39,7 +39,6 @@ import javax.transaction.xa.Xid; public class FaultTest extends AbstractXATestCase { - /* this clas logger */ private static final Logger _logger = LoggerFactory.getLogger(FaultTest.class); /** diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java index 3fbe76323a..350781e970 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java @@ -39,7 +39,6 @@ import javax.transaction.xa.Xid; public class QueueTest extends AbstractXATestCase { - /* this clas logger */ private static final Logger _logger = LoggerFactory.getLogger(QueueTest.class); /** @@ -167,7 +166,7 @@ public class QueueTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("cannot create queue session",e); fail("cannot create queue session: " + e.getMessage()); } init(session, _queue); @@ -197,7 +196,7 @@ public class QueueTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("cannot start the transaction with xid1", e); fail("cannot start the transaction with xid1: " + e.getMessage()); } try @@ -411,14 +410,14 @@ public class QueueTest extends AbstractXATestCase { if (anInDoubt.equals(xid1)) { - System.out.println("commit xid1 "); + _logger.info("commit xid1 "); try { _xaResource.commit(anInDoubt, false); } catch (Exception e) { - System.out.println("PB when aborted xid1"); + _logger.error("PB when aborted xid1", e); } } else @@ -429,7 +428,7 @@ public class QueueTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("exception thrown when recovering transactions", e); fail("exception thrown when recovering transactions " + e.getMessage()); } // the queue should contain the first message! @@ -607,7 +606,7 @@ public class QueueTest extends AbstractXATestCase } catch (Exception e) { - System.out.println("PB when aborted xid1"); + _logger.error("PB when aborted xid1", e); } } else if (anInDoubt.equals(xid2)) @@ -619,14 +618,14 @@ public class QueueTest extends AbstractXATestCase } catch (Exception e) { - System.out.println("PB when commiting xid2"); + _logger.error("PB when commiting xid2", e); } } } } catch (XAException e) { - e.printStackTrace(); + _logger.error("exception thrown when recovering transactions", e); fail("exception thrown when recovering transactions " + e.getMessage()); } // the queue should be empty diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java index d955979ad6..4d9242b8b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class TopicTest extends AbstractXATestCase { - /* this clas logger */ + /* this class logger */ private static final Logger _logger = LoggerFactory.getLogger(TopicTest.class); /** @@ -163,7 +163,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); //To change body of catch statement use Options | File Templates. + _logger.error("Error creating topic session", e); } init(_session, _topic); } @@ -199,7 +199,7 @@ public class TopicTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("cannot start the transaction with xid1", e); fail("cannot start the transaction with xid1: " + e.getMessage()); } try @@ -384,7 +384,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid1", e); fail("Exception when working with xid1: " + e.getMessage()); } try @@ -426,7 +426,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid2", e); fail("Exception when working with xid2: " + e.getMessage()); } try @@ -453,7 +453,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid3", e); fail("Exception when working with xid3: " + e.getMessage()); } try @@ -472,13 +472,13 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid4", e); fail("Exception when working with xid4: " + e.getMessage()); } } catch (Exception e) { - e.printStackTrace(); + _logger.error("problem when creating dur sub", e); fail("problem when creating dur sub: " + e.getMessage()); } finally @@ -489,7 +489,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("problem when unsubscribing dur sub", e); fail("problem when unsubscribing dur sub: " + e.getMessage()); } } @@ -537,7 +537,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("Exception thrown when producing messages", e); fail("Exception thrown when producing messages: " + e.getMessage()); } @@ -595,7 +595,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown when consumming 6 first messages", e); fail("Exception thrown when consumming 6 first messages: " + e.getMessage()); } try @@ -626,7 +626,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown when consumming message: 3, 4 and 7", e); fail("Exception thrown when consumming message: 3, 4 and 7: " + e.getMessage()); } @@ -641,7 +641,7 @@ public class TopicTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("XAException thrown when committing tx3 or aborting tx1", e); fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage()); } @@ -676,7 +676,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown in last phase", e); fail("Exception thrown in last phase: " + e.getMessage()); } // now the topic should be empty!! @@ -697,13 +697,13 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid6", e); fail("Exception when working with xid6: " + e.getMessage()); } } catch (Exception e) { - e.printStackTrace(); + _logger.error("problem when creating dur sub", e); fail("problem when creating dur sub: " + e.getMessage()); } finally @@ -714,7 +714,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("problem when unsubscribing dur sub", e); fail("problem when unsubscribing dur sub: " + e.getMessage()); } } @@ -769,7 +769,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("Exception thrown when producing messages", e); fail("Exception thrown when producing messages: " + e.getMessage()); } try @@ -830,7 +830,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown when consumming 6 first messages", e); fail("Exception thrown when consumming 6 first messages: " + e.getMessage()); } /////// stop the broker now !! @@ -862,7 +862,7 @@ public class TopicTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("exception thrown when recovering transactions", e); fail("exception thrown when recovering transactions " + e.getMessage()); } try @@ -929,7 +929,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown when consumming message: 3, 4 and 7", e); fail("Exception thrown when consumming message: 3, 4 and 7: " + e.getMessage()); } @@ -944,7 +944,7 @@ public class TopicTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("XAException thrown when committing tx3 or aborting tx1", e); fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage()); } @@ -1024,7 +1024,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown in last phase", e); fail("Exception thrown in last phase: " + e.getMessage()); } // now the topic should be empty!! @@ -1045,13 +1045,13 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid6", e); fail("Exception when working with xid6: " + e.getMessage()); } } catch (Exception e) { - e.printStackTrace(); + _logger.error("problem when creating dur sub", e); fail("problem when creating dur sub: " + e.getMessage()); } finally @@ -1062,7 +1062,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("problem when unsubscribing dur sub", e); fail("problem when unsubscribing dur sub: " + e.getMessage()); } } @@ -1108,7 +1108,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid1", e); fail("Exception when working with xid1: " + e.getMessage()); } try @@ -1134,7 +1134,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid2", e); fail("Exception when working with xid2: " + e.getMessage()); } @@ -1171,26 +1171,26 @@ public class TopicTest extends AbstractXATestCase { if (anInDoubt.equals(xid2)) { - System.out.println("aborting xid2 "); + _logger.info("aborting xid2 "); try { _xaResource.rollback(anInDoubt); } catch (Exception e) { - e.printStackTrace(); + _logger.error("exception when aborting xid2 ", e); fail("exception when aborting xid2 "); } } else { - System.out.println("XID2 is not in doubt "); + _logger.info("XID2 is not in doubt "); } } } catch (XAException e) { - e.printStackTrace(); + _logger.error("exception thrown when recovering transactions", e); fail("exception thrown when recovering transactions " + e.getMessage()); } @@ -1218,7 +1218,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid3", e); fail("Exception when working with xid3: " + e.getMessage()); } try @@ -1238,13 +1238,13 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception when working with xid4", e); fail("Exception when working with xid4: " + e.getMessage()); } } catch (Exception e) { - e.printStackTrace(); + _logger.error("problem when creating dur sub", e); fail("problem when creating dur sub: " + e.getMessage()); } finally @@ -1255,7 +1255,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("problem when unsubscribing dur sub", e); fail("problem when unsubscribing dur sub: " + e.getMessage()); } } @@ -1356,8 +1356,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - _logger.debug("PB when aborted xid1"); - e.printStackTrace(); + _logger.error("PB when aborted xid1"); fail("exception when committing xid1 "); } } @@ -1369,7 +1368,7 @@ public class TopicTest extends AbstractXATestCase } catch (XAException e) { - e.printStackTrace(); + _logger.error("exception thrown when recovering transactions ", e); fail("exception thrown when recovering transactions " + e.getMessage()); } _logger.debug("the topic should not be empty"); @@ -1381,13 +1380,13 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown when testin that queue test is empty", e); fail("Exception thrown when testin that queue test is empty: " + e.getMessage()); } } catch (JMSException e) { - e.printStackTrace(); + _logger.error("cannot create dummy durable subscriber", e); fail("cannot create dummy durable subscriber: " + e.getMessage()); } finally @@ -1469,7 +1468,7 @@ public class TopicTest extends AbstractXATestCase } else if (message.getLongProperty(_sequenceNumberPropertyName) != 2) { - System.out.println("wrong sequence number, 2 expected, received: " + message + _logger.info("wrong sequence number, 2 expected, received: " + message .getLongProperty(_sequenceNumberPropertyName)); } _xaResource.end(xid1, XAResource.TMSUCCESS); @@ -1491,7 +1490,7 @@ public class TopicTest extends AbstractXATestCase } else if (message.getLongProperty(_sequenceNumberPropertyName) != 2) { - System.out.println("wrong sequence number, 2 expected, received: " + message + _logger.info("wrong sequence number, 2 expected, received: " + message .getLongProperty(_sequenceNumberPropertyName)); } // consume the third message with that xa durable subscriber @@ -1502,7 +1501,7 @@ public class TopicTest extends AbstractXATestCase } else if (message.getLongProperty(_sequenceNumberPropertyName) != 3) { - System.out.println("wrong sequence number, 3 expected, received: " + message + _logger.info("wrong sequence number, 3 expected, received: " + message .getLongProperty(_sequenceNumberPropertyName)); } stSession.commit(); @@ -1565,11 +1564,11 @@ public class TopicTest extends AbstractXATestCase message = (TextMessage) durSub.receive(1000); if (message == null) { - System.out.println("no message received "); + _logger.info("no message received "); } else if (message.getLongProperty(_sequenceNumberPropertyName) != i) { - System.out.println("wrong sequence number, " + i + " expected, received: " + message + _logger.info("wrong sequence number, " + i + " expected, received: " + message .getLongProperty(_sequenceNumberPropertyName)); } } @@ -1639,7 +1638,7 @@ public class TopicTest extends AbstractXATestCase } catch (Exception e) { - e.printStackTrace(); + _logger.error("Exception thrown", e); fail("Exception thrown: " + e.getMessage()); } finally @@ -1710,7 +1709,7 @@ public class TopicTest extends AbstractXATestCase } catch (JMSException e) { - e.printStackTrace(); + _logger.error("Error getting long property: " + TopicTest._sequenceNumberPropertyName , e); TopicTest.failure(); _lock.set(false); synchronized (_lock) @@ -1720,7 +1719,7 @@ public class TopicTest extends AbstractXATestCase } if (seq != _counter) { - System.out.println("received message " + seq + " expected " + _counter); + _logger.info("received message " + seq + " expected " + _counter); TopicTest.failure(); _lock.set(false); synchronized (_lock) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 7ff1d09cb2..91dcf48001 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -255,8 +255,6 @@ public class QpidBrokerTestCase extends QpidTestCase private void initialiseLogConfigFile() { - _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH); - _logConfigFile = new File(LOG4J_CONFIG_FILE_PATH); if(!_logConfigFile.exists()) { |
