From dd987f4edbad52f8b03895f2628b7a14c452e538 Mon Sep 17 00:00:00 2001 From: Ali Moghadam Date: Wed, 5 Jun 2013 22:47:19 -0700 Subject: [PATCH] INT-2990 Remove System.out in PipelineJmsTests Polishing: Make logger final; add log of test config; same change in PipelineNamedReplyQueuesJmsTests; author credit. --- .../jms/request_reply/PipelineJmsTests.java | 21 +++++++++++++++--- .../PipelineNamedReplyQueuesJmsTests.java | 22 +++++++++++++++---- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java index 05a4c42090..ddcdf9a714 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java @@ -23,7 +23,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.junit.Before; import org.junit.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.gateway.RequestReplyExchanger; @@ -33,11 +39,19 @@ import org.springframework.integration.message.GenericMessage; /** * @author Oleg Zhurakousky * @author Gary Russell + * @author Ali Moghadam */ public class PipelineJmsTests extends ActiveMQMultiContextTests { private final Executor executor = Executors.newFixedThreadPool(30); + private static final Log logger = LogFactory.getLog(PipelineJmsTests.class); + + @Before + public void setLogLevel() { + LogManager.getLogger(getClass()).setLevel(Level.INFO); + } + int requests = 50; /** @@ -159,9 +173,10 @@ public class PipelineJmsTests extends ActiveMQMultiContextTests { latch.await(); } finally { - System.out.println("Success: " + successCounter.get()); - System.out.println("Timeout: " + timeoutCounter.get()); - System.out.println("Failure: " + failureCounter.get()); + logger.info("Test config: " + contextConfig); + logger.info("Success: " + successCounter.get()); + logger.info("Timeout: " + timeoutCounter.get()); + logger.info("Failure: " + failureCounter.get()); // technically all we care that its > 0, // but reality of this test it has to be something more then 0 assertTrue(successCounter.get() > 10); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java index 57b28a08e6..69fd4f8812 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java @@ -24,7 +24,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.junit.Before; import org.junit.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.gateway.RequestReplyExchanger; @@ -35,11 +41,19 @@ import org.springframework.integration.message.GenericMessage; * @author Oleg Zhurakousky * @author Gary Russell * @author Artem Bilan + * @author Ali Moghadam */ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests { private final Executor executor = Executors.newFixedThreadPool(30); + private static final Log logger = LogFactory.getLog(PipelineJmsTests.class); + + @Before + public void setLogLevel() { + LogManager.getLogger(getClass()).setLevel(Level.INFO); + } + int requests = 50; /** @@ -175,10 +189,10 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests return timeoutCounter.get(); } finally { - System.out.println(contextConfig); - System.out.println("Success: " + successCounter.get()); - System.out.println("Timeout: " + timeoutCounter.get()); - System.out.println("Failure: " + failureCounter.get()); + logger.info("Test config: " + contextConfig); + logger.info("Success: " + successCounter.get()); + logger.info("Timeout: " + timeoutCounter.get()); + logger.info("Failure: " + failureCounter.get()); context.destroy(); } }