camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1057156 - in /camel/trunk/tests/camel-itest/src/test: java/org/apache/camel/itest/jetty/ resources/org/apache/camel/itest/jetty/
Date Mon, 10 Jan 2011 11:37:22 GMT
Author: davsclaus
Date: Mon Jan 10 11:37:21 2011
New Revision: 1057156

URL: http://svn.apache.org/viewvc?rev=1057156&view=rev
Log:
Enabled jetty producer tests as its async supported now.

Modified:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
Mon Jan 10 11:37:21 2011
@@ -20,17 +20,13 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-@Ignore
 public class JettyFailoverRoundRobinTest extends CamelTestSupport {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     private String bad = "jetty:http://localhost:8871/bad";
     private String bad2 = "jetty:http://localhost:8872/bad2";
     private String good = "jetty:http://localhost:8873/good";

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
Mon Jan 10 11:37:21 2011
@@ -23,8 +23,6 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.interceptor.Tracer;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -34,11 +32,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 
 @ContextConfiguration
-@Ignore
 public class JettyFileMulticastTest extends AbstractJUnit4SpringContextTests {
     
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     @Autowired
     protected CamelContext camelContext;
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
Mon Jan 10 11:37:21 2011
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -34,11 +33,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 
 @ContextConfiguration
-@Ignore
 public class JettyJmsTest extends AbstractJUnit4SpringContextTests {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     @Autowired
     protected CamelContext camelContext;
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
Mon Jan 10 11:37:21 2011
@@ -20,7 +20,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -30,11 +29,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 
 @ContextConfiguration
-@Ignore
 public class JettyJmsTwowayTest extends AbstractJUnit4SpringContextTests {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     @Autowired
     protected CamelContext camelContext;
 
@@ -51,6 +47,5 @@ public class JettyJmsTwowayTest extends 
         });
         assertEquals("get result ", "<response><hello>Willem</hello></response>",
exchange.getOut().getBody(String.class));
         template.stop();
-        Thread.sleep(2000);
     }
 }

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
Mon Jan 10 11:37:21 2011
@@ -20,7 +20,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -29,11 +28,8 @@ import org.springframework.test.context.
 import static org.junit.Assert.assertEquals;
 
 @ContextConfiguration
-@Ignore
 public class JettyMulticastJmsFileTest extends AbstractJUnit4SpringContextTests {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     @Autowired
     protected CamelContext camelContext;
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
Mon Jan 10 11:37:21 2011
@@ -25,17 +25,13 @@ import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-@Ignore
 public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     private String bad = "jetty:http://localhost:8871/bad";
     private String bad2 = "jetty:http://localhost:8872/bad2";
     private String good = "jetty:http://localhost:8873/good";

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
Mon Jan 10 11:37:21 2011
@@ -17,7 +17,6 @@
 package org.apache.camel.itest.jetty;
 
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -25,11 +24,8 @@ import org.springframework.context.suppo
 /**
  * @version $Revision$
  */
-@Ignore
 public class JettySpringFailoverRoundRobinTest extends CamelSpringTestSupport {
 
-    // TODO: Jetty async producer needs to be implemented before this test can pass
-
     @Override
     protected AbstractXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml");

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml?rev=1057156&r1=1057155&r2=1057156&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
Mon Jan 10 11:37:21 2011
@@ -17,7 +17,6 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd



Mime
View raw message