svn commit: r692607 - in /activemq/camel/trunk/components/camel-script/src: main/java/org/apache/camel/builder/script/ test/java/org/apache/camel/builder/script/

[ni...@apache.org]

Author: ningjiang
Date: Fri Sep  5 20:09:41 2008
New Revision: 692607

URL: http://svn.apache.org/viewvc?rev=692607&view=rev
Log:
CAMEL-880 fixed the ScriptBuilder's always ensuers the outMessage is not Null issue

Modified:
    activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
    activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
    activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java

Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=692607&r1=692606&r2=692607&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Fri Sep  5 20:09:41 2008
@@ -523,7 +523,7 @@
         context.setAttribute("context", exchange.getContext(), scope);
         context.setAttribute("exchange", exchange, scope);
         context.setAttribute("request", exchange.getIn(), scope);
-        context.setAttribute("response", exchange.getOut(), scope);
+        context.setAttribute("response", exchange.getOut(false), scope);
     }
 
     protected InputStreamReader createScriptReader() throws IOException {

Modified: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java?rev=692607&r1=692606&r2=692607&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java Fri Sep  5 20:09:41 2008
@@ -17,7 +17,6 @@
 package org.apache.camel.builder.script;
 
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.builder.RouteBuilder;
 import static org.apache.camel.builder.script.ScriptBuilder.groovy;
 

Modified: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java?rev=692607&r1=692606&r2=692607&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java (original)
+++ activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java Fri Sep  5 20:09:41 2008
@@ -20,7 +20,9 @@
 import java.util.Map;
 
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * Tests a routing expression using JavaScript
@@ -30,13 +32,16 @@
         // Currently, this test fails because the JavaScript expression in createRouteBuilder
         // below returns false
         // To fix that, we need to figure out how to get the expression to return the right value
-        getMockEndpoint("mock:result").expectedMessageCount(1);
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
         getMockEndpoint("mock:unmatched").expectedMessageCount(0);
 
         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");
         assertMockEndpointsSatisifed();
     }
 
@@ -55,7 +60,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("direct:start").choice().
-                        when().javaScript("request.headers.get('foo') == 'bar'").to("mock:result")
+                        when().javaScript("request.headers.get('foo') == 'bar'").to("log:info?showAll=true").to("mock:result")
                         .otherwise().to("mock:unmatched");
             }
         };