Author: davsclaus
Date: Mon Jun 16 21:37:16 2008
New Revision: 668391
URL: http://svn.apache.org/viewvc?rev=668391&view=rev
Log:
CAMEL-608: Removed system.out
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
activemq/camel/trunk/components/camel-saxon/pom.xml
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
activemq/camel/trunk/components/camel-saxon/src/test/resources/log4j.properties
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/TestBean.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
activemq/camel/trunk/components/camel-swing/src/main/java/org/apache/camel/component/uface/swing/Main.java
activemq/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/DummyBean.java
activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
Mon Jun 16 21:37:16 2008
@@ -25,6 +25,7 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.DelegateProcessor;
@@ -55,7 +56,6 @@
private MockEndpoint mockEndpointC;
private MockEndpoint mockEndpointD;
-
@Override
protected RouteBuilder createRouteBuilder() {
return new SpringRouteBuilder() {
@@ -192,9 +192,9 @@
protected void setUp() throws Exception {
super.setUp();
- // for (Route route : this.context.getRoutes()) {
- // System.out.println(route);
- // }
+ for (Route route : this.context.getRoutes()) {
+ log.debug(route);
+ }
mockEndpointA = getMockEndpoint("mock:a");
mockEndpointB = getMockEndpoint("mock:b");
@@ -243,10 +243,8 @@
public void xtestSenarioB() throws Exception {
String expected = getName() + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
- mockEndpointB.expectedMinimumMessageCount(2); // May be more since
- // spring seems to go
- // into tight loop
- // re-delivering.
+ // May be more since spring seems to go into tight loop re-delivering.
+ mockEndpointB.expectedMinimumMessageCount(2);
sendBody("activemq:queue:b", expected);
assertIsSatisfied(assertTimeoutSeconds, TimeUnit.SECONDS,
mockEndpointA, mockEndpointB);
}
@@ -254,9 +252,8 @@
public void testSenarioC() throws Exception {
String expected = getName() + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
- mockEndpointB.expectedMessageCount(1); // Should only get 1 message the
- // incoming transaction does
not
- // rollback.
+ // Should only get 1 message the incoming transaction does not
rollback.
+ mockEndpointB.expectedMessageCount(1);
sendBody("activemq:queue:c", expected);
// Wait till the endpoints get their messages.
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
Mon Jun 16 21:37:16 2008
@@ -26,6 +26,7 @@
* @version $Revision$
*/
public class JmsMessageBindTest extends SpringTestSupport {
+
public void testSendAMessageToBean() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived("Completed");
@@ -38,10 +39,9 @@
// now lets test that the bean is correct
MyBean bean = getMandatoryBean(MyBean.class, "myBean");
assertEquals("body", "SomeBody", bean.getBody());
+
Map headers = bean.getHeaders();
assertNotNull("No headers!", headers);
- System.out.println("Headers: " + headers);
-
assertEquals("foo header", "bar", headers.get("foo"));
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
Mon Jun 16 21:37:16 2008
@@ -34,7 +34,6 @@
@MessageDriven(uri = "activemq:Test.BindingQueue")
public void myMethod(@Headers Map headers, String body) {
- System.out.println("Invoked bean with: " + headers + " and body: " +
body);
this.headers = headers;
this.body = body;
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
Mon Jun 16 21:37:16 2008
@@ -44,8 +44,6 @@
}
Map<String, Map> map = new HashMap<String,
Map>(registry.getServices());
- System.out.println("Received map: " + map);
-
assertEquals("Size of map: " + map, 3, map.size());
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
Mon Jun 16 21:37:16 2008
@@ -18,7 +18,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Conditionally throws exception causing a rollback
@@ -27,29 +28,22 @@
*/
public class ConditionalExceptionProcessor implements Processor {
- private Logger log = Logger.getLogger(getClass());
+ private static final transient Log LOG =
LogFactory.getLog(ConditionalExceptionProcessor.class);
private int count;
public ConditionalExceptionProcessor() {
-
}
-
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
setCount(getCount() + 1);
-
- // System.out.println(this + "; getCount() = " + getCount());
- AbstractTransactionTest
- .assertTrue(
- "Expected only 2 calls to process() but encountered "
- + getCount()
- + ". There should be 1 for intentionally
triggered rollback, and 1 for the redelivery.",
- getCount() <= 2);
+ AbstractTransactionTest.assertTrue("Expected only 2 calls to process()
but encountered " +
+ getCount() + ". There should be 1 for intentionally triggered
rollback, and 1 for redelivery.",
+ getCount() <= 2);
// should be printed 2 times due to one re-delivery after one failure
- log.info("Exchange[" + getCount() + "][" + ((getCount() <= 1) ?
"Should rollback" : "Should succeed")
- + "] = " + exchange);
+ LOG.info("Exchange[" + getCount() + "][" + ((getCount() <= 1) ?
"Should rollback" : "Should succeed")
+ + "] = " + exchange);
// force rollback on the second attempt
if (getCount() <= 1) {
@@ -58,12 +52,10 @@
}
private void setCount(int count) {
-
this.count = count;
}
public int getCount() {
-
return count;
}
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
Mon Jun 16 21:37:16 2008
@@ -30,6 +30,7 @@
* http://activemq.apache.org/camel/transactional-client.html and Martin
* Krasser's sample:
*
http://www.nabble.com/JMS-Transactions---How-To-td15168958s22882.html#a15198803
+ * <p/>
* NOTE: had to split into separate test classes as I was unable to fully tear
* down and isolate the test cases, I'm not sure why, but as soon as we know
the
* Transaction classes can be joined into one.
@@ -100,11 +101,9 @@
from("activemq:queue:foo?replyTo=queue:foo.reply").policy(required).process(new
ConditionalExceptionProcessor()).to("activemq-1:queue:bar?replyTo=queue:bar.reply");
from("activemq-1:queue:bar").process(new Processor() {
public void process(Exchange e) {
- System.out.println(e);
String request = e.getIn().getBody(String.class);
Message out = e.getOut(true);
String selectorValue =
e.getIn().getHeader("camelProvider", String.class);
- System.out.println("selectorValue = " + selectorValue);
out.setHeader("camelProvider", selectorValue);
out.setBody("Re: " + request);
}
Modified: activemq/camel/trunk/components/camel-saxon/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/pom.xml?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/pom.xml (original)
+++ activemq/camel/trunk/components/camel-saxon/pom.xml Mon Jun 16 21:37:16 2008
@@ -75,6 +75,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
Mon Jun 16 21:37:16 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.xquery;
-
/**
* @version $Revision$
*/
@@ -25,7 +24,6 @@
public void onMethod(@XQuery("/*/@subject")String subject) {
this.subject = subject;
- System.out.println("Invoked with: [" + subject + "]");
}
public String getSubject() {
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
Mon Jun 16 21:37:16 2008
@@ -27,29 +27,28 @@
* @version $Revision$
*/
public class XQueryEndpointTest extends SpringTestSupport {
+
public void testSendMessageAndHaveItTransformed() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedMessageCount(1);
template.sendBody("direct:start",
- "<mail><subject>Hey</subject><body>Hello
world!</body></mail>");
+ "<mail><subject>Hey</subject><body>Hello world!</body></mail>");
assertMockEndpointsSatisifed();
List<Exchange> list = endpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
String xml = exchange.getIn().getBody(String.class);
- System.out.println("Found: " + xml);
- log.debug("Found: " + xml);
+ assertNotNull("The transformed XML should not be null", xml);
+ assertEquals("transformed", "<transformed
subject=\"Hey\"><mail><subject>Hey</subject>" +
+ "<body>Hello world!</body></mail></transformed>", xml);
TestBean bean = getMandatoryBean(TestBean.class, "testBean");
-
- // TODO - fixme when we allow XQuery injection to do proper type
conversion
- //assertEquals("bean.subject", "Hey", bean.getSubject());
+ assertEquals("bean.subject", "Hey", bean.getSubject());
}
protected int getExpectedRouteCount() {
- // TODO why zero?
return 0;
}
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/resources/log4j.properties?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/resources/log4j.properties
Mon Jun 16 21:37:16 2008
@@ -18,7 +18,7 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel=DEBUG
@@ -27,3 +27,10 @@
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-saxon-test.log
+log4j.appender.file.append=true
\ No newline at end of file
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/TestBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/TestBean.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/TestBean.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/TestBean.java
Mon Jun 16 21:37:16 2008
@@ -26,7 +26,6 @@
public void onMethod(@XPath("/*/@subject")String subject) {
this.subject = subject;
- System.out.println("Invoked with: [" + subject + "]");
}
public String getSubject() {
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
Mon Jun 16 21:37:16 2008
@@ -41,16 +41,18 @@
Exchange exchange = list.get(0);
String xml = exchange.getIn().getBody(String.class);
- log.debug("Found: " + xml);
+ assertNotNull("The transformed XML should not be null", xml);
+ assertTrue(xml.indexOf("transformed") > -1);
+ // the cheese tag is in the transform.xsl
+ assertTrue(xml.indexOf("cheese") > -1);
+ assertTrue(xml.indexOf("<subject>Hey</subject>") > -1);
+ assertTrue(xml.indexOf("<body>Hello world!</body>") > -1);
TestBean bean = getMandatoryBean(TestBean.class, "testBean");
-
assertEquals("bean.subject", "Hey", bean.getSubject());
- log.debug("Found bean subject: " + bean.getSubject());
}
protected int getExpectedRouteCount() {
- // TODO why zero?
return 0;
}
Modified:
activemq/camel/trunk/components/camel-swing/src/main/java/org/apache/camel/component/uface/swing/Main.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-swing/src/main/java/org/apache/camel/component/uface/swing/Main.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-swing/src/main/java/org/apache/camel/component/uface/swing/Main.java
(original)
+++
activemq/camel/trunk/components/camel-swing/src/main/java/org/apache/camel/component/uface/swing/Main.java
Mon Jun 16 21:37:16 2008
@@ -31,13 +31,8 @@
protected void postProcesCamelContext(CamelContext camelContext) throws
Exception {
super.postProcesCamelContext(camelContext);
- try {
- SwingBrowser browser = new SwingBrowser((DefaultCamelContext)
camelContext);
- browser.run();
- } catch (RuntimeException e) {
- System.out.println("Caught: " + e);
- e.printStackTrace();
- throw e;
- }
+ SwingBrowser browser = new SwingBrowser((DefaultCamelContext)
camelContext);
+ browser.run();
}
+
}
Modified:
activemq/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/DummyBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/DummyBean.java?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/DummyBean.java
(original)
+++
activemq/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/DummyBean.java
Mon Jun 16 21:37:16 2008
@@ -33,7 +33,4 @@
this.message = message;
}
- public void afterPropertiesSet() throws Exception {
- System.out.println("DummyBean says " + message);
- }
}
Modified:
activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties?rev=668391&r1=668390&r2=668391&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties
Mon Jun 16 21:37:16 2008
@@ -18,7 +18,7 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=INFO, file
log4j.logger.org.apache.activemq.spring=WARN
@@ -31,5 +31,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/camel-test.log
+log4j.appender.out.file=target/camel-xstream-test.log
log4j.appender.out.append=true
