svn commit: r1133105 - in /camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws: ConsumerEndpointMappingByBeanNameRouteTest.java ConsumerEndpointMappingResponseHandlingRouteTest.java

[cschneider]

Author: cschneider
Date: Tue Jun  7 17:34:18 2011
New Revision: 1133105

URL: http://svn.apache.org/viewvc?rev=1133105&view=rev
Log:
CAMEL-4068 Convert line endings to unix before comparison

Modified:
    
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
    
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java

Modified: 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java?rev=1133105&r1=1133104&r2=1133105&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
 Tue Jun  7 17:34:18 2011
@@ -38,7 +38,7 @@ public class ConsumerEndpointMappingByBe
     private WebServiceTemplate webServiceTemplate;
 
     public ConsumerEndpointMappingByBeanNameRouteTest() throws IOException {
-        expectedResponse = 
FileUtil.readFileAsString("/stockquote-response.xml");
+        expectedResponse = 
toUnixLineEndings(FileUtil.readFileAsString("/stockquote-response.xml"));
     }
 
     @Before
@@ -46,6 +46,10 @@ public class ConsumerEndpointMappingByBe
         super.setUp();
         webServiceTemplate = (WebServiceTemplate) 
applicationContext.getBean("webServiceTemplate");
     }
+    
+    public String toUnixLineEndings(String inSt) {
+       return inSt.replace("\r\n", "\n");
+    }
 
     @Test
     public void testBeanName() throws Exception {
@@ -54,7 +58,7 @@ public class ConsumerEndpointMappingByBe
         StreamResult result = new StreamResult(sw);
         webServiceTemplate.sendSourceAndReceiveToResult(source, result);
         assertNotNull(result);
-        assertEquals(expectedResponse, sw.toString());
+        assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
     }
 
     @Override

Modified: 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java?rev=1133105&r1=1133104&r2=1133105&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
 Tue Jun  7 17:34:18 2011
@@ -41,7 +41,7 @@ public class ConsumerEndpointMappingResp
     private WebServiceTemplate webServiceTemplate;
 
     public ConsumerEndpointMappingResponseHandlingRouteTest() throws 
IOException {
-        expectedResponse = 
FileUtil.readFileAsString("/stockquote-response.xml");
+        expectedResponse = 
toUnixLineEndings(FileUtil.readFileAsString("/stockquote-response.xml"));
     }
 
     @Before
@@ -49,6 +49,10 @@ public class ConsumerEndpointMappingResp
         super.setUp();
         webServiceTemplate = (WebServiceTemplate) 
applicationContext.getBean("webServiceTemplate");
     }
+    
+    public String toUnixLineEndings(String inSt) {
+       return inSt.replace("\r\n", "\n");
+    }
 
     @Test
     public void testRootQName() throws Exception {
@@ -57,7 +61,7 @@ public class ConsumerEndpointMappingResp
         StreamResult result = new StreamResult(sw);
         webServiceTemplate.sendSourceAndReceiveToResult(source, result);
         assertNotNull(result);
-        assertEquals(expectedResponse, sw.toString());
+        assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
     }
 
     @Test
@@ -67,7 +71,7 @@ public class ConsumerEndpointMappingResp
         StreamResult result = new StreamResult(sw);
         webServiceTemplate.sendSourceAndReceiveToResult(source, new 
SoapActionCallback("http://www.webserviceX.NET/GetQuote";), result);
         assertNotNull(result);
-        assertEquals(expectedResponse, sw.toString());
+        assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
     }
 
     @Test
@@ -77,7 +81,7 @@ public class ConsumerEndpointMappingResp
         StreamResult result = new StreamResult(sw);
         
webServiceTemplate.sendSourceAndReceiveToResult("http://localhost/stockquote2";, 
source, result);
         assertNotNull(result);
-        assertEquals(expectedResponse, sw.toString());
+        assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
     }
 
     @Test
@@ -87,7 +91,7 @@ public class ConsumerEndpointMappingResp
         StreamResult result = new StreamResult(sw);
         webServiceTemplate.sendSourceAndReceiveToResult(source, result);
         assertNotNull(result);
-        assertEquals(expectedResponse, sw.toString());
+        assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
     }
 
     @Override