You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/08/16 19:09:45 UTC
svn commit: r804720 - in /camel/trunk/components/camel-web/src/test:
java/org/apache/camel/web/groovy/ resources/
Author: hadrian
Date: Sun Aug 16 17:09:44 2009
New Revision: 804720
URL: http://svn.apache.org/viewvc?rev=804720&view=rev
Log:
More checkstyle fixes...
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AOPDSLTest.java
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/ChoiceDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/CovertBodyDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DeadLetterDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DelayDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/EnrichSetBodyDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/FilterDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptFromDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptSendToEndpointDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoadBalanceDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoopDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MarshalDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PipelineDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RecipientListDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemoveHeaderDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemovePropertyDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ResequenceDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RollbackDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetBodyDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetExchangePatternDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetHeaderDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetPropertyDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SimpleDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SortDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StopDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StreamCachingDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ThrottleDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TracingDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TransformDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/WireTapDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/XPathDSLTest.java
camel/trunk/components/camel-web/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AOPDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AOPDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AOPDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AOPDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,9 +24,7 @@
public void testAOPAfter() throws Exception {
String dsl = "from(\"direct:start\").aop().after(\"mock:after\").transform(constant(\"Bye World\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
// TODO: fix this test!
@@ -35,16 +33,12 @@
+ ".when(body().isEqualTo(\"Hello World\")).transform(constant(\"Bye World\"))"
+ ".otherwise().transform(constant(\"Kabom the World\")).throwException(new IllegalArgumentException(\"Damn\"))"
+ ".end().to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testAOPAround() throws Exception {
String dsl = "from(\"direct:start\").aop().around(\"mock:before\", \"mock:after\").transform(constant(\"Bye World\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
// TODO: fix this test!
@@ -53,25 +47,21 @@
+ ".when(body().isEqualTo(\"Hello World\")).transform(constant(\"Bye World\"))"
+ ".otherwise().transform(constant(\"Kabom the World\")).throwException(new IllegalArgumentException(\"Damn\"))"
+ ".end()to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testAOPBefore() throws Exception {
String dsl = "from(\"direct:start\").aop().before(\"mock:before\").transform(constant(\"Bye World\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testAOPNestedRoute() throws Exception {
String dsl = "from(\"direct:start\").to(\"mock:start\").aop().around(\"mock:before\", \"mock:after\")"
+ ".transform(constant(\"Bye\")).to(\"mock:middle\").transform(body().append(\" World\")).end().transform(body().prepend(\"Bye \")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"mock:start\").aop().around(\"mock:before\", \"mock:after\")"
+ String expected = "from(\"direct:start\").to(\"mock:start\").aop().around(\"mock:before\", \"mock:after\")"
+ ".transform(constant(\"Bye\")).to(\"mock:middle\").transform(body().append(\" World\")).transform(body().prepend(\"Bye \")).to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
}
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=804720&r1=804719&r2=804720&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 Sun Aug 16 17:09:44 2009
@@ -23,32 +23,28 @@
*/
public class AggregateDSLTest extends GroovyRendererTestSupport {
- public void testAggragate() throws Exception {
+ public void testAggregate() throws Exception {
String dsl = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
- public void testAggragateCommon() throws Exception {
+ public void testAggregateCommon() throws Exception {
String dsl = "from(\"direct:start\").aggregate(header(\"cheese\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
+ String expected = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testAggregateGroupedExchange() throws Exception {
String dsl = "from(\"direct:start\").aggregate().simple(\"id\").batchTimeout(500L).groupExchanges().to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testAggregateTimeoutOnly() throws Exception {
String dsl = "from(\"direct:start\").aggregate(header(\"id\")).batchTimeout(3000).batchSize(0).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").aggregate().header(\"id\").batchTimeout(3000).batchSize(0).to(\"mock:result\")";
-
- assertEquals(expectedDSL, render(dsl));
+ String expected = "from(\"direct:start\").aggregate().header(\"id\").batchTimeout(3000).batchSize(0).to(\"mock:result\")";
+
+ assertEquals(expected, render(dsl));
}
/**
@@ -57,11 +53,9 @@
* @throws Exception
* TODO: fix this test!
*/
- public void fimeTestAggregateAndOnException() throws Exception {
+ public void fixmeTestAggregateAndOnException() throws Exception {
String dsl = "errorHandler(deadLetterChannel(\"mock:error\"));onException(CamelException.class).maximumRedeliveries(2);from(\"direct:start\").aggregate(header(\"id\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
/**
@@ -73,8 +67,6 @@
public void fixmeTestAggregateTimerAndTracer() throws Exception {
String dsl = "from(\"timer://kickoff?period=9999910000\").setHeader(\"id\").constant(\"foo\").setBody().constant(\"a b c\").split(body().tokenize(\" \")).to(\"seda:splitted\");"
+ "from(\"seda:splitted\").aggregate(header(\"id\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ChoiceDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ChoiceDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ChoiceDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ChoiceDSLTest.java Sun Aug 16 17:09:44 2009
@@ -27,9 +27,7 @@
+ ".when().method(\"controlBean\", \"isDetour\").to(\"mock:detour\")"
+ ".end()"
+ ".to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testChoiceWithPredication() throws Exception {
@@ -38,22 +36,17 @@
+ ".when(header(\"admin\").isEqualTo(\"true\")).to(\"mock:admin\")"
+ ".otherwise().to(\"mock:guest\")"
+ ".end()";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testChoiceWithoutEnd() throws Exception {
String dsl = "from(\"direct:start\").split().body().choice()"
+ ".when().method(\"orderItemHelper\", \"isWidget\").to(\"bean:widgetInventory\", \"seda:aggregate\")"
+ ".otherwise().to(\"bean:gadgetInventory\", \"seda:aggregate\")";
-
- //TODO check this result
- String expectedDSL = "from(\"direct:start\").split(body()).choice()"
+ String expected = "from(\"direct:start\").split(body()).choice()"
+ ".when().method(\"orderItemHelper\", \"isWidget\").to(\"bean:widgetInventory\").to(\"seda:aggregate\")"
+ ".otherwise().to(\"bean:gadgetInventory\").to(\"seda:aggregate\")"
+ ".end()";
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/CovertBodyDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/CovertBodyDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/CovertBodyDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/CovertBodyDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,15 +24,13 @@
public void testConvertBody() throws Exception {
String dsl = "from(\"direct:start\").convertBodyTo(Integer.class).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").convertBodyTo(java.lang.Integer.class).to(\"mock:result\")";
+ String expected = "from(\"direct:start\").convertBodyTo(java.lang.Integer.class).to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testConvertBodyWithEncoding() throws Exception {
String dsl = "from(\"direct:start\").convertBodyTo(byte[].class, \"iso-8859-1\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, 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=804720&r1=804719&r2=804720&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 Sun Aug 16 17:09:44 2009
@@ -24,22 +24,22 @@
public void testDeadLetterWithDefaultRedeliverDelay() throws Exception {
String dsl = "errorHandler(deadLetterChannel(\"mock:failed\").maximumRedeliveries(0).handled(false));from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(0).redeliverDelay(1000).handled(false));from(\"direct:start\").to(\"mock:result\")";
+ String expected = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(0).redeliverDelay(1000).handled(false));from(\"direct:start\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testDeadLetterWithDefaultHandled() throws Exception {
String dsl = "errorHandler(deadLetterChannel(\"mock:failed\").maximumRedeliveries(3).redeliverDelay(5000));from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(true));from(\"direct:start\").to(\"mock:result\")";
+ String expected = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(true));from(\"direct:start\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testDeadLetterDSL() throws Exception {
String dsl = "errorHandler(deadLetterChannel(\"mock:failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(false));from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = "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\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DelayDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DelayDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DelayDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/DelayDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,22 +24,18 @@
public void testSimpleDelay() throws Exception {
String dsl = "from(\"direct:start\").delay(1000).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testDelayWithHeaderParameter() throws Exception {
String dsl = "from(\"direct:start\").delay(header(\"MyDelay\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
+ String expected = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testDelayWithHeaderMehtod() throws Exception {
String dsl = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/EnrichSetBodyDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/EnrichSetBodyDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/EnrichSetBodyDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/EnrichSetBodyDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,8 +24,6 @@
public void testEnricher() throws Exception {
String dsl = "from(\"direct:start\").setBody(body().append(\" World!\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/FilterDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/FilterDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/FilterDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/FilterDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,22 +24,16 @@
public void testFilterHeader() throws Exception {
String dsl = "from(\"direct:start\").filter(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testFilterBody() throws Exception {
String dsl = "from(\"direct:start\").filter(body().contains(\"World\")).to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testFilterMethod() throws Exception {
String dsl = "from(\"direct:start\").filter().method(\"myBean\", \"matches\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,29 +24,25 @@
public void testIntercept() throws Exception {
String dsl = "intercept().to(\"mock:intercepted\");from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptStop() throws Exception {
String dsl = "intercept().to(\"mock:intercepted\").stop();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptWhen() throws Exception {
String dsl = "intercept().when(body().contains(\"Hello\")).to(\"mock:intercepted\");from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- String expectedDSL = "intercept().choice().when(body().contains(\"Hello\")).to(\"mock:intercepted\").end();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
+ String expected = "intercept().choice().when(body().contains(\"Hello\")).to(\"mock:intercepted\").end();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testInterceptWhenStop() throws Exception {
String dsl = "intercept().when(body().contains(\"Hello\")).to(\"mock:intercepted\").stop();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- String expectedDSL = "intercept().choice().when(body().contains(\"Hello\")).to(\"mock:intercepted\").stop().end();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
+ String expected = "intercept().choice().when(body().contains(\"Hello\")).to(\"mock:intercepted\").stop().end();from(\"direct:start\").to(\"mock:foo\").to(\"mock:bar\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptFromDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptFromDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptFromDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptFromDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,63 +24,59 @@
public void testInterceptFromChoice() throws Exception {
String dsl = "interceptFrom().choice().when(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:b\").stop().end();from(\"direct:start\").to(\"mock:a\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptFromPredicateWithStop() throws Exception {
String dsl = "interceptFrom().when(header(\"usertype\").isEqualTo(\"test\")).stop();from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = "interceptFrom().choice().when(header(\"usertype\").isEqualTo(\"test\")).stop().end();from(\"direct:start\").to(\"mock:result\")";
+ String expected = "interceptFrom().choice().when(header(\"usertype\").isEqualTo(\"test\")).stop().end();from(\"direct:start\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
public void testInterceptFromToLog() throws Exception {
String dsl = "interceptFrom().to(\"log:received\");from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptFromUriRegex() throws Exception {
String dsl = "interceptFrom(\"seda:(bar|foo)\").to(\"mock:intercept\");"
+ "from(\"direct:start\").to(\"mock:result\");from(\"seda:bar\").to(\"mock:result\");"
+ "from(\"seda:foo\").to(\"mock:result\");from(\"seda:cheese\").to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"mock:result\");"
+ String expected = "from(\"direct:start\").to(\"mock:result\");"
+ "interceptFrom(\"seda:(bar|foo)\").to(\"mock:intercept\");from(\"seda:bar\").to(\"mock:result\");"
+ "interceptFrom(\"seda:(bar|foo)\").to(\"mock:intercept\");from(\"seda:foo\").to(\"mock:result\");"
+ "from(\"seda:cheese\").to(\"mock:result\")";
- assertEquals(expectedDSL, renderRoutes(dsl));
+ assertEquals(expected, renderRoutes(dsl));
}
public void testInterceptFromUriSimpleLog() throws Exception {
String dsl = "interceptFrom(\"seda:bar\").to(\"mock:bar\");"
+ "from(\"direct:start\").to(\"mock:first\").to(\"seda:bar\");"
+ "from(\"seda:bar\").to(\"mock:result\");from(\"seda:foo\").to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"mock:first\").to(\"seda:bar\");"
+ String expected = "from(\"direct:start\").to(\"mock:first\").to(\"seda:bar\");"
+ "interceptFrom(\"seda:bar\").to(\"mock:bar\");from(\"seda:bar\").to(\"mock:result\");"
+ "from(\"seda:foo\").to(\"mock:result\")";
- assertEquals(expectedDSL, renderRoutes(dsl));
+ assertEquals(expected, renderRoutes(dsl));
}
public void testInterceptFromUriWildcard() throws Exception {
String dsl = "interceptFrom(\"seda*\").to(\"mock:intercept\");"
+ "from(\"direct:start\").to(\"mock:result\");from(\"seda:bar\").to(\"mock:result\");"
+ "from(\"seda:foo\").to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"mock:result\");"
+ String expected = "from(\"direct:start\").to(\"mock:result\");"
+ "interceptFrom(\"seda*\").to(\"mock:intercept\");from(\"seda:bar\").to(\"mock:result\");"
+ "interceptFrom(\"seda*\").to(\"mock:intercept\");from(\"seda:foo\").to(\"mock:result\")";
- assertEquals(expectedDSL, renderRoutes(dsl));
+ assertEquals(expected, renderRoutes(dsl));
}
public void testInterceptFromWithPredicate() throws Exception {
String dsl = "interceptFrom().when(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:b\").stop();from(\"direct:start\").to(\"mock:a\")";
- String expectedDSL = "interceptFrom().choice().when(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:b\").stop().end();from(\"direct:start\").to(\"mock:a\")";
+ String expected = "interceptFrom().choice().when(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:b\").stop().end();from(\"direct:start\").to(\"mock:a\")";
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptSendToEndpointDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptSendToEndpointDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptSendToEndpointDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/InterceptSendToEndpointDSLTest.java Sun Aug 16 17:09:44 2009
@@ -25,38 +25,26 @@
public void testInterceptSendToEndpoint() throws Exception {
String dsl = "interceptSendToEndpoint(\"mock:foo\").to(\"mock:detour\").transform(constant(\"Bye World\"));"
+ "from(\"direct:first\").to(\"mock:bar\").to(\"mock:foo\").to(\"mock:result\")";
-
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptSendToEndpointDynamic() throws Exception {
String dsl = "interceptSendToEndpoint(\"file:*\").skipSendToOriginalEndpoint().to(\"mock:detour\");"
+ "from(\"direct:first\").to(\"file://foo\").to(\"file://bar\").to(\"mock:result\")";
-
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
public void testInterceptSendToEndpointInOnException() throws Exception {
String dsl = "onException(IOException.class).handled(true).to(\"mock:io\");"
+ "interceptSendToEndpoint(\"mock:io\").skipSendToOriginalEndpoint().to(\"mock:intercepted\");"
+ "from(\"direct:start\").to(\"mock:foo\").to(\"mock:result\")";
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
// TODO: fix this test!
public void fixmeTestInterceptSendToIssue() throws Exception {
String dsl = "interceptSendToEndpoint(\"direct:foo\").to(\"mock:foo\");"
+ "from(\"direct:start\").setHeader(Exchange.FILE_NAME, constant(\"hello.txt\")).to(\"direct:foo\")";
-
- String expectedDSL = dsl;
-
- assertEquals(expectedDSL, render(dsl));
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoadBalanceDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoadBalanceDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoadBalanceDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoadBalanceDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,24 +23,23 @@
public class LoadBalanceDSLTest extends GroovyRendererTestSupport {
public void testLoadBalanceRandom() throws Exception {
- String DSL = "from(\"direct:start\").loadBalance().random().to(\"mock:x\", \"mock:y\", \"mock:z\")";
- String expectedDSL = "from(\"direct:start\").loadBalance().random().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
+ String dsl = "from(\"direct:start\").loadBalance().random().to(\"mock:x\", \"mock:y\", \"mock:z\")";
+ String expected = "from(\"direct:start\").loadBalance().random().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testLoadBalanceFailover() throws Exception {
- String DSL = "from(\"direct:start\").loadBalance().failover(IOException.class).to(\"direct:x\", \"direct:y\")";
- String expectedDSL = "from(\"direct:start\").loadBalance().failover(IOException.class).to(\"direct:x\").to(\"direct:y\")";
+ String dsl = "from(\"direct:start\").loadBalance().failover(IOException.class).to(\"direct:x\", \"direct:y\")";
+ String expected = "from(\"direct:start\").loadBalance().failover(IOException.class).to(\"direct:x\").to(\"direct:y\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
- public void testLoadBalanceSticky() throws Exception {
- String DSL = "from(\"direct:start\").loadBalance().sticky(header(\"foo\")).to(\"mock:x\", \"mock:y\", \"mock:z\")";
- String expectedDSL = "from(\"direct:start\").loadBalance().sticky(header(\"foo\")).to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
+ public void testLoadBalanceSticky() throws Exception {
+ String dsl = "from(\"direct:start\").loadBalance().sticky(header(\"foo\")).to(\"mock:x\", \"mock:y\", \"mock:z\")";
+ String expected = "from(\"direct:start\").loadBalance().sticky(header(\"foo\")).to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoopDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoopDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoopDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/LoopDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,30 +23,26 @@
public class LoopDSLTest extends GroovyRendererTestSupport {
public void testSimpleLoop() throws Exception {
- String DSL = "from(\"direct:start\").loop(8).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").loop(8).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testLoopWithHeader() throws Exception {
- String DSL = "from(\"direct:start\").loop(header(\"loop\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").loop().header(\"loop\").to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").loop(header(\"loop\")).to(\"mock:result\")";
+ String expected = "from(\"direct:start\").loop().header(\"loop\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testLoopWithXPath() throws Exception {
- String DSL = "from(\"direct:start\").loop().xpath(\"/hello/@times\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").loop().xpath(\"/hello/@times\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testLoopWithEnd() throws Exception {
- String DSL = "from(\"direct:start\").loop(2).to(\"mock:result\").end().to(\"mock:last\")";
- String expectedDSL = "from(\"direct:start\").loop(2).to(\"mock:result\").to(\"mock:last\")";
+ String dsl = "from(\"direct:start\").loop(2).to(\"mock:result\").end().to(\"mock:last\")";
+ String expected = "from(\"direct:start\").loop(2).to(\"mock:result\").to(\"mock:last\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MarshalDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MarshalDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MarshalDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MarshalDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,16 +23,14 @@
public class MarshalDSLTest extends GroovyRendererTestSupport {
public void testMarshal() throws Exception {
- String DSL = "from(\"direct:start\").marshal().serialization().to(\"direct:marshalled\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").marshal().serialization().to(\"direct:marshalled\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(dsl, render(dsl));
}
public void testMultiFrom() throws Exception {
- String DSL = "from(\"direct:start\").unmarshal().serialization().to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").unmarshal().serialization().to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java Sun Aug 16 17:09:44 2009
@@ -24,8 +24,8 @@
public void testMulticast() throws Exception {
String DSL = "from(\"direct:a\").multicast().to(\"mock:x\", \"mock:y\", \"mock:z\")";
- String expectedDSL = "from(\"direct:a\").multicast().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
+ String expected = "from(\"direct:a\").multicast().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(DSL));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class NormalizerDSLTest extends GroovyRendererTestSupport {
public void testNormalizer() throws Exception {
- String DSL = "from(\"direct:start\").choice().when().xpath(\"/employee\").to(\"bean:normalizer?method=employeeToPerson\").when().xpath(\"/customer\").to(\"bean:normalizer?method=customerToPerson\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").choice().when().xpath(\"/employee\").to(\"bean:normalizer?method=employeeToPerson\").when().xpath(\"/customer\").to(\"bean:normalizer?method=customerToPerson\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,67 +23,53 @@
public class OnCompletionDSLTest extends GroovyRendererTestSupport {
public void testOnCompletionAndIntercept() throws Exception {
- String DSL = "intercept().to(\"mock:intercept\");from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "intercept().to(\"mock:intercept\");from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnCompletionAndInterceptAndOnException() throws Exception {
- String DSL = "intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");onException(Exception.class).to(\"mock:exception\");from(\"direct:start\").to(\"mock:result\")";
+ String dsl = "intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");onException(Exception.class).to(\"mock:exception\");from(\"direct:start\").to(\"mock:result\")";
// the order is changed
- String expectedDSL = "onException(Exception.class).to(\"mock:exception\");intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");from(\"direct:start\").to(\"mock:result\")";
+ String expected = "onException(Exception.class).to(\"mock:exception\");intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");from(\"direct:start\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testOnCompletionDSL() throws Exception {
- String DSL = "from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnCompletionGlobal() throws Exception {
- String DSL = "onCompletion().to(\"log:global\").to(\"mock:sync\");from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "onCompletion().to(\"log:global\").to(\"mock:sync\");from(\"direct:start\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnCompletionMoreGlobal() throws Exception {
- String DSL = "onCompletion().to(\"log:global\").to(\"mock:sync\");onCompletion().to(\"log:global\").to(\"mock:two\");onCompletion().onCompleteOnly().to(\"log:global\").to(\"mock:complete\");onCompletion().onFailureOnly().to(\"log:global\").to(\"mock:failure\");from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "onCompletion().to(\"log:global\").to(\"mock:sync\");onCompletion().to(\"log:global\").to(\"mock:two\");onCompletion().onCompleteOnly().to(\"log:global\").to(\"mock:complete\");onCompletion().onFailureOnly().to(\"log:global\").to(\"mock:failure\");from(\"direct:start\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnCompletionOnly() throws Exception {
- String DSL = "from(\"direct:start\").onCompletion().onCompleteOnly().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").onCompletion().onCompleteOnly().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnCompletionRouteScopeOverrideGlobalScope() throws Exception {
- String DSL = "onCompletion().to(\"log:global\").to(\"mock:global\");from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
+ String dsl = "onCompletion().to(\"log:global\").to(\"mock:global\");from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
// the global onCompletion is removed
- String expectedDSL = "from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
+ String expected = "from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testOnCompletionWhen() throws Exception {
- String DSL = "from(\"direct:start\").onCompletion().onWhen(body().contains(\"Hello\")).to(\"log:sync\").to(\"mock:sync\").end().to(\"log:original\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").onCompletion().onWhen(body().contains(\"Hello\")).to(\"log:sync\").to(\"mock:sync\").end().to(\"log:original\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testOnFailureOnly() throws Exception {
- String DSL = "from(\"direct:start\").onCompletion().onFailureOnly().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").onCompletion().onFailureOnly().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PipelineDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PipelineDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PipelineDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PipelineDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,16 +23,16 @@
public class PipelineDSLTest extends GroovyRendererTestSupport {
public void testPipeline1() throws Exception {
- String DSL = "from(\"direct:start\").pipeline(\"mock:x\", \"mock:y\", \"mock:z\", \"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"mock:x\").to(\"mock:y\").to(\"mock:z\").to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").pipeline(\"mock:x\", \"mock:y\", \"mock:z\", \"mock:result\")";
+ String expected = "from(\"direct:start\").to(\"mock:x\").to(\"mock:y\").to(\"mock:z\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testPipeline2() throws Exception {
- String DSL = "from(\"direct:start\").pipeline(\"bean:foo?method=hi\", \"bean:foo?method=kabom\").to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").to(\"bean:foo?method=hi\").to(\"bean:foo?method=kabom\").to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").pipeline(\"bean:foo?method=hi\", \"bean:foo?method=kabom\").to(\"mock:result\")";
+ String expected = "from(\"direct:start\").to(\"bean:foo?method=hi\").to(\"bean:foo?method=kabom\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RecipientListDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RecipientListDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RecipientListDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RecipientListDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,17 +23,12 @@
public class RecipientListDSLTest extends GroovyRendererTestSupport {
public void testSimpleRecipientList() throws Exception {
- String DSL = "from(\"direct:start\").recipientList(header(\"foo\"))";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").recipientList(header(\"foo\"))";
+ assertEquals(dsl, render(dsl));
}
public void testRecipientList() throws Exception {
- String DSL = "from(\"direct:start\").recipientList(header(\"recipientListHeader\").tokenize(\",\"))";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").recipientList(header(\"recipientListHeader\").tokenize(\",\"))";
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemoveHeaderDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemoveHeaderDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemoveHeaderDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemoveHeaderDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class RemoveHeaderDSLTest extends GroovyRendererTestSupport {
public void testRemoveHeader() throws Exception {
- String DSL = "from(\"direct:start\").setHeader(\"foo\").constant(\"bar\").to(\"mock:mid\").removeHeader(\"foo\").to(\"mock:end\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").setHeader(\"foo\").constant(\"bar\").to(\"mock:mid\").removeHeader(\"foo\").to(\"mock:end\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemovePropertyDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemovePropertyDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemovePropertyDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RemovePropertyDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class RemovePropertyDSLTest extends GroovyRendererTestSupport {
public void testRemoveProperty() throws Exception {
- String DSL = "from(\"direct:start\").setProperty(\"foo\").constant(\"bar\").to(\"mock:mid\").removeProperty(\"foo\").to(\"mock:end\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").setProperty(\"foo\").constant(\"bar\").to(\"mock:mid\").removeProperty(\"foo\").to(\"mock:end\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ResequenceDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ResequenceDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ResequenceDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ResequenceDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,16 +23,14 @@
public class ResequenceDSLTest extends GroovyRendererTestSupport {
public void testResequence() throws Exception {
- String DSL = "from(\"direct:start\").resequence(body()).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").resequence(body()).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testResequencer() throws Exception {
- String DSL = "from(\"direct:start\").resequencer(header(\"seqnum\")).stream().to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").resequence(header(\"seqnum\")).stream().to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").resequencer(header(\"seqnum\")).stream().to(\"mock:result\")";
+ String expected = "from(\"direct:start\").resequence(header(\"seqnum\")).stream().to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RollbackDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RollbackDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RollbackDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RollbackDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class RollbackDSLTest extends GroovyRendererTestSupport {
public void testRollback() throws Exception {
- String DSL = "from(\"direct:start\").choice().when(body().isNotEqualTo(\"ok\")).to(\"mock:rollback\").rollback(\"That do not work\").otherwise().to(\"mock:result\").end()";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").choice().when(body().isNotEqualTo(\"ok\")).to(\"mock:rollback\").rollback(\"That do not work\").otherwise().to(\"mock:result\").end()";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,24 +23,22 @@
public class RoutingSlipDSLTest extends GroovyRendererTestSupport {
public void testRoutingSlip() throws Exception {
- String DSL = "from(\"direct:a\").routingSlip(\"myHeader\").to(\"mock:end\")";
- String expectedDSL = "from(\"direct:a\").routingSlip(\"myHeader\", \",\").to(\"mock:end\")";
+ String dsl = "from(\"direct:a\").routingSlip(\"myHeader\").to(\"mock:end\")";
+ String expected = "from(\"direct:a\").routingSlip(\"myHeader\", \",\").to(\"mock:end\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testRoutingSlip1() throws Exception {
- String DSL = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\")";
- String expectedDSL = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\", \",\")";
+ String dsl = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\")";
+ String expected = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\", \",\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testRoutingSlip2() throws Exception {
- String DSL = "from(\"direct:c\").routingSlip(\"aRoutingSlipHeader\", \"#\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:c\").routingSlip(\"aRoutingSlipHeader\", \"#\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetBodyDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetBodyDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetBodyDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetBodyDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,16 +23,14 @@
public class SetBodyDSLTest extends GroovyRendererTestSupport {
public void testSetBody() throws Exception {
- String DSL = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\", \"mock:tap\")";
- String expectedDSL = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\").to(\"mock:tap\")";
+ String dsl = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\", \"mock:tap\")";
+ String expected = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\").to(\"mock:tap\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testEnricher() throws Exception {
- String DSL = "from(\"direct:start\").setBody(body().append(\" World!\")).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").setBody(body().append(\" World!\")).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetExchangePatternDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetExchangePatternDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetExchangePatternDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetExchangePatternDSLTest.java Sun Aug 16 17:09:44 2009
@@ -25,30 +25,24 @@
public class SetExchangePatternDSLTest extends GroovyRendererTestSupport {
public void testInOnly() throws Exception {
- String DSL = "from(\"direct:start\").inOnly(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").inOnly(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testInOut() throws Exception {
- String DSL = "from(\"direct:start\").inOut(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").inOut(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
- public void _testToExchangePattern() throws Exception {
- String DSL = "from(\"direct:start\").to(ExchangePattern.InOnly, \"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ // TODO: fix this test
+ public void fixmeTestToExchangePattern() throws Exception {
+ String dsl = "from(\"direct:start\").to(ExchangePattern.InOnly, \"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
- public void _testSetExchangepattern() throws Exception {
- String DSL = "from(\"direct:start\").setExchangePattern(ExchangePattern.InOnly).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ // TODO: fix this test
+ public void fixmeTestSetExchangepattern() throws Exception {
+ String dsl = "from(\"direct:start\").setExchangePattern(ExchangePattern.InOnly).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetHeaderDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetHeaderDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetHeaderDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetHeaderDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,23 +23,19 @@
public class SetHeaderDSLTest extends GroovyRendererTestSupport {
public void testSetHeaderConstant() throws Exception {
- String DSL = "from(\"direct:start\").setHeader(\"foo\", constant(\"ABC\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").setHeader(\"foo\").constant(\"ABC\").to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").setHeader(\"foo\", constant(\"ABC\")).to(\"mock:result\")";
+ String expected = "from(\"direct:start\").setHeader(\"foo\").constant(\"ABC\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testSetHeaderXPath() throws Exception {
- String DSL = "from(\"direct:start\").unmarshal().string().setHeader(\"foo\").xpath(\"/person[@name='James']/@city\", String.class).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").unmarshal().string().setHeader(\"foo\").xpath(\"/person[@name='James']/@city\", String.class).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testSetHeaders() throws Exception {
- String DSL = "from(\"direct:start\").setHeader(\"foo\").constant(\"ABC\").setHeader(\"value\").constant(\"DEF\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").setHeader(\"foo\").constant(\"ABC\").setHeader(\"value\").constant(\"DEF\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetPropertyDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetPropertyDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetPropertyDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SetPropertyDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,24 +23,19 @@
public class SetPropertyDSLTest extends GroovyRendererTestSupport {
public void testSetProperty() throws Exception {
- String DSL = "from(\"direct:start\").setProperty(\"foo\", constant(\"ABC\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").setProperty(\"foo\").constant(\"ABC\").to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").setProperty(\"foo\", constant(\"ABC\")).to(\"mock:result\")";
+ String expected = "from(\"direct:start\").setProperty(\"foo\").constant(\"ABC\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testSetPropertyXPath() throws Exception {
- String DSL = "from(\"direct:start\").unmarshal().string().setProperty(\"foo\").xpath(\"/person[@name='James']/@city\", String.class).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").unmarshal().string().setProperty(\"foo\").xpath(\"/person[@name='James']/@city\", String.class).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testSetPropertys() throws Exception {
- String DSL = "from(\"direct:start\").setProperty(\"foo\").constant(\"ABC\").setProperty(\"value\").constant(\"DEF\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").setProperty(\"foo\").constant(\"ABC\").setProperty(\"value\").constant(\"DEF\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SimpleDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SimpleDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SimpleDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SimpleDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,23 +23,19 @@
public class SimpleDSLTest extends GroovyRendererTestSupport {
public void testFromTo() throws Exception {
- String DSL = "from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testMultiFrom() throws Exception {
- String DSL = "from(\"direct:a\", \"direct:b\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:a\", \"direct:b\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testMultiTo() throws Exception {
- String DSL = "from(\"direct:a\", \"direct:b\").to(\"mock:a\", \"mock:b\")";
- String expectedDSL = "from(\"direct:a\", \"direct:b\").to(\"mock:a\").to(\"mock:b\")";
+ String dsl = "from(\"direct:a\", \"direct:b\").to(\"mock:a\", \"mock:b\")";
+ String expected = "from(\"direct:a\", \"direct:b\").to(\"mock:a\").to(\"mock:b\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SortDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SortDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SortDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SortDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class SortDSLTest extends GroovyRendererTestSupport {
public void testSort() throws Exception {
- String DSL = "from(\"direct:start\").sort(body().tokenize(\",\")).to(\"bean:MyServiceBean.processLine\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").sort(body().tokenize(\",\")).to(\"bean:MyServiceBean.processLine\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,31 +23,22 @@
public class SplitDSLTest extends GroovyRendererTestSupport {
public void testSplitStream() throws Exception {
- String DSL = "from(\"direct:start\").split(body().tokenize(\",\")).streaming().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").split(body().tokenize(\",\")).streaming().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testSplitTokenize() throws Exception {
- String DSL = "from(\"direct:start\").split(body(String.class).tokenize(\",\")).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").split(body(String.class).tokenize(\",\")).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testSplitMethod() throws Exception {
- String DSL = "from(\"direct:start\").split().method(\"mySplitterBean\", \"splitBody\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").split().method(\"mySplitterBean\", \"splitBody\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void _testSplitXPath() throws Exception {
- String DSL = "from(\"direct:start\").split(xpath(\"//foo/bar\")).convertBodyTo(String.class).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").split(xpath(\"//foo/bar\")).convertBodyTo(String.class).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StopDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StopDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StopDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StopDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,10 +23,10 @@
public class StopDSLTest extends GroovyRendererTestSupport {
public void testStop() throws Exception {
- String DSL = "from(\"direct:start\").choice().when(body().contains(\"Hello\")).to(\"mock:hello\").when(body().contains(\"Bye\")).to(\"mock:bye\").stop()"
- + ".otherwise().to(\"mock:other\").end().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").choice()"
+ + ".when(body().contains(\"Hello\")).to(\"mock:hello\")"
+ + ".when(body().contains(\"Bye\")).to(\"mock:bye\").stop()"
+ + ".otherwise().to(\"mock:other\").end().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StreamCachingDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StreamCachingDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StreamCachingDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/StreamCachingDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,10 +23,7 @@
public class StreamCachingDSLTest extends GroovyRendererTestSupport {
public void test() throws Exception {
- String DSL = "from(\"direct:start\").streamCaching().to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").streamCaching().to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ThrottleDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ThrottleDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ThrottleDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/ThrottleDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,17 +23,12 @@
public class ThrottleDSLTest extends GroovyRendererTestSupport {
public void testThrottle() throws Exception {
- String DSL = "from(\"direct:start\").throttle(100).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").throttle(100).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testThrottleWithTimePeriodMillis() throws Exception {
- String DSL = "from(\"direct:start\").throttle(3).timePeriodMillis(10000).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").throttle(3).timePeriodMillis(10000).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TracingDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TracingDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TracingDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TracingDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,9 @@
public class TracingDSLTest extends GroovyRendererTestSupport {
public void testTracePerRotueManual() throws Exception {
- String DSL = "from(\"direct:a\").tracing().streamCaching().to(\"mock:a\");from(\"direct:b\").noTracing().to(\"mock:b\");from(\"direct:c\").tracing().to(\"mock:c\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, renderRoutes(DSL));
+ String dsl = "from(\"direct:a\").tracing().streamCaching().to(\"mock:a\");"
+ + "from(\"direct:b\").noTracing().to(\"mock:b\");"
+ + "from(\"direct:c\").tracing().to(\"mock:c\")";
+ assertEquals(dsl, renderRoutes(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TransformDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TransformDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TransformDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/TransformDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,37 +23,31 @@
public class TransformDSLTest extends GroovyRendererTestSupport {
public void testTransformToConstant1() throws Exception {
- String DSL = "from(\"direct:start\").transform().constant(\"London\").to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").transform(constant(\"London\")).to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").transform().constant(\"London\").to(\"mock:result\")";
+ String expected = "from(\"direct:start\").transform(constant(\"London\")).to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testTransformToConstant2() throws Exception {
- String DSL = "from(\"direct:start\").transform(constant(\"London\")).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").transform(constant(\"London\")).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testTransformAppend() throws Exception {
- String DSL = "from(\"direct:start\").transform(body().append(\" World!\")).to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").transform(body().append(\" World!\")).to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testTransformSendTo() throws Exception {
- String DSL = "from(\"direct:start\").transform(sendTo(\"direct:foo\")).to(\"mock:result\")";
- String expectedDSL = "from(\"direct:start\").transform(to(\"direct:foo\")).to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").transform(sendTo(\"direct:foo\")).to(\"mock:result\")";
+ String expected = "from(\"direct:start\").transform(to(\"direct:foo\")).to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expected, render(dsl));
}
public void testTransformXpath() throws Exception {
- String DSL = "from(\"direct:start\").transform().xpath(\"//students/student\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").transform().xpath(\"//students/student\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/WireTapDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/WireTapDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/WireTapDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/WireTapDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,16 +23,12 @@
public class WireTapDSLTest extends GroovyRendererTestSupport {
public void testWireTap1() throws Exception {
- String DSL = "from(\"direct:start\").to(\"log:foo\").wireTap(\"direct:tap\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").to(\"log:foo\").wireTap(\"direct:tap\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
public void testWireTap2() throws Exception {
- String DSL = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").delay(1000).setBody().constant(\"Tapped\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/XPathDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/XPathDSLTest.java?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/XPathDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/XPathDSLTest.java Sun Aug 16 17:09:44 2009
@@ -23,9 +23,7 @@
public class XPathDSLTest extends GroovyRendererTestSupport {
public void testXPath() throws Exception {
- String DSL = "from(\"direct:start\").filter().xpath(\"/person[@name='James']\").to(\"mock:result\")";
- String expectedDSL = DSL;
-
- assertEquals(expectedDSL, render(DSL));
+ String dsl = "from(\"direct:start\").filter().xpath(\"/person[@name='James']\").to(\"mock:result\")";
+ assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/resources/log4j.properties?rev=804720&r1=804719&r2=804720&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-web/src/test/resources/log4j.properties Sun Aug 16 17:09:44 2009
@@ -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=WARN, out
log4j.logger.org.springframework=WARN
#log4j.logger.org.apache.camel=DEBUG