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 2010/04/10 14:08:38 UTC
svn commit: r932707 - in /camel/trunk/tests/camel-itest: ./ src/test/java/org/apache/camel/itest/http/ src/test/java/org/apache/camel/itest/issues/ src/test/resources/org/apache/camel/itest/http/

Author: davsclaus
Date: Sat Apr 10 12:08:37 2010
New Revision: 932707

URL: http://svn.apache.org/viewvc?rev=932707&view=rev
Log:
CAMEL-2608: Fixed camel-itest having camel-http and camel-http4 tests.

Added:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java   (contents, props changed)
      - copied, changed from r932699, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java   (contents, props changed)
      - copied, changed from r932699, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml   (contents, props changed)
      - copied, changed from r932699, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml   (contents, props changed)
      - copied, changed from r932699, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest-context.xml
Removed:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest-context.xml
Modified:
    camel/trunk/tests/camel-itest/pom.xml
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=932707&r1=932706&r2=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Sat Apr 10 12:08:37 2010
@@ -65,6 +65,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-http4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-jaxb</artifactId>
             <scope>test</scope>
         </dependency>

Copied: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java (from r932699, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java?p2=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java&p1=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java&r1=932699&r2=932707&rev=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java Sat Apr 10 12:08:37 2010
@@ -38,7 +38,7 @@ import org.springframework.test.context.
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 @ContextConfiguration
-public class HttpEndpointTest extends AbstractJUnit4SpringContextTests {
+public class Http4EndpointTest extends AbstractJUnit4SpringContextTests {
 
     @Autowired
     protected CamelContext camelContext;

Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java (from r932699, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java?p2=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java&p1=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java&r1=932699&r2=932707&rev=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java Sat Apr 10 12:08:37 2010
@@ -38,7 +38,7 @@ import org.springframework.test.context.
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 @ContextConfiguration
-public class HttpMaxConnectionPerHostTest extends
+public class Http4MaxConnectionPerHostTest extends
         AbstractJUnit4SpringContextTests {
 
     @Autowired

Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java?rev=932707&r1=932706&r2=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java Sat Apr 10 12:08:37 2010
@@ -38,7 +38,7 @@ public class JettyHttpTest extends Camel
     @Test
     public void testGetRootPath() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hi! /someservice");
+        mock.expectedBodiesReceived("Hi! /someservice/myservice");
 
         template.sendBody("direct:root", "");
 
@@ -48,7 +48,7 @@ public class JettyHttpTest extends Camel
     @Test
     public void testGetWithRelativePath() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hi! /someservice/relative");
+        mock.expectedBodiesReceived("Hi! /someservice/myservice/relative");
         
         template.sendBody("direct:relative", "");
         assertMockEndpointsSatisfied();

Copied: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml (from r932699, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml?p2=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml&p1=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml&r1=932699&r2=932707&rev=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml Sat Apr 10 12:08:37 2010
@@ -24,7 +24,7 @@
     ">
 
     <!-- START SNIPPET: e1 -->
-    <bean id="httpEndpoint" class="org.apache.camel.component.http.HttpEndpoint">
+    <bean id="httpEndpoint" class="org.apache.camel.component.http4.HttpEndpoint">
         <property name="httpUri" value="http://127.0.0.1:18080/"/>
         <property name="clientParams" ref="clientParams"/>
         <property name="clientConnectionManager" ref="clientConnectionManager"/>

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml (from r932699, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest-context.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml?p2=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml&p1=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest-context.xml&r1=932699&r2=932707&rev=932707&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml Sat Apr 10 12:08:37 2010
@@ -24,7 +24,7 @@
     ">
 
     <!-- START SNIPPET: e1 -->
-    <bean id="httpComponent" class="org.apache.camel.component.http.HttpComponent">
+    <bean id="httpComponent" class="org.apache.camel.component.http4.HttpComponent">
         <property name="camelContext" ref="camel"/>
         <property name="clientConnectionManager" ref="clientConnectionManager"/>
         <property name="connectionsPerRoute" value="5" />

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml