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 18:29:02 UTC
svn commit: r804713 - in /camel/trunk/components/camel-web/src:
main/java/org/apache/camel/web/resources/
main/java/org/apache/camel/web/util/ test/java/org/apache/camel/web/groovy/
Author: hadrian
Date: Sun Aug 16 16:29:02 2009
New Revision: 804713
URL: http://svn.apache.org/viewvc?rev=804713&view=rev
Log:
More checkstyle fixes.
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
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/GroovyRendererTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.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
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=804713&r1=804712&r2=804713&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java Sun Aug 16 16:29:02 2009
@@ -119,7 +119,7 @@
} else if (language.equalsIgnoreCase(LANGUAGE_GROOVY)) {
StringBuilder buffer = new StringBuilder();
GroovyRenderer.renderRoute(buffer, route);
- return GroovyRenderer.HEADER + buffer.toString() + GroovyRenderer.footer;
+ return GroovyRenderer.HEADER + buffer.toString() + GroovyRenderer.FOOTER;
} else {
return "Unsupported language!";
}
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java?rev=804713&r1=804712&r2=804713&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java Sun Aug 16 16:29:02 2009
@@ -31,7 +31,7 @@
public final class GroovyRenderer {
public static final String HEADER = "import org.apache.camel.language.groovy.GroovyRouteBuilder;\nclass GroovyRoute extends GroovyRouteBuilder {\nvoid configure() {\n";
- public static final String footer = "\n}\n}";
+ public static final String FOOTER = "\n}\n}";
private GroovyRenderer() {
// Utility class, no public or protected default constructor
@@ -107,5 +107,4 @@
}
}
}
-
}
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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,45 +23,55 @@
public class AOPDSLTest extends GroovyRendererTestSupport {
public void testAOPAfter() throws Exception {
- String DSL = "from(\"direct:start\").aop().after(\"mock:after\").transform(constant(\"Bye World\")).to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").aop().after(\"mock:after\").transform(constant(\"Bye World\")).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
- public void _testAOPAfterFinally() throws Exception {
- String DSL = "from(\"direct:start\").aop().afterFinally(\"mock:after\").choice().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;
+ // TODO: fix this test!
+ public void fixmeTestAOPAfterFinally() throws Exception {
+ String dsl = "from(\"direct:start\").aop().afterFinally(\"mock:after\").choice()"
+ + ".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(expectedDSL, 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;
+ 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(expectedDSL, render(dsl));
}
- public void _testAOPAroundFinally() throws Exception {
- String DSL = "from(\"direct:start\").aop().aroundFinally(\"mock:before\", \"mock:after\").choice().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;
+ // TODO: fix this test!
+ public void fixmeTestAOPAroundFinally() throws Exception {
+ String dsl = "from(\"direct:start\").aop().aroundFinally(\"mock:before\", \"mock:after\").choice()"
+ + ".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(expectedDSL, 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;
+ String dsl = "from(\"direct:start\").aop().before(\"mock:before\").transform(constant(\"Bye World\")).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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\").transform(constant(\"Bye\")).to(\"mock:middle\").transform(body().append(\" World\")).transform(body().prepend(\"Bye \")).to(\"mock:result\")";
+ 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\")"
+ + ".transform(constant(\"Bye\")).to(\"mock:middle\").transform(body().append(\" World\")).transform(body().prepend(\"Bye \")).to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -17,7 +17,6 @@
package org.apache.camel.web.groovy;
-import org.apache.camel.CamelException;
/**
* a test case for aggregate DSL
@@ -25,55 +24,57 @@
public class AggregateDSLTest extends GroovyRendererTestSupport {
public void testAggragate() throws Exception {
- String DSL = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testAggragateCommon() throws Exception {
- String DSL = "from(\"direct:start\").aggregate(header(\"cheese\")).to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").aggregate(header(\"cheese\")).to(\"mock:result\")";
String expectedDSL = "from(\"direct:start\").aggregate().header(\"cheese\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testAggregateGroupedExchange() throws Exception {
- String DSL = "from(\"direct:start\").aggregate().simple(\"id\").batchTimeout(500L).groupExchanges().to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").aggregate().simple(\"id\").batchTimeout(500L).groupExchanges().to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testAggregateTimeoutOnly() throws Exception {
- String DSL = "from(\"direct:start\").aggregate(header(\"id\")).batchTimeout(3000).batchSize(0).to(\"mock:result\")";
+ 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));
+ assertEquals(expectedDSL, render(dsl));
}
/**
* a route involving a external class: CamelException
*
* @throws Exception
+ * TODO: fix this test!
*/
- 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 expectedDSL = DSL;
+ public void fimeTestAggregateAndOnException() 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(expectedDSL, render(dsl));
}
/**
* a set of routes that uses aggregate DSL
*
* @throws Exception
+ * TODO: fix this test!
*/
- public void _testAggregateTimerAndTracer() 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;
+ 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(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,37 +23,37 @@
public class ChoiceDSLTest extends GroovyRendererTestSupport {
public void testChoiceWithMethod() throws Exception {
- String DSL = "from(\"direct:start\").choice()" +
- ".when().method(\"controlBean\", \"isDetour\").to(\"mock:detour\")" +
- ".end()" +
- ".to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").choice()"
+ + ".when().method(\"controlBean\", \"isDetour\").to(\"mock:detour\")"
+ + ".end()"
+ + ".to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testChoiceWithPredication() throws Exception {
- String DSL = "from(\"direct:start\").choice()" +
- ".when(header(\"username\").isNull()).to(\"mock:god\")" +
- ".when(header(\"admin\").isEqualTo(\"true\")).to(\"mock:admin\")" +
- ".otherwise().to(\"mock:guest\")" +
- ".end()";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").choice()"
+ + ".when(header(\"username\").isNull()).to(\"mock:god\")"
+ + ".when(header(\"admin\").isEqualTo(\"true\")).to(\"mock:admin\")"
+ + ".otherwise().to(\"mock:guest\")"
+ + ".end()";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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\")";
+ 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()" +
- ".when().method(\"orderItemHelper\", \"isWidget\").to(\"bean:widgetInventory\").to(\"seda:aggregate\")" +
- ".otherwise().to(\"bean:gadgetInventory\").to(\"seda:aggregate\")" +
- ".end()";
+ String expectedDSL = "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(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,16 +23,16 @@
public class CovertBodyDSLTest extends GroovyRendererTestSupport {
public void testConvertBody() throws Exception {
- String DSL = "from(\"direct:start\").convertBodyTo(Integer.class).to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").convertBodyTo(Integer.class).to(\"mock:result\")";
String expectedDSL = "from(\"direct:start\").convertBodyTo(java.lang.Integer.class).to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testConvertBodyWithEncoding() throws Exception {
- String DSL = "from(\"direct:start\").convertBodyTo(byte[].class, \"iso-8859-1\").to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").convertBodyTo(byte[].class, \"iso-8859-1\").to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,23 +23,23 @@
public class DeadLetterDSLTest extends GroovyRendererTestSupport {
public void testDeadLetterWithDefaultRedeliverDelay() throws Exception {
- String DSL = "errorHandler(deadLetterChannel(\"mock:failed\").maximumRedeliveries(0).handled(false));from(\"direct:start\").to(\"mock:result\")";
+ 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
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));from(\"direct:start\").to(\"mock:result\")";
String expectedDSL = "errorHandler(deadLetterChannel(\"mock://failed\").maximumRedeliveries(3).redeliverDelay(5000).handled(true));from(\"direct:start\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,23 +23,23 @@
public class DelayDSLTest extends GroovyRendererTestSupport {
public void testSimpleDelay() throws Exception {
- String DSL = "from(\"direct:start\").delay(1000).to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").delay(1000).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testDelayWithHeaderParameter() throws Exception {
- String DSL = "from(\"direct:start\").delay(header(\"MyDelay\")).to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").delay(header(\"MyDelay\")).to(\"mock:result\")";
String expectedDSL = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testDelayWithHeaderMehtod() throws Exception {
- String DSL = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").delay().header(\"MyDelay\").to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,9 +23,9 @@
public class EnrichSetBodyDSLTest extends GroovyRendererTestSupport {
public void testEnricher() throws Exception {
- String DSL = "from(\"direct:start\").setBody(body().append(\" World!\")).to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").setBody(body().append(\" World!\")).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,23 +23,23 @@
public class FilterDSLTest extends GroovyRendererTestSupport {
public void testFilterHeader() throws Exception {
- String DSL = "from(\"direct:start\").filter(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").filter(header(\"foo\").isEqualTo(\"bar\")).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testFilterBody() throws Exception {
- String DSL = "from(\"direct:start\").filter(body().contains(\"World\")).to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").filter(body().contains(\"World\")).to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testFilterMethod() throws Exception {
- String DSL = "from(\"direct:start\").filter().method(\"myBean\", \"matches\").to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "from(\"direct:start\").filter().method(\"myBean\", \"matches\").to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTest.java?rev=804713&r1=804712&r2=804713&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTest.java Sun Aug 16 16:29:02 2009
@@ -20,9 +20,6 @@
import java.io.BufferedReader;
import java.io.FileReader;
-import org.apache.camel.Exchange;
-import org.apache.camel.processor.aggregate.AggregationStrategy;
-
/**
* Test for GroovyRenderer
*/
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java?rev=804713&r1=804712&r2=804713&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java Sun Aug 16 16:29:02 2009
@@ -17,30 +17,28 @@
package org.apache.camel.web.groovy;
-import groovy.lang.GroovyClassLoader;
-
import java.util.List;
import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.web.util.GroovyRenderer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import groovy.lang.GroovyClassLoader;
+
/**
* An abstract class that provides basic support for GroovyRenderer test
*/
public abstract class GroovyRendererTestSupport extends TestCase {
-
- public final Log LOG = LogFactory.getLog(GroovyRendererTestSupport.class);
-
+ private final static Log LOG = LogFactory.getLog(GroovyRendererTestSupport.class);
+
private final String header = GroovyRenderer.HEADER;
-
- private final String footer = GroovyRenderer.footer;
+ private final String footer = GroovyRenderer.FOOTER;
private CamelContext context;
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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,31 +23,30 @@
public class InterceptDSLTest extends GroovyRendererTestSupport {
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;
+ 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(expectedDSL, 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;
+ 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(expectedDSL, 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 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,57 +23,64 @@
public class InterceptFromDSLTest extends GroovyRendererTestSupport {
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;
+ 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(expectedDSL, render(dsl));
}
public void testInterceptFromPredicateWithStop() throws Exception {
- String DSL = "interceptFrom().when(header(\"usertype\").isEqualTo(\"test\")).stop();from(\"direct:start\").to(\"mock:result\")";
+ 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, render(dsl));
}
public void testInterceptFromToLog() throws Exception {
- String DSL = "interceptFrom().to(\"log:received\");from(\"direct:start\").to(\"mock:result\")";
- String expectedDSL = DSL;
+ String dsl = "interceptFrom().to(\"log:received\");from(\"direct:start\").to(\"mock:result\")";
+ String expectedDSL = dsl;
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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\");" +
- "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\")";
+ 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\");"
+ + "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(expectedDSL, 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\");interceptFrom(\"seda:bar\").to(\"mock:bar\");from(\"seda:bar\").to(\"mock:result\");from(\"seda:foo\").to(\"mock:result\")";
+ 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\");"
+ + "interceptFrom(\"seda:bar\").to(\"mock:bar\");from(\"seda:bar\").to(\"mock:result\");"
+ + "from(\"seda:foo\").to(\"mock:result\")";
- assertEquals(expectedDSL, renderRoutes(DSL));
+ assertEquals(expectedDSL, 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\");" +
- "interceptFrom(\"seda*\").to(\"mock:intercept\");from(\"seda:bar\").to(\"mock:result\");" +
- "interceptFrom(\"seda*\").to(\"mock:intercept\");from(\"seda:foo\").to(\"mock:result\")";
+ 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\");"
+ + "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(expectedDSL, 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 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\")";
- assertEquals(expectedDSL, render(DSL));
+ assertEquals(expectedDSL, 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=804713&r1=804712&r2=804713&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 16:29:02 2009
@@ -23,31 +23,40 @@
public class InterceptSendToEndpointDSLTest extends GroovyRendererTestSupport {
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;
+ 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(expectedDSL, 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;
+ 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(expectedDSL, 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;
+ 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(expectedDSL, render(dsl));
}
- public void _testInterceptSendToIssue() 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;
+ // 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(expectedDSL, render(dsl));
}
}