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 2012/05/22 12:11:00 UTC
svn commit: r1341386 - in /camel/branches/camel-2.9.x: ./
components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java
Author: davsclaus
Date: Tue May 22 10:10:59 2012
New Revision: 1341386
URL: http://svn.apache.org/viewvc?rev=1341386&view=rev
Log:
Fixed test on windows
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1341383
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java?rev=1341386&r1=1341385&r2=1341386&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java Tue May 22 10:10:59 2012
@@ -41,7 +41,7 @@ import org.junit.Test;
public class HdfsProducerFileWriteTest extends CamelTestSupport {
//Hadoop doesn't run on IBM JDK
- private static final boolean SKIP = System.getProperty("java.vendor").contains("IBM");
+ private static final boolean SKIP = isJavaVendor("IBM");
@Before
public void setUp() throws Exception {
@@ -49,6 +49,7 @@ public class HdfsProducerFileWriteTest e
return;
}
super.setUp();
+ deleteDirectory("target/test");
}
@Test
@@ -184,7 +185,7 @@ public class HdfsProducerFileWriteTest e
return;
}
- final Path file = new Path(new File("target/test/test-camel-simple-write-file1").getAbsolutePath());
+ final Path file = new Path(new File("target/test/test-camel-simple-write-file3").getAbsolutePath());
deleteDirectory("target/file-batch4");
context.addRoutes(new RouteBuilder() {
@@ -210,7 +211,7 @@ public class HdfsProducerFileWriteTest e
Configuration conf = new Configuration();
Path file1 = new Path("file:///" + file.toUri());
FileSystem fs1 = FileSystem.get(file1.toUri(), conf);
- MapFile.Reader reader = new MapFile.Reader(fs1, "target/test/test-camel-simple-write-file1", conf);
+ MapFile.Reader reader = new MapFile.Reader(fs1, "target/test/test-camel-simple-write-file3", conf);
for (int i = 0; i < 10; ++i) {
Text key = new Text("CIAO" + i);
BytesWritable value = new BytesWritable();
@@ -228,7 +229,7 @@ public class HdfsProducerFileWriteTest e
return;
}
- final Path file = new Path(new File("target/test/test-camel-simple-write-file1").getAbsolutePath());
+ final Path file = new Path(new File("target/test/test-camel-simple-write-file4").getAbsolutePath());
deleteDirectory("target/file-batch5");
context.addRoutes(new RouteBuilder() {