Author: ningjiang Date: Tue Feb 2 03:17:29 2010 New Revision: 905499 URL: http://svn.apache.org/viewvc?rev=905499&view=rev Log: Fixed the unit test errors of camel-web
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/BeanDSLTest.java camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java?rev=905499&r1=905498&r2=905499&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java (original) +++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java Tue Feb 2 03:17:29 2010 @@ -59,7 +59,7 @@ public void testAggregateAndOnException() throws Exception { String dsl = "errorHandler(deadLetterChannel(\"mock:error\"));" + "onException(CamelException.class).maximumRedeliveries(2);" + "from(\"direct:start\").aggregate(header(\"id\")).to(\"mock:result\")"; - String expected = "errorHandler(deadLetterChannel(\"mock://error\"));" + "onException(CamelException.class).maximumRedeliveries(2);" + String expected = "errorHandler(deadLetterChannel(\"mock://error\").logStackTrace(true));" + "onException(CamelException.class).maximumRedeliveries(2);" + "from(\"direct:start\").aggregate().header(\"id\").to(\"mock:result\")"; assertEquals(expected, render(dsl)); } Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/BeanDSLTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/BeanDSLTest.java?rev=905499&r1=905498&r2=905499&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/BeanDSLTest.java (original) +++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/BeanDSLTest.java Tue Feb 2 03:17:29 2010 @@ -45,6 +45,8 @@ @Test public void testBeanWithException() throws Exception { String dsl = "errorHandler(deadLetterChannel(\"mock://error\"));onException(Exception.class).to(\"mock:invalid\");from(\"direct:start\").beanRef(\"myBean\").to(\"mock:valid\")"; - assertEquals(dsl, render(dsl)); + String expect = "errorHandler(deadLetterChannel(\"mock://error\").logStackTrace(true));onException(Exception.class).to(\"mock:invalid\");" + + "from(\"direct:start\").beanRef(\"myBean\").to(\"mock:valid\")"; + assertEquals(expect, render(dsl)); } } Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java?rev=905499&r1=905498&r2=905499&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java (original) +++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java Tue Feb 2 03:17:29 2010 @@ -26,20 +26,21 @@ @Test public void testDeadLetterWithDefaultRedeliverDelay() throws Exception { - String dsl = "errorHandler(deadLetterChannel(\"mock://failed\").handled(false));from(\"direct:start\").to(\"mock:result\")"; + String dsl = "errorHandler(deadLetterChannel(\"mock://failed\").logStackTrace(true).handled(false));from(\"direct:start\").to(\"mock:result\")"; assertEquals(dsl, render(dsl)); } @Test public void testDeadLetterWithDefaultHandled() throws Exception { - String dsl = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000));from(\"direct:start\").to(\"mock:result\")"; + String dsl = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).logStackTrace(true));from(\"direct:start\").to(\"mock:result\")"; assertEquals(dsl, render(dsl)); } @Test public void testDeadLetterDSL() throws Exception { String dsl = "errorHandler(deadLetterChannel(\"mock:failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(false));from(\"direct:start\").to(\"mock:result\")"; - String expected = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(false));from(\"direct:start\").to(\"mock:result\")"; + String expected = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).logStackTrace(true).handled(false));" + + "from(\"direct:start\").to(\"mock:result\")"; assertEquals(expected, render(dsl)); }