Author: rickette
Date: Sun May 29 22:15:59 2011
New Revision: 1128971
URL: http://svn.apache.org/viewvc?rev=1128971&view=rev
Log:
Fixed unit tests to run in IntelliJ as well
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
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/FileUtil.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=1128971&r1=1128970&r2=1128971&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
Sun May 29 22:15:59 2011
@@ -38,7 +38,7 @@ public class ConsumerEndpointMappingByBe
private WebServiceTemplate webServiceTemplate;
public ConsumerEndpointMappingByBeanNameRouteTest() throws IOException {
- expectedResponse =
FileUtil.readFileAsString("src/test/resources/stockquote-response.xml");
+ expectedResponse =
FileUtil.readFileAsString("/stockquote-response.xml");
}
@Before
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=1128971&r1=1128970&r2=1128971&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
Sun May 29 22:15:59 2011
@@ -41,7 +41,7 @@ public class ConsumerEndpointMappingResp
private WebServiceTemplate webServiceTemplate;
public ConsumerEndpointMappingResponseHandlingRouteTest() throws
IOException {
- expectedResponse =
FileUtil.readFileAsString("src/test/resources/stockquote-response.xml");
+ expectedResponse =
FileUtil.readFileAsString("/stockquote-response.xml");
}
@Before
Modified:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java?rev=1128971&r1=1128970&r2=1128971&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
Sun May 29 22:15:59 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.spring.ws;
import java.io.File;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -36,10 +37,10 @@ public class StockQuoteResponseProcessor
public void process(Exchange exchange) throws Exception {
LOG.info("Crafting standard response in StockQuoteResponseProcessor");
- File file = new File("src/test/resources/stockquote-response.xml");
+ InputStream is =
getClass().getResourceAsStream("/stockquote-response.xml");
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(file);
+ Document doc = db.parse(is);
exchange.getOut().setBody(doc);
}
Modified:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/FileUtil.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/FileUtil.java?rev=1128971&r1=1128970&r2=1128971&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/FileUtil.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/util/FileUtil.java
Sun May 29 22:15:59 2011
@@ -16,11 +16,7 @@
*/
package org.apache.camel.component.spring.ws.util;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
public final class FileUtil {
@@ -28,17 +24,18 @@ public final class FileUtil {
}
public static String readFileAsString(String filePath) throws IOException {
- char[] buffer = new char[(int) new File(filePath).length()];
- BufferedReader reader = null;
+ InputStream is = FileUtil.class.getResourceAsStream(filePath);
try {
- reader = new BufferedReader(new InputStreamReader(new
FileInputStream(filePath), "UTF-8"));
- reader.read(buffer);
- } finally {
- if (reader != null) {
- reader.close();
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(is, "UTF-8"));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ sb.append(line).append("\n");
}
+ return sb.toString().trim();
+ } finally {
+ is.close();
}
- return new String(buffer);
}
}