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 2009/06/10 08:21:02 UTC

svn commit: r783221 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/component/seda/ camel-core/src/test/java/org/apache/camel/processor/ components/camel-jetty/src/test/java/org/apache/camel/component/jetty/

Author: davsclaus
Date: Wed Jun 10 06:21:02 2009
New Revision: 783221

URL: http://svn.apache.org/viewvc?rev=783221&view=rev
Log:
Fixed some unit test reported by TC.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java?rev=783221&r1=783220&r2=783221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java Wed Jun 10 06:21:02 2009
@@ -39,6 +39,14 @@
         return false;
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        if (consumer != null) {
+            consumer.stop();
+        }
+    }
+
     private void sendMessagesToQueue() throws Exception {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.afterPropertiesSet();
@@ -55,7 +63,7 @@
                     }
                     template.sendBody("seda:queue", i);
                 }
-            };
+            }
         });
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=783221&r1=783220&r2=783221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java Wed Jun 10 06:21:02 2009
@@ -17,6 +17,8 @@
 package org.apache.camel.processor;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import org.apache.camel.Channel;
 import org.apache.camel.ContextTestSupport;
@@ -56,18 +58,20 @@
 
     public void testMultithreaded() throws Exception {
         int numMessages = 500;
-        Thread t1 = new Sender(context.createProducerTemplate(), 0, numMessages, 2);
-        Thread t2 = new Sender(context.createProducerTemplate(), 1, numMessages + 1, 2);
+
+        ExecutorService service = Executors.newFixedThreadPool(2);
+        service.execute(new Sender(context.createProducerTemplate(), 0, numMessages, 2));
+        service.execute(new Sender(context.createProducerTemplate(), 1, numMessages + 1, 2));
+
         Object[] bodies = new Object[numMessages];
         for (int i = 0; i < numMessages; i++) {
             bodies[i] = "msg" + i;
         }
+
         resultEndpoint.expectedBodiesReceived(bodies);
-        t1.start();
-        t2.start();
-        t1.join();
-        t2.join();
         resultEndpoint.assertIsSatisfied();
+
+        service.shutdown();
     }
     
     @Override
@@ -132,13 +136,13 @@
 
         @Override
         public void run() {
-            for (int i = start; i < end; i += increment) {
+            for (long i = start; i < end; i += increment) {
                 try {
                     Thread.sleep(2);
                 } catch (InterruptedException e) {
                     // ignore
                 }
-                template.sendBodyAndHeader("direct:start", "msg" + i, "seqnum", Long.valueOf(i));
+                template.sendBodyAndHeader("direct:start", "msg" + i, "seqnum", i);
             }
         }
         

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java?rev=783221&r1=783220&r2=783221&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java Wed Jun 10 06:21:02 2009
@@ -60,7 +60,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("jetty://http://0.0.0.0:9080/myservice")
+                from("jetty://http://localhost:9080/myservice")
                     // but we wait for 2 sec before reply is sent back
                     .delay(2000)
                     .transform().constant("Bye World").to("mock:result");