svn commit: r995371 - /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java

[da...@apache.org]

Author: davsclaus
Date: Thu Sep  9 10:33:04 2010
New Revision: 995371

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

Added:
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java
      - copied, changed from r993608, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java

Copied: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java (from r993608, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java?p2=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java&r1=993608&r2=995371&rev=995371&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java Thu Sep  9 10:33:04 2010
@@ -20,8 +20,6 @@ import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -30,38 +28,34 @@ import static org.apache.camel.component
 /**
  * @version $Revision$
  */
-public class JmsSelectorTest extends CamelTestSupport {
+public class ConsumerTemplateJmsSelectorTest extends CamelTestSupport {
 
     @Test
     public void testJmsSelector() throws Exception {
-        MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
-        String expectedBody = "Hello there!";
-        String expectedBody2 = "Goodbye!";
+        template.sendBodyAndHeader("activemq:foo", "Hello World", "foo", "123");
+        template.sendBodyAndHeader("activemq:foo", "Bye World", "foo", "456");
 
-        resultEndpoint.expectedBodiesReceived(expectedBody2);
-        resultEndpoint.message(0).header("cheese").isEqualTo("y");
+        String body = consumer.receiveBody("activemq:foo?selector=foo='456'", 5000, String.class);
+        assertEquals("Bye World", body);
 
-        template.sendBodyAndHeader("activemq:test.a", expectedBody, "cheese", "x");
-        template.sendBodyAndHeader("activemq:test.a", expectedBody2, "cheese", "y");
-
-        resultEndpoint.assertIsSatisfied();
+        body = consumer.receiveBody("activemq:foo", 5000, String.class);
+        assertEquals("Hello World", body);
     }
 
     protected CamelContext createCamelContext() throws Exception {
+        deleteDirectory("activemq-data");
+
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false&broker.useJmx=false");
+        // must be persistent to rember the messages
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=true&broker.useJmx=false");
         JmsComponent component = jmsComponentTransacted(connectionFactory);
         camelContext.addComponent("activemq", component);
         return camelContext;
     }
 
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                from("activemq:test.a").to("activemq:test.b");
-                from("activemq:test.b?selector=cheese='y'").to("mock:result");
-            }
-        };
+    @Override
+    public boolean isUseRouteBuilder() {
+        return false;
     }
 }
\ No newline at end of file