svn commit: r1408242 - in /camel/trunk/camel-core/src/test: java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java resources/org/apache/camel/component/properties/myproperties.properties

[da...@apache.org]

Author: davsclaus
Date: Mon Nov 12 10:23:17 2012
New Revision: 1408242

URL: http://svn.apache.org/viewvc?rev=1408242&view=rev
Log:
Added test based on user forum issue

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java
      - copied, changed from r1408176, camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java
Modified:
    camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java (from r1408176, camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java&r1=1408176&r2=1408242&rev=1408242&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java Mon Nov 12 10:23:17 2012
@@ -19,34 +19,22 @@ package org.apache.camel.component.prope
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * @version 
  */
-public class PropertiesComponentEIPChoiceConvertBodyToTest extends ContextTestSupport {
+public class PropertiesComponentEIPChoiceSimpleTest extends ContextTestSupport {
 
-    public void testConvertToBytesCharset() throws Exception {
-        byte[] body = "Hello World".getBytes("iso-8859-1");
-
-        getMockEndpoint("mock:null").expectedMessageCount(0);
-        MockEndpoint result = getMockEndpoint("mock:result");
-        result.expectedBodiesReceived(body);
+    public void testChoice() throws Exception {
+        getMockEndpoint("mock:camel").expectedBodiesReceived("Hello Camel");
+        getMockEndpoint("mock:other").expectedBodiesReceived("Hello World");
 
+        template.sendBody("direct:start", "Hello Camel");
         template.sendBody("direct:start", "Hello World");
 
         assertMockEndpointsSatisfied();
     }
 
-    public void testNullBody() throws Exception {
-        getMockEndpoint("mock:null").expectedMessageCount(1);
-        getMockEndpoint("mock:result").expectedMessageCount(0);
-
-        template.sendBody("direct:start", null);
-
-        assertMockEndpointsSatisfied();
-    }
-
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
@@ -54,11 +42,10 @@ public class PropertiesComponentEIPChoic
             public void configure() throws Exception {
                 from("direct:start")
                     .choice()
-                        .when(body().isNotNull())
-                            .convertBodyTo(byte[].class, "{{myCoolCharset}}")
-                            .to("mock:result")
+                        .when(simple("${body} contains '${properties:cool.name}'"))
+                            .to("mock:camel")
                         .otherwise()
-                            .to("mock:null");
+                            .to("mock:other");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties?rev=1408242&r1=1408241&r2=1408242&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties Mon Nov 12 10:23:17 2012
@@ -20,6 +20,7 @@ cool.result=result
 cool.concat=mock:{{cool.result}}
 cool.start=direct:cool
 cool.showid=true
+cool.name=Camel
 
 # circular reference test
 cool.a={{cool.b}}
@@ -31,4 +32,5 @@ cool.mock=mock
 myCoolCharset=iso-8859-1
 slipDelimiter=##
 
-stop=true
\ No newline at end of file
+stop=true
+