Repository: camel Updated Branches: refs/heads/master 8cf8021d6 -> 6500f6e3d
Fixing 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/6500f6e3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6500f6e3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6500f6e3 Branch: refs/heads/master Commit: 6500f6e3d4286f853dc397276683c83161100c3c Parents: 8cf8021 Author: Claus Ibsen <[email protected]> Authored: Thu Mar 5 17:17:18 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Mar 5 17:17:18 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/hdfs/HdfsConsumerTest.java | 5 ++++- .../java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6500f6e3/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java index 00c25fe..e08f17a 100644 --- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java +++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java @@ -246,6 +246,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { return; } + int before = new File("target/test").list().length; + final Path file = new Path(new File("target/test/test-camel-boolean").getAbsolutePath()); Configuration conf = new Configuration(); FileSystem fs1 = FileSystem.get(file.toUri(), conf); @@ -278,7 +280,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { scheduler.getScheduledExecutorService().awaitTermination(5000, TimeUnit.MILLISECONDS); Set<String> files = new HashSet<String>(Arrays.asList(new File("target/test").list())); - assertThat(files.size(), equalTo(2)); + // there may be some leftover files before, so test that we only added 2 new files + assertThat(files.size() - before, equalTo(2)); assertTrue(files.remove("test-camel-boolean.handled")); assertTrue(files.remove(".test-camel-boolean.handled.crc")); } http://git-wip-us.apache.org/repos/asf/camel/blob/6500f6e3/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java index 7e6c5ff..e30e67d 100644 --- a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java +++ b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java @@ -246,6 +246,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { return; } + int before = new File("target/test").list().length; + final Path file = new Path(new File("target/test/test-camel-boolean").getAbsolutePath()); Configuration conf = new Configuration(); SequenceFile.Writer writer = createWriter(conf, file, NullWritable.class, BooleanWritable.class); @@ -277,7 +279,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { scheduler.getScheduledExecutorService().awaitTermination(5000, TimeUnit.MILLISECONDS); Set<String> files = new HashSet<String>(Arrays.asList(new File("target/test").list())); - assertThat(files.size(), equalTo(2)); + // there may be some leftover files before, so test that we only added 2 new files + assertThat(files.size() - before, equalTo(2)); assertTrue(files.remove("test-camel-boolean.handled")); assertTrue(files.remove(".test-camel-boolean.handled.crc")); }
