You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/02/28 10:43:45 UTC

svn commit: r1451158 - in /camel/trunk/components/camel-test-blueprint/src/test: java/org/apache/camel/test/blueprint/SimpleMockTest.java resources/log4j.properties resources/org/apache/camel/test/blueprint/simpleMockTest.xml

Author: davsclaus
Date: Thu Feb 28 09:43:45 2013
New Revision: 1451158

URL: http://svn.apache.org/r1451158
Log:
Added test

Added:
    camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleMockTest.java
      - copied, changed from r1451097, camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java
    camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/simpleMockTest.xml
      - copied, changed from r1451097, camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml
Modified:
    camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties

Copied: camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleMockTest.java (from r1451097, camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleMockTest.java?p2=camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleMockTest.java&p1=camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java&r1=1451097&r2=1451158&rev=1451158&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleMockTest.java Thu Feb 28 09:43:45 2013
@@ -16,48 +16,22 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-/**
- * Tests filtering using Camel Blueprint Test
- *
- */
-// START SNIPPET: example
-public class FilterTest extends CamelBlueprintTestSupport {
-
-    @EndpointInject(uri = "mock:result")
-    protected MockEndpoint resultEndpoint;
-
-    @Produce(uri = "direct:start")
-    protected ProducerTemplate template;
+public class SimpleMockTest extends CamelBlueprintTestSupport {
 
     @Override
     protected String getBlueprintDescriptor() {
-        return "org/apache/camel/test/blueprint/filterTest.xml";
+        return "org/apache/camel/test/blueprint/simpleMockTest.xml";
     }
 
     @Test
-    public void testSendMatchingMessage() throws Exception {
-        String expectedBody = "<matched/>";
-
-        resultEndpoint.expectedBodiesReceived(expectedBody);
+    public void testHelloWorld() throws Exception {
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBodyAndHeader(expectedBody, "foo", "bar");
+        template.sendBody("direct:start", "Hello World");
 
-        resultEndpoint.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
-    @Test
-    public void testSendNotMatchingMessage() throws Exception {
-        resultEndpoint.expectedMessageCount(0);
-
-        template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue");
-
-        resultEndpoint.assertIsSatisfied();
-    }
 }
-// END SNIPPET: example

Modified: camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1451158&r1=1451157&r2=1451158&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties Thu Feb 28 09:43:45 2013
@@ -25,6 +25,7 @@ log4j.rootLogger=INFO, file
 #log4j.logger.org.apache.camel=DEBUG
 #log4j.logger.org.apache.camel.blueprint=TRACE
 #log4j.logger.org.apache.camel.core.osgi=TRACE
+#log4j.logger.org.apache.aries.blueprint.container=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender

Copied: camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/simpleMockTest.xml (from r1451097, camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/simpleMockTest.xml?p2=camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/simpleMockTest.xml&p1=camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml&r1=1451097&r2=1451158&rev=1451158&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/simpleMockTest.xml Thu Feb 28 09:43:45 2013
@@ -15,23 +15,19 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- START SNIPPET: example -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="
              http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-  <camelContext id="filterCamel" xmlns="http://camel.apache.org/schema/blueprint">
+  <camelContext xmlns="http://camel.apache.org/schema/blueprint">
 
     <route>
       <from uri="direct:start"/>
-      <filter>
-        <simple>${header.foo} == 'bar'</simple>
-        <to uri="mock:result"/>
-      </filter>
+       <to uri="mock:result"/>
     </route>
 
   </camelContext>
 
 </blueprint>
-<!-- END SNIPPET: example -->
+