From af289af3bc1f3b2e625b74cacabe4a13543500e0 Mon Sep 17 00:00:00 2001 From: ywcb00 Date: Mon, 29 Jun 2026 10:14:15 +0200 Subject: [PATCH] fix(test/functions/io/ScalarIOTest.java): add asserts for validating the test success uncomment some checks for correct results refactor(test/functions/io/ScalarIOTest.java): remove unnecessary indents --- .../sysds/test/functions/io/ScalarIOTest.java | 90 ++++++++++--------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/src/test/java/org/apache/sysds/test/functions/io/ScalarIOTest.java b/src/test/java/org/apache/sysds/test/functions/io/ScalarIOTest.java index d04cfe3125c..a1b51ee9d81 100644 --- a/src/test/java/org/apache/sysds/test/functions/io/ScalarIOTest.java +++ b/src/test/java/org/apache/sysds/test/functions/io/ScalarIOTest.java @@ -31,18 +31,18 @@ public class ScalarIOTest extends AutomatedTestBase { - + private final static String TEST_NAME = "scalarIOTest"; private final static String TEST_DIR = "functions/io/"; private final static String OUT_FILE = "a.scalar"; private final static String TEST_CLASS_DIR = TEST_DIR + ScalarIOTest.class.getSimpleName() + "/"; private final static String HOME = SCRIPT_DIR + TEST_DIR; - + @Override public void setUp() { addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "a.scalar" }) ); - + getAndLoadTestConfiguration(TEST_NAME); } @@ -50,40 +50,39 @@ public void setUp() { public void testIntScalarWrite() { int int_scalar = 464; - + fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{ "-args", String.valueOf(int_scalar), output("a.scalar") }; runTest(true, false, null, -1); - + int int_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).intValue(); Assert.assertEquals("Values not equal: " + int_scalar + Opcodes.NOTEQUAL.toString() + int_out_scalar, int_scalar, int_out_scalar); - + // Invoke the DML script that does computations and then writes scalar to HDFS fullDMLScriptName = HOME + "ScalarComputeWrite.dml"; runTest(true, false, null, -1); - + int_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).intValue(); Assert.assertEquals("Computation test for Integers failed: Values not equal: " + int_scalar + Opcodes.NOTEQUAL.toString() + int_out_scalar, int_scalar, int_out_scalar); } @Test - public void testDoubleScalarWrite() - { + public void testDoubleScalarWrite() { Double double_scalar = 464.55; fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{ "-args", String.valueOf(double_scalar), output("a.scalar") }; runTest(true, false, null, -1); - + Double double_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).doubleValue(); Assert.assertEquals("Values not equal: " + double_scalar + Opcodes.NOTEQUAL.toString() + double_out_scalar, double_scalar, double_out_scalar); // Invoke the DML script that does computations and then writes scalar to HDFS fullDMLScriptName = HOME + "ScalarComputeWrite.dml"; runTest(true, false, null, -1); - + double_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).doubleValue(); - Assert.assertEquals("Computation test for Integers failed: Values not equal: " + double_scalar + Opcodes.NOTEQUAL.toString() + double_out_scalar, double_scalar, double_out_scalar); + Assert.assertEquals("Computation test for Doubles failed: Values not equal: " + double_scalar + Opcodes.NOTEQUAL.toString() + double_out_scalar, double_scalar, double_out_scalar); } @Test @@ -96,7 +95,7 @@ public void testBooleanScalarWrite() { runTest(true, false, null, -1); boolean boolean_out_scalar = TestUtils.readDMLBoolean(output(OUT_FILE)); - + Assert.assertEquals("Values not equal: " + boolean_scalar + Opcodes.NOTEQUAL.toString() + boolean_out_scalar, boolean_scalar, boolean_out_scalar); } @@ -110,86 +109,91 @@ public void testStringScalarWrite() { runTest(true, false, null, -1); String string_out_scalar = TestUtils.readDMLString(output(OUT_FILE)); - + Assert.assertEquals("Values not equal: " + string_scalar + Opcodes.NOTEQUAL.toString() + string_out_scalar, string_scalar, string_out_scalar); } - + @Test public void testIntScalarRead() { - int int_scalar = 464; - + setOutputBuffering(true); fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{"-args", String.valueOf(int_scalar), output("a.scalar")}; runTest(true, false, null, -1); - - //int int_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).intValue(); - //assertEquals("Values not equal: " + int_scalar + "!=" + int_out_scalar, int_scalar, int_out_scalar); - + + int int_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)) + .get(new CellIndex(1,1)).intValue(); + Assert.assertEquals("Values not equal: " + int_scalar + Opcodes.NOTEQUAL.toString() + int_out_scalar, + int_scalar, int_out_scalar); + // Invoke the DML script that reads the scalar and prints to stdout fullDMLScriptName = HOME + "ScalarRead.dml"; programArgs = new String[] { "-args", output("a.scalar"), "int" }; - - ByteArrayOutputStream stdout = runTest(true, false, null, -1); - bufferContainsString(stdout, String.valueOf(int_scalar)); + + ByteArrayOutputStream stdout = runTest(true, false, null, -1); + Assert.assertTrue(bufferContainsString(stdout, String.valueOf(int_scalar))); } @Test public void testDoubleScalarRead() { - double double_scalar = 464.5; - + fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{ "-args", String.valueOf(double_scalar), output("a.scalar") }; runTest(true, false, null, -1); - - //double double_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)).get(new CellIndex(1,1)).doubleValue(); - //assertEquals("Values not equal: " + double_scalar + "!=" + double_out_scalar, double_scalar, double_out_scalar); - + + double double_out_scalar = TestUtils.readDMLScalarFromHDFS(output(OUT_FILE)) + .get(new CellIndex(1,1)).doubleValue(); + Assert.assertEquals("Values not equal: " + double_scalar + Opcodes.NOTEQUAL.toString() + double_out_scalar, + double_scalar, double_out_scalar, 0); + // Invoke the DML script that reads the scalar and prints to stdout fullDMLScriptName = HOME + "ScalarRead.dml"; programArgs = new String[] { "-args", output("a.scalar"), "double" }; - + ByteArrayOutputStream stdout = runTest(true, false, null, -1); - bufferContainsString(stdout, String.valueOf(double_scalar)); + Assert.assertTrue(bufferContainsString(stdout, String.valueOf(double_scalar))); } @Test public void testBooleanScalarRead() { - boolean boolean_scalar = true; - + fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{ "-args", String.valueOf(boolean_scalar).toUpperCase(), output("a.scalar") }; runTest(true, false, null, -1); + boolean boolean_out_scalar = TestUtils.readDMLBoolean(output(OUT_FILE)); + Assert.assertEquals("Values not equal: " + boolean_scalar + Opcodes.NOTEQUAL.toString() + boolean_out_scalar, + boolean_scalar, boolean_out_scalar); + // Invoke the DML script that reads the scalar and prints to stdout fullDMLScriptName = HOME + "ScalarRead.dml"; programArgs = new String[] { "-args", output("a.scalar"), "boolean" }; - - // setExpectedStdOut(String.valueOf(boolean_scalar).toUpperCase()); + ByteArrayOutputStream stdout = runTest(true, false, null, -1); - bufferContainsString(stdout, String.valueOf(boolean_scalar).toUpperCase()); + Assert.assertTrue(bufferContainsString(stdout, String.valueOf(boolean_scalar).toUpperCase())); } @Test public void testStringScalarRead() { - String string_scalar = "String Test.!"; - + fullDMLScriptName = HOME + "ScalarWrite.dml"; programArgs = new String[]{ "-args", String.valueOf(string_scalar), output("a.scalar") }; runTest(true, false, null, -1); + String string_out_scalar = TestUtils.readDMLString(output(OUT_FILE)); + Assert.assertEquals("Values not equal: " + string_scalar + Opcodes.NOTEQUAL.toString() + string_out_scalar, + string_scalar, string_out_scalar); + // Invoke the DML script that reads the scalar and prints to stdout fullDMLScriptName = HOME + "ScalarRead.dml"; programArgs = new String[] { "-args", output("a.scalar"), "string" }; - - ByteArrayOutputStream stdout = runTest(true, false, null, -1); - bufferContainsString(stdout, string_scalar); + ByteArrayOutputStream stdout = runTest(true, false, null, -1); + Assert.assertTrue(bufferContainsString(stdout, string_scalar)); } - }