diff --git a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCustomTest.java b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCustomTest.java index 13c39b864e3..e4fbad422f3 100644 --- a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCustomTest.java +++ b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCustomTest.java @@ -23,7 +23,7 @@ public class FrameGenerateReaderCustomTest extends GenerateReaderFrameTest { - private final static String TEST_NAME = "FrameGenerateReaderCSVTest"; + private final static String TEST_NAME = "FrameGenerateReaderCustomTest"; @Override protected String getTestName() { diff --git a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderXMLTest.java b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderXMLTest.java index 25c32ead70a..c9e17bcb692 100644 --- a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderXMLTest.java +++ b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderXMLTest.java @@ -23,7 +23,7 @@ public class FrameGenerateReaderXMLTest extends GenerateReaderFrameTest { - private final static String TEST_NAME = "FrameGenerateReaderJSONTest"; + private final static String TEST_NAME = "FrameGenerateReaderXMLTest"; @Override protected String getTestName() { diff --git a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java index 8679a8059c9..bf9f9ed4da7 100644 --- a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java +++ b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java @@ -71,12 +71,9 @@ protected void runGenerateReaderTest(String sampleRawFileName, String sampleFram parallel); FrameReader fr = gr.getReader(); fr.readFrameFromHDFS(dataFileName, sampleSchema, rows, sampleSchema.length); - - // TODO Verify the frameblock contains the correct values. - } catch(Exception exception) { - exception.printStackTrace(); + throw new RuntimeException(exception); } finally { rtplatform = oldPlatform; diff --git a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java index ec122d7a352..ad50a22ea06 100644 --- a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java +++ b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java @@ -33,9 +33,6 @@ public abstract class GenerateReaderMatrixTest extends AutomatedTestBase { protected final static String TEST_DIR = "functions/iogen/"; protected final static String TEST_CLASS_DIR = TEST_DIR + GenerateReaderMatrixTest.class.getSimpleName() + "/"; - protected String sampleRaw; - protected double[][] sampleMatrix; - protected abstract String getTestName(); @Override @@ -44,20 +41,6 @@ public void setUp() { addTestConfiguration(getTestName(), new TestConfiguration(TEST_DIR, getTestName(), new String[] {"Y"})); } - protected void generateRandomSymmetric(int size, double min, double max, double sparsity, boolean isSkew) { - sampleMatrix = getRandomMatrix(size, size, min, max, sparsity, 714); - int conf = isSkew ? -1 : 1; - for(int i = 0; i < size; i++) { - for(int j = 0; j <= i; j++) { - - if(i != j) - sampleMatrix[i][j] = sampleMatrix[j][i] * conf; - else - sampleMatrix[i][j] = 0; - } - } - } - @SuppressWarnings("unused") protected void runGenerateReaderTest(String sampleRawFileName, String sampleMatrixFileName, boolean parallel) { @@ -90,7 +73,7 @@ protected void runGenerateReaderTest(String sampleRawFileName, String sampleMatr } catch(Exception exception) { - exception.printStackTrace(); + throw new RuntimeException(exception); } finally { rtplatform = oldPlatform; diff --git a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMMTest.java b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMMTest.java index 2cbb699e6b3..e9cc1c8a069 100644 --- a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMMTest.java +++ b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMMTest.java @@ -23,7 +23,7 @@ public class MatrixGenerateReaderMMTest extends GenerateReaderMatrixTest { - private final static String TEST_NAME = "FrameGenerateReaderLibSVMTest"; + private final static String TEST_NAME = "MatrixGenerateReaderMMTest"; @Override protected String getTestName() {