You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/13 10:36:23 UTC
[1/2] git commit: Fixed test on Windows
Updated Branches:
refs/heads/camel-2.12.x aeaeb3e5d -> 66cb6537f
refs/heads/master f1ea032dc -> 802cfbe45
Fixed test on Windows
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/802cfbe4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/802cfbe4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/802cfbe4
Branch: refs/heads/master
Commit: 802cfbe45ba662e8f2bb92352430a9262a227a24
Parents: f1ea032
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Oct 13 09:36:36 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 13 09:36:36 2013 +0200
----------------------------------------------------------------------
.../camel/spring/processor/SpringStreamCachingStrategyTest.java | 4 +++-
.../camel/test/blueprint/BlueprintStreamCachingStrategyTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/802cfbe4/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
index d452a81..a300901 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
@@ -21,6 +21,8 @@ import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
* @version
*/
@@ -34,7 +36,7 @@ public class SpringStreamCachingStrategyTest extends SpringTestSupport {
@Test
public void testStreamCaching() {
assertTrue(context.getStreamCachingStrategy().isEnabled());
- assertEquals("target/cachedir", context.getStreamCachingStrategy().getSpoolDirectory().toString());
+ assertEquals(normalizePath("target/cachedir"), normalizePath(context.getStreamCachingStrategy().getSpoolDirectory().toString()));
assertEquals(Integer.valueOf(4096).intValue(), context.getStreamCachingStrategy().getBufferSize());
assertEquals(Long.valueOf(8192).longValue(), context.getStreamCachingStrategy().getSpoolThreshold());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/802cfbe4/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
index 2a37974..429b87f 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.test.blueprint;
import org.junit.Test;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
*
*/
@@ -31,7 +33,7 @@ public class BlueprintStreamCachingStrategyTest extends CamelBlueprintTestSuppor
@Test
public void testStreamCaching() {
assertTrue(context.getStreamCachingStrategy().isEnabled());
- assertEquals("target/cachedir", context.getStreamCachingStrategy().getSpoolDirectory().toString());
+ assertEquals(normalizePath("target/cachedir"), normalizePath(context.getStreamCachingStrategy().getSpoolDirectory().toString()));
assertEquals(Integer.valueOf(4096).intValue(), context.getStreamCachingStrategy().getBufferSize());
assertEquals(Long.valueOf(8192).longValue(), context.getStreamCachingStrategy().getSpoolThreshold());
}
[2/2] git commit: Fixed test on Windows
Posted by da...@apache.org.
Fixed test on Windows
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/66cb6537
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/66cb6537
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/66cb6537
Branch: refs/heads/camel-2.12.x
Commit: 66cb6537fa1b71a626c54c3d0d01804e1bf7f36a
Parents: aeaeb3e
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Oct 13 09:36:36 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 13 10:35:47 2013 +0200
----------------------------------------------------------------------
.../camel/spring/processor/SpringStreamCachingStrategyTest.java | 4 +++-
.../camel/test/blueprint/BlueprintStreamCachingStrategyTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/66cb6537/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
index d452a81..a300901 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
@@ -21,6 +21,8 @@ import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
* @version
*/
@@ -34,7 +36,7 @@ public class SpringStreamCachingStrategyTest extends SpringTestSupport {
@Test
public void testStreamCaching() {
assertTrue(context.getStreamCachingStrategy().isEnabled());
- assertEquals("target/cachedir", context.getStreamCachingStrategy().getSpoolDirectory().toString());
+ assertEquals(normalizePath("target/cachedir"), normalizePath(context.getStreamCachingStrategy().getSpoolDirectory().toString()));
assertEquals(Integer.valueOf(4096).intValue(), context.getStreamCachingStrategy().getBufferSize());
assertEquals(Long.valueOf(8192).longValue(), context.getStreamCachingStrategy().getSpoolThreshold());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/66cb6537/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
index 2a37974..429b87f 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintStreamCachingStrategyTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.test.blueprint;
import org.junit.Test;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
*
*/
@@ -31,7 +33,7 @@ public class BlueprintStreamCachingStrategyTest extends CamelBlueprintTestSuppor
@Test
public void testStreamCaching() {
assertTrue(context.getStreamCachingStrategy().isEnabled());
- assertEquals("target/cachedir", context.getStreamCachingStrategy().getSpoolDirectory().toString());
+ assertEquals(normalizePath("target/cachedir"), normalizePath(context.getStreamCachingStrategy().getSpoolDirectory().toString()));
assertEquals(Integer.valueOf(4096).intValue(), context.getStreamCachingStrategy().getBufferSize());
assertEquals(Long.valueOf(8192).longValue(), context.getStreamCachingStrategy().getSpoolThreshold());
}