You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/02/01 09:26:45 UTC
svn commit: r739710 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel: TestSupport.java
component/file/FileDeleteRouteTest.java component/file/FileRouteTest.java
Author: ningjiang
Date: Sun Feb 1 08:26:44 2009
New Revision: 739710
URL: http://svn.apache.org/viewvc?rev=739710&view=rev
Log:
CAMEL-1306 fixed a bunch of test failures in windows
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=739710&r1=739709&r2=739710&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Sun Feb 1 08:26:44 2009
@@ -370,7 +370,7 @@
}
/**
- * To be used for folder/directory comparision that works across different platforms such
+ * To be used for folder/directory comparison that works across different platforms such
* as Window, Mac and Linux.
*/
public static void assertDirectoryEquals(String expected, String actual) {
@@ -378,18 +378,24 @@
}
/**
- * To be used for folder/directory comparision that works across different platforms such
+ * To be used for folder/directory comparison that works across different platforms such
* as Window, Mac and Linux.
*/
public static void assertDirectoryEquals(String message, String expected, String actual) {
- // must use single / as path seperators
- String expectedPath = expected.replaceAll("\\\\", File.separator);
- String acutalPath = actual.replaceAll("\\\\", File.separator);
-
+ String expectedPath = expected;
+ String actualPath = actual;
+ // must use single / as path separators
+ if (expected.indexOf("\\") >= 0) {
+ expectedPath = expected.replaceAll("\\\\", "/");
+ }
+ if (actual.indexOf("\\") >= 0) {
+ actualPath = actual.replaceAll("\\\\", "/");
+ }
+
if (message != null) {
- assertEquals(message, expectedPath, acutalPath);
+ assertEquals(message, expectedPath, actualPath);
} else {
- assertEquals(expectedPath, acutalPath);
+ assertEquals(expectedPath, actualPath);
}
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java?rev=739710&r1=739709&r2=739710&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java Sun Feb 1 08:26:44 2009
@@ -42,10 +42,10 @@
template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
result.assertIsSatisfied();
- Thread.sleep(100);
+ Thread.sleep(1000);
- for (String lockName : recorder.getLocks()) {
- File lock = new File(lockName);
+ for (String lockName : recorder.getLocks()) {
+ File lock = new File(lockName);
lock = lock.getAbsoluteFile();
assertFalse(lock.exists());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?rev=739710&r1=739709&r2=739710&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Sun Feb 1 08:26:44 2009
@@ -54,7 +54,7 @@
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() {
+ public void configure() {
from(uri).process(recorder).to("mock:result");
}
};