Author: bvahdat
Date: Sat Nov 3 19:41:41 2012
New Revision: 1405408
URL: http://svn.apache.org/viewvc?rev=1405408&view=rev
Log:
Removed the FileUtil utility class and it's usage and leveraged the type
coverter mechanism for the file reading stuff inside the tests.
Removed:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/
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=1405408&r1=1405407&r2=1405408&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
Sat Nov 3 19:41:41 2012
@@ -16,13 +16,11 @@
*/
package org.apache.camel.component.spring.ws;
-import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.camel.component.spring.ws.util.FileUtil;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Before;
import org.junit.Test;
@@ -37,18 +35,11 @@ public class ConsumerEndpointMappingByBe
private String expectedResponse;
private WebServiceTemplate webServiceTemplate;
- public ConsumerEndpointMappingByBeanNameRouteTest() throws IOException {
- expectedResponse =
toUnixLineEndings(FileUtil.readFileAsString("/stockquote-response.xml"));
- }
-
@Before
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate",
WebServiceTemplate.class);
- }
-
- public String toUnixLineEndings(String inSt) {
- return inSt.replace("\r\n", "\n");
+ expectedResponse = context.getTypeConverter().convertTo(String.class,
getClass().getResourceAsStream("/stockquote-response.xml"));
}
@Test
@@ -58,13 +49,12 @@ public class ConsumerEndpointMappingByBe
StreamResult result = new StreamResult(sw);
webServiceTemplate.sendSourceAndReceiveToResult(source, result);
assertNotNull(result);
- assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
+ assertEquals(expectedResponse, sw.toString());
}
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
-
"org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml");
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml");
}
}
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=1405408&r1=1405407&r2=1405408&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
Sat Nov 3 19:41:41 2012
@@ -16,13 +16,11 @@
*/
package org.apache.camel.component.spring.ws;
-import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.camel.component.spring.ws.util.FileUtil;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Before;
import org.junit.Test;
@@ -40,18 +38,11 @@ public class ConsumerEndpointMappingResp
private String expectedResponse;
private WebServiceTemplate webServiceTemplate;
- public ConsumerEndpointMappingResponseHandlingRouteTest() throws
IOException {
- expectedResponse =
toUnixLineEndings(FileUtil.readFileAsString("/stockquote-response.xml"));
- }
-
@Before
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate",
WebServiceTemplate.class);
- }
-
- public String toUnixLineEndings(String inSt) {
- return inSt.replace("\r\n", "\n");
+ expectedResponse = context.getTypeConverter().convertTo(String.class,
getClass().getResourceAsStream("/stockquote-response.xml"));
}
@Test
@@ -61,7 +52,7 @@ public class ConsumerEndpointMappingResp
StreamResult result = new StreamResult(sw);
webServiceTemplate.sendSourceAndReceiveToResult(source, result);
assertNotNull(result);
- assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
+ assertEquals(expectedResponse, sw.toString());
}
@Test
@@ -71,7 +62,7 @@ public class ConsumerEndpointMappingResp
StreamResult result = new StreamResult(sw);
webServiceTemplate.sendSourceAndReceiveToResult(source, new
SoapActionCallback("http://www.webserviceX.NET/GetQuote";), result);
assertNotNull(result);
- assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
+ assertEquals(expectedResponse, sw.toString());
}
@Test
@@ -81,7 +72,7 @@ public class ConsumerEndpointMappingResp
StreamResult result = new StreamResult(sw);
webServiceTemplate.sendSourceAndReceiveToResult("http://localhost/stockquote2";,
source, result);
assertNotNull(result);
- assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
+ assertEquals(expectedResponse, sw.toString());
}
@Test
@@ -91,12 +82,11 @@ public class ConsumerEndpointMappingResp
StreamResult result = new StreamResult(sw);
webServiceTemplate.sendSourceAndReceiveToResult(source, result);
assertNotNull(result);
- assertEquals(expectedResponse, toUnixLineEndings(sw.toString()));
+ assertEquals(expectedResponse, sw.toString());
}
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
-
"org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml");
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml");
}
}
