Author: davsclaus
Date: Wed Nov 23 15:46:13 2011
New Revision: 1205460
URL: http://svn.apache.org/viewvc?rev=1205460&view=rev
Log:
Added test based on user forum issue
Added:
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
- copied, changed from r1205392,
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
Added:
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java?rev=1205460&view=auto
==============================================================================
---
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
(added)
+++
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
Wed Nov 23 15:46:13 2011
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.groovy;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class GroovyListMapTest extends CamelTestSupport {
+
+ @Test
+ public void testSendMatchingMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ List<Map<String, Object>> grid = new ArrayList<Map<String, Object>>();
+ Map<String, Object> cells = new LinkedHashMap<String, Object>();
+ cells.put("foo", "bar");
+ grid.add(cells);
+
+ sendBody("direct:start", grid);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:start")
+ .filter().groovy("request.body.get(0).get('foo') == 'bar'")
+ .to("mock:result");
+ }
+ };
+ }
+}
Added:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java?rev=1205460&view=auto
==============================================================================
---
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
(added)
+++
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
Wed Nov 23 15:46:13 2011
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder.script;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.ScriptTestHelper;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * Tests a routing expression using Groovy
+ */
+public class GroovyExpressionListMapTest extends CamelTestSupport {
+
+ @Test
+ public void testSendMatchingMessage() throws Exception {
+ if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
+ return;
+ }
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ List<Map<String, Object>> grid = new ArrayList<Map<String, Object>>();
+ Map<String, Object> cells = new LinkedHashMap<String, Object>();
+ cells.put("foo", "bar");
+ grid.add(cells);
+
+ sendBody("direct:start", grid);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:start")
+ .filter().groovy("request.body.get(0).get('foo') == 'bar'")
+ .to("mock:result");
+ }
+ };
+ }
+}
Copied:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
(from r1205392,
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java?p2=camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java&p1=camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java&r1=1205392&r2=1205460&rev=1205460&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
(original)
+++
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
Wed Nov 23 15:46:13 2011
@@ -16,7 +16,9 @@
*/
package org.apache.camel.builder.script;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import org.apache.camel.ScriptTestHelper;
@@ -28,7 +30,7 @@ import org.junit.Test;
/**
* Tests a routing expression using JavaScript
*/
-public class JavaScriptExpressionTest extends CamelTestSupport {
+public class JavaScriptExpressionListMapTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
@@ -39,110 +41,12 @@ public class JavaScriptExpressionTest ex
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- getMockEndpoint("mock:unmatched").expectedMessageCount(0);
+ List<Map<String, Object>> grid = new ArrayList<Map<String, Object>>();
+ Map<String, Object> cells = new LinkedHashMap<String, Object>();
+ cells.put("foo", "bar");
+ grid.add(cells);
- Map<String, Object> headers = new HashMap<String, Object>();
- headers.put("foo", "bar");
- sendBody("direct:start", "hello", headers);
-
- assertEquals("Should get the message header here",
mock.getExchanges().get(0).getIn().getHeader("foo"), "bar");
- assertMockEndpointsSatisfied();
- }
-
- @Test
- public void testSendNonMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:unmatched").expectedMessageCount(1);
-
- Map<String, Object> headers = new HashMap<String, Object>();
- headers.put("foo", "foo");
- sendBody("direct:start", "hello", headers);
-
- assertMockEndpointsSatisfied();
- }
-
- @Test
- // START SNIPPET: e1
- public void testArgumentsExample() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:unmatched").expectedMessageCount(1);
-
- // additional arguments to ScriptEngine
- Map<String, Object> arguments = new HashMap<String, Object>();
- arguments.put("foo", "bar");
- arguments.put("baz", 7);
-
- // those additional arguments is provided as a header on the Camel
Message
- template.sendBodyAndHeader("direct:start", "hello",
ScriptBuilder.ARGUMENTS, arguments);
-
- assertMockEndpointsSatisfied();
- }
- // END SNIPPET: e1
-
- @Test
- public void testArgumentsWithStringMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:unmatched").expectedMessageCount(1);
-
- Map<String, Object> headers = new HashMap<String, Object>();
- Map<String, Object> arguments = new HashMap<String, Object>();
- arguments.put("foo", "bar");
- arguments.put("baz", 7);
- arguments.put("", "foo");
- arguments.put(null, "bar");
- headers.put(ScriptBuilder.ARGUMENTS, arguments);
-
- sendBody("direct:start", "hello", headers);
-
- assertMockEndpointsSatisfied();
- }
-
- @Test
- public void testArgumentsWithIntegerMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:unmatched").expectedMessageCount(1);
-
- Map<String, Object> headers = new HashMap<String, Object>();
- Map<Integer, Object> arguments = new HashMap<Integer, Object>();
- arguments.put(0, "bar");
- arguments.put(1, 7);
- headers.put(ScriptBuilder.ARGUMENTS, arguments);
-
- sendBody("direct:start", "hello", headers);
-
- assertMockEndpointsSatisfied();
- }
-
- @Test
- public void testArgumentsWithNonMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:unmatched").expectedMessageCount(1);
-
- Map<String, Object> headers = new HashMap<String, Object>();
- String arguments = "foo";
- headers.put(ScriptBuilder.ARGUMENTS, arguments);
-
- sendBody("direct:start", "hello", headers);
+ sendBody("direct:start", grid);
assertMockEndpointsSatisfied();
}
@@ -150,9 +54,9 @@ public class JavaScriptExpressionTest ex
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").choice().
- when().javaScript("request.headers.get('foo') ==
'bar'").to("log:info?showAll=true").to("mock:result")
- .otherwise().to("mock:unmatched");
+ from("direct:start")
+ .filter().javaScript("request.body.get(0).get('foo') ==
'bar'")
+ .to("mock:result");
}
};
}