Author: davsclaus
Date: Thu Aug 11 14:10:32 2011
New Revision: 1156623

URL: http://svn.apache.org/viewvc?rev=1156623&view=rev
Log:
Fixed CS. Added JMS consumer async test.

Added:
    
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/SpringTestEndpointTest.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
 Thu Aug 11 14:10:32 2011
@@ -285,7 +285,7 @@ public abstract class ScheduledPollConsu
         // resume or start our self
         if (!ServiceHelper.resumeService(this)) {
             ServiceHelper.startService(this);
-        };
+        }
 
         // ensure at least timeout is as long as one poll delay
         return Math.max(timeout, getDelay());

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java 
(original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java 
Thu Aug 11 14:10:32 2011
@@ -16,15 +16,27 @@
  */
 package org.apache.camel.language;
 
-import org.apache.camel.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.CamelAuthorizationException;
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.ExpressionIllegalSyntaxException;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.LanguageTestSupport;
 import org.apache.camel.component.bean.MethodNotFoundException;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.language.bean.RuntimeBeanExpressionException;
 import org.apache.camel.language.simple.SimpleLanguage;
 import org.apache.camel.spi.Language;
 
-import java.util.*;
-
 /**
  * @version 
  */

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 Thu Aug 11 14:10:32 2011
@@ -381,11 +381,11 @@ public class JmsConfiguration implements
 
     // Properties
     // 
-------------------------------------------------------------------------
-    
-    public ConsumerType getConsumerType(){
-       return consumerType;
+
+    public ConsumerType getConsumerType() {
+        return consumerType;
     }
-    
+
     public void setConsumerType(ConsumerType consumerType) {
         this.consumerType = consumerType;
     }
@@ -895,8 +895,8 @@ public class JmsConfiguration implements
             DefaultMessageListenerContainer listenerContainer = 
(DefaultMessageListenerContainer) container;
             configureDefaultMessageListenerContainer(endpoint, 
listenerContainer);
         } else if (container instanceof SimpleMessageListenerContainer) {
-               SimpleMessageListenerContainer listenerContainer = 
(SimpleMessageListenerContainer) container;
-               configureSimpleMessageListenerContainer(listenerContainer); 
+            SimpleMessageListenerContainer listenerContainer = 
(SimpleMessageListenerContainer) container;
+            configureSimpleMessageListenerContainer(listenerContainer);
         }
     }
 

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 Thu Aug 11 14:10:32 2011
@@ -117,12 +117,12 @@ public class JmsEndpointConfigurationTes
     }
 
     @Test
-    public void testCreateSimpleMessageListener() throws Exception{
-        JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:Foo.Bar?consumerType=Simple");
-         JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);
+    public void testCreateSimpleMessageListener() throws Exception {
+        JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:Foo.Bar?consumerType=Simple");
+        JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);
 
-         AbstractMessageListenerContainer container = 
consumer.getListenerContainer();
-         assertTrue("Should have been a 
SimpleMessageListenerContainer",container instanceof 
SimpleMessageListenerContainer);
+        AbstractMessageListenerContainer container = 
consumer.getListenerContainer();
+        assertTrue("Should have been a SimpleMessageListenerContainer", 
container instanceof SimpleMessageListenerContainer);
     }
 
     @Test
@@ -178,9 +178,9 @@ public class JmsEndpointConfigurationTes
     
     @Test
     public void testInvalidMaxConcurrentConsumersForSimpleConsumer() throws 
Exception {
-       JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?concurrentConsumers=5&maxConcurrentConsumers=2&consumerType=Simple");
-        
-       try {
+        JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?concurrentConsumers=5&maxConcurrentConsumers=2&consumerType=Simple");
+
+        try {
             endpoint.createConsumer(new CamelLogger());
             fail("Should have thrown exception");
         } catch (IllegalArgumentException e) {
@@ -193,21 +193,21 @@ public class JmsEndpointConfigurationTes
         JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?concurrentConsumers=4");
         assertEquals(4, endpoint.getConcurrentConsumers());
     }
-    
+
     @Test
     public void testConcurrentConsumersForSimpleConsumer() throws Exception {
-       JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?concurrentConsumers=4&consumerType=Simple");
-        
+        JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?concurrentConsumers=4&consumerType=Simple");
+
         assertEquals(4, endpoint.getConcurrentConsumers());
     }
 
     @Test
-    public void testPubSubNoLocalForSimpleConsumer() throws Exception{
-       JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?pubSubNoLocal=true&consumerType=Simple");
-      
+    public void testPubSubNoLocalForSimpleConsumer() throws Exception {
+        JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?pubSubNoLocal=true&consumerType=Simple");
+
         assertTrue("PubSubNoLocal should be true", endpoint.isPubSubNoLocal());
     }
-    
+
     @Test
     public void testIdleTaskExecutionLimit() throws Exception {
         JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?idleTaskExecutionLimit=50");
@@ -221,7 +221,7 @@ public class JmsEndpointConfigurationTes
         assertEquals(51, endpoint.getIdleConsumerLimit());
         assertEquals(true, endpoint.isAutoStartup());
     }
-    
+
     @Test
     public void testLazyCreateTransactionManager() throws Exception {
         JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?lazyCreateTransactionManager=true");

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/SpringTestEndpointTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/SpringTestEndpointTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/SpringTestEndpointTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/SpringTestEndpointTest.java
 Thu Aug 11 14:10:32 2011
@@ -21,11 +21,11 @@ import org.apache.camel.CamelContext;
 import static 
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
- * @version 
+ * @version
  */
 public class SpringTestEndpointTest extends TestEndpointTest {
 
-   protected CamelContext createCamelContext() throws Exception {
+    protected CamelContext createCamelContext() throws Exception {
         return createSpringCamelContext(this, 
"org/apache/camel/component/test/SpringTestEndpointTest.xml");
     }
 

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
 Thu Aug 11 14:10:32 2011
@@ -25,7 +25,7 @@ import static org.apache.camel.spring.pr
  */
 public class SpringValidatorRouteTest extends ValidatorRouteTest {
 
-   protected CamelContext createCamelContext() throws Exception {
+    protected CamelContext createCamelContext() throws Exception {
         return createSpringCamelContext(this, 
"org/apache/camel/component/validator/camelContext.xml");
     }
 

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
 Thu Aug 11 14:10:32 2011
@@ -82,5 +82,5 @@ public class CxfBeanSpringRouteTest exte
         );
 
         return options;
-     }
+    }
 }

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java?rev=1156623&r1=1156622&r2=1156623&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
 Thu Aug 11 14:10:32 2011
@@ -37,7 +37,7 @@ import static org.ops4j.pax.swissbox.tin
 @RunWith(JUnit4TestRunner.class)
 public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport {
 
-     protected void doPostSetup() throws Exception {
+    protected void doPostSetup() throws Exception {
         getInstalledBundle("CxfBeanBlueprintRouterTest").start();
         getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CxfBeanBlueprintRouterTest)", 10000);
     }

Added: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java?rev=1156623&view=auto
==============================================================================
--- 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
 (added)
+++ 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
 Thu Aug 11 14:10:32 2011
@@ -0,0 +1,74 @@
+/**
+ * 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.itest.jms;
+
+import java.util.concurrent.TimeUnit;
+import javax.naming.Context;
+
+import org.apache.activemq.camel.component.ActiveMQComponent;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JmsJettyAsyncTest extends CamelTestSupport {
+
+    // TODO: When async jms consumer is implemented we can bump this value to 
1000
+    private int size = 10;
+
+    @Test
+    public void testJmsJettyAsyncTest() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(size);
+        getMockEndpoint("mock:result").expectsNoDuplicates(body());
+
+        for (int i = 0; i < size; i++) {
+            template.sendBody("activemq:queue:inbox", "" + i);
+        }
+
+        assertMockEndpointsSatisfied(2, TimeUnit.MINUTES);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("activemq:queue:inbox?synchronous=false")
+                    .to("jetty:http://0.0.0.0:9432/myapp";)
+                    .to("log:result?groupSize=10", "mock:result");
+
+                from("jetty:http://0.0.0.0:9432/myapp";)
+                    .delay(100)
+                    .transform(body().prepend("Bye "));
+            }
+        };
+    }
+
+    @Override
+    protected Context createJndiContext() throws Exception {
+        JndiContext answer = new JndiContext();
+
+        // add ActiveMQ with embedded broker
+        ActiveMQComponent amq = 
ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=false");
+        amq.setCamelContext(context);
+        answer.bind("activemq", amq);
+        return answer;
+    }
+}


Reply via email to