Repository: incubator-apex-malhar Updated Branches: refs/heads/devel-3 6aa57ce08 -> 648c61462
MLHR-1852 #comment removed the class test rule which removes the directory of source data Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/6d04d132 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/6d04d132 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/6d04d132 Branch: refs/heads/devel-3 Commit: 6d04d132d23d4e186c3564efac04e65531688ae7 Parents: fdc91fa Author: Chandni Singh <[email protected]> Authored: Fri Oct 2 16:32:49 2015 -0700 Committer: Chandni Singh <[email protected]> Committed: Fri Oct 2 16:33:55 2015 -0700 ---------------------------------------------------------------------- .../lib/io/fs/FileSplitterBaseTest.java | 6 ++--- .../lib/io/fs/FileSplitterInputTest.java | 23 ++++---------------- .../datatorrent/lib/io/fs/FileSplitterTest.java | 9 ++++++-- 3 files changed, 13 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6d04d132/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java index 61ccfad..725a5f8 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java @@ -22,6 +22,7 @@ import java.util.concurrent.CountDownLatch; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; + import org.junit.*; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -42,10 +43,7 @@ import com.datatorrent.lib.util.TestUtils; */ public class FileSplitterBaseTest { - @ClassRule - public static FileSplitterInputTest.TestClassMeta classTestMeta = new FileSplitterInputTest.TestClassMeta(); - - static class BastTestMeta extends TestWatcher + class BastTestMeta extends TestWatcher { public String dataDirectory; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6d04d132/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java index 1e2a25c..d22b26d 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java @@ -27,6 +27,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.Path; + import org.junit.*; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -52,20 +53,6 @@ import com.datatorrent.lib.util.TestUtils; */ public class FileSplitterInputTest { - - public static class TestClassMeta extends TestWatcher - { - @Override - protected void finished(Description description) - { - try { - FileContext.getLocalFSFileContext().delete(new Path(new File("target/" + description.getClassName()).getAbsolutePath()), true); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - static Set<String> createData(String dataDirectory) throws IOException { Set<String> filePaths = Sets.newHashSet(); @@ -86,7 +73,7 @@ public class FileSplitterInputTest public static class TestMeta extends TestWatcher { - public String dataDirectory; + String dataDirectory; FileSplitterInput fileSplitterInput; CollectorTestSink<FileSplitterInput.FileMetadata> fileMetadataSink; @@ -133,12 +120,10 @@ public class FileSplitterInputTest protected void finished(Description description) { this.fileSplitterInput.teardown(); + FileUtils.deleteQuietly(new File("target/" + description.getClassName() + "/" + description.getMethodName())); } } - @ClassRule - public static TestClassMeta classTestMeta = new TestClassMeta(); - @Rule public TestMeta testMeta = new TestMeta(); @@ -363,7 +348,7 @@ public class FileSplitterInputTest testMeta.fileSplitterInput.beginWindow(1); - testMeta.scanner.semaphore.acquire(); + ((MockScanner)testMeta.fileSplitterInput.getScanner()).semaphore.acquire(); testMeta.fileSplitterInput.emitTuples(); testMeta.fileSplitterInput.endWindow(); http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6d04d132/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java index 9e8618a..92a7a00 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java @@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.Path; import org.junit.Assert; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestWatcher; @@ -311,7 +312,10 @@ public class FileSplitterTest Assert.assertEquals("Blocks", 62, testMeta.blockMetadataSink.collectedTuples.size()); } - @Test + /** + * {@link FileSplitter} is deprecated because it has issues with recovery which is why disabling the next 2 tests. + */ + @Ignore public void testFirstWindowAfterRecovery() throws IOException, InterruptedException { testIdempotencyWithBlocksThreshold(); @@ -336,6 +340,7 @@ public class FileSplitterTest Assert.assertEquals("Blocks", 6, testMeta.blockMetadataSink.collectedTuples.size()); } + @Ignore public void testRecoveryOfPartialFile() throws InterruptedException { IdempotentStorageManager.FSIdempotentStorageManager fsIdempotentStorageManager = new IdempotentStorageManager.FSIdempotentStorageManager(); @@ -463,4 +468,4 @@ public class FileSplitterTest } private static final Logger LOG = LoggerFactory.getLogger(FileSplitterTest.class); -} \ No newline at end of file +}
