svn commit: r1381065 - in /camel/trunk/components/camel-servlet: pom.xml src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java

[ningjiang]

Author: ningjiang
Date: Wed Sep  5 08:33:42 2012
New Revision: 1381065

URL: http://svn.apache.org/viewvc?rev=1381065&view=rev
Log:
Fixed the Servlet test failures which is caused by upgrading httpunit

Modified:
    camel/trunk/components/camel-servlet/pom.xml
    
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java

Modified: camel/trunk/components/camel-servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1381065&r1=1381064&r2=1381065&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Wed Sep  5 08:33:42 2012
@@ -109,6 +109,12 @@
       </exclusions>
       <scope>test</scope>
     </dependency>
+     <dependency>
+      <groupId>rhino</groupId>
+      <artifactId>js</artifactId>
+      <version>1.7R1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>

Modified: 
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java?rev=1381065&r1=1381064&r2=1381065&view=diff
==============================================================================
--- 
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
 Wed Sep  5 08:33:42 2012
@@ -34,12 +34,12 @@ import org.junit.Test;
 
 public class HttpClientRouteTest extends ServletCamelRouterTestSupport {
     private static final String POST_DATA = "<request> hello world </request>";
-    private static final String CONTENT_TYPE = "text/xml";
+    private static final String CONTENT_TYPE = "text/xml; charset=UTF-8";
     private static final String UNICODE_TEXT = "B\u00FCe W\u00F6rld";
 
     @Test
     public void testHttpClient() throws Exception {
-        WebRequest req = new PostMethodWebRequest(CONTEXT_URL + 
"/services/hello", new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml; 
charset=UTF-8");
+        WebRequest req = new PostMethodWebRequest(CONTEXT_URL + 
"/services/hello", new ByteArrayInputStream(POST_DATA.getBytes()), 
CONTENT_TYPE);
         ServletUnitClient client = newClient();
         WebResponse response = client.getResponse(req);
 
@@ -48,7 +48,7 @@ public class HttpClientRouteTest extends
         assertEquals("Get a wrong message header", "/hello", 
response.getHeaderField("PATH"));
         assertEquals("The response message is wrong ", "OK", 
response.getResponseMessage());
 
-        req = new PostMethodWebRequest(CONTEXT_URL + "/services/helloworld", 
new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml; charset=UTF-8");
+        req = new PostMethodWebRequest(CONTEXT_URL + "/services/helloworld", 
new ByteArrayInputStream(POST_DATA.getBytes()), CONTENT_TYPE);
         response = client.getResponse(req);
 
         assertEquals("Get wrong content type", "text/xml", 
response.getContentType());
@@ -95,7 +95,6 @@ public class HttpClientRouteTest extends
         WebResponse response = client.getResponse(req);
         assertEquals("The response message is wrong ", "OK", 
response.getResponseMessage());
         assertEquals("The response body is wrong", UNICODE_TEXT, 
response.getText());
-        System.out.println(response.getText());
     }
 
     @Test