Repository: incubator-systemml Updated Branches: refs/heads/master 6627b7824 -> 0bbb7fba9
[SYSTEMML-560] Frame Schema Read build possible fix #2 Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/0bbb7fba Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/0bbb7fba Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/0bbb7fba Branch: refs/heads/master Commit: 0bbb7fba9ae6634968df04a4b01225219fc4df99 Parents: 6627b78 Author: Arvind Surve <[email protected]> Authored: Wed May 11 18:39:30 2016 -0700 Committer: Arvind Surve <[email protected]> Committed: Wed May 11 18:39:30 2016 -0700 ---------------------------------------------------------------------- .../functions/frame/FrameConverterTest.java | 14 +++++++++++++- .../functions/frame/FrameReadWriteTest.java | 4 ++++ .../functions/frame/FrameSchemaReadTest.java | 6 ++++-- 3 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0bbb7fba/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java index 71350cb..a0056dc 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java @@ -67,6 +67,8 @@ public class FrameConverterTest extends AutomatedTestBase { private final static String TEST_DIR = "functions/frame/"; private final static String TEST_NAME = "FrameConv"; + private final static String TEST_CLASS_DIR = TEST_DIR + FrameConverterTest.class.getSimpleName() + "/"; + private final static int rows = 1593; private final static ValueType[] schemaStrings = new ValueType[]{ValueType.STRING, ValueType.STRING, ValueType.STRING}; @@ -101,7 +103,7 @@ public class FrameConverterTest extends AutomatedTestBase @Override public void setUp() { TestUtils.clearAssertionInformation(); - addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[] {"B"})); + addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] {"B"})); } @Test @@ -256,6 +258,7 @@ public class FrameConverterTest extends AutomatedTestBase * @param instType */ private void runConverterAndVerify( ValueType[] schema, double[][] A, ConvType type, InputInfo iinfo, OutputInfo oinfo ) + throws IOException { try { @@ -283,6 +286,10 @@ public class FrameConverterTest extends AutomatedTestBase ex.printStackTrace(); throw new RuntimeException(ex); } + finally { + MapReduceTool.deleteFileIfExistOnHDFS(input("A")); + MapReduceTool.deleteFileIfExistOnHDFS(output("B")); + } } /** @@ -295,6 +302,7 @@ public class FrameConverterTest extends AutomatedTestBase * @param instType */ private void runMatrixConverterAndVerify( ValueType[] schema, double[][] A, ConvType type, InputInfo iinfo, OutputInfo oinfo ) + throws IOException { try { @@ -351,6 +359,10 @@ public class FrameConverterTest extends AutomatedTestBase ex.printStackTrace(); throw new RuntimeException(ex); } + finally { + MapReduceTool.deleteFileIfExistOnHDFS(input("A")); + MapReduceTool.deleteFileIfExistOnHDFS(output("B")); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0bbb7fba/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java index 866a93d..c29f1ff 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java @@ -36,6 +36,7 @@ import org.apache.sysml.runtime.matrix.data.OutputInfo; import org.apache.sysml.runtime.util.MapReduceTool; import org.apache.sysml.runtime.util.UtilFunctions; import org.apache.sysml.test.integration.AutomatedTestBase; +import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; import org.junit.Assert; import org.junit.Test; @@ -43,6 +44,8 @@ import org.junit.Test; public class FrameReadWriteTest extends AutomatedTestBase { private final static String TEST_DIR = "functions/frame/io/"; + private final static String TEST_NAME = "FrameReadWrite"; + private final static String TEST_CLASS_DIR = TEST_DIR + FrameReadWriteTest.class.getSimpleName() + "/"; private final static int rows = 1593; private final static ValueType[] schemaStrings = new ValueType[]{ValueType.STRING, ValueType.STRING, ValueType.STRING}; @@ -54,6 +57,7 @@ public class FrameReadWriteTest extends AutomatedTestBase @Override public void setUp() { TestUtils.clearAssertionInformation(); + addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] {"B"})); } @Test http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0bbb7fba/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java index 493e789..b37b3fb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java @@ -45,6 +45,8 @@ public class FrameSchemaReadTest extends AutomatedTestBase private final static String TEST_DIR = "functions/frame/"; private final static String TEST_NAME1 = "FrameSchemaRead1"; private final static String TEST_NAME2 = "FrameSchemaRead2"; + private final static String TEST_CLASS_DIR = TEST_DIR + FrameSchemaReadTest.class.getSimpleName() + "/"; + private final static int rows = 1593; private final static ValueType[] schemaStrings = new ValueType[]{ValueType.STRING, ValueType.STRING, ValueType.STRING}; @@ -54,8 +56,8 @@ public class FrameSchemaReadTest extends AutomatedTestBase @Override public void setUp() { TestUtils.clearAssertionInformation(); - addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] {"B"})); - addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] {"B"})); + addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] {"B"})); + addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] {"B"})); } @Test
