Repository: systemml Updated Branches: refs/heads/master 71f8c836d -> bc097fcd7
[HOTFIX] Update function call tests wrt UDF support in expressions Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/bc097fcd Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/bc097fcd Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/bc097fcd Branch: refs/heads/master Commit: bc097fcd7bcfeb90bce208c448a8610694a73c71 Parents: 71f8c83 Author: Matthias Boehm <[email protected]> Authored: Sun Mar 4 13:13:28 2018 -0800 Committer: Matthias Boehm <[email protected]> Committed: Sun Mar 4 13:13:28 2018 -0800 ---------------------------------------------------------------------- .../misc/InvalidFunctionAssignmentTest.java | 41 ++++++++------------ 1 file changed, 16 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/bc097fcd/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java index 351e26d..f851894 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java @@ -25,18 +25,15 @@ import org.apache.sysml.api.DMLException; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; -/** - * - */ public class InvalidFunctionAssignmentTest extends AutomatedTestBase -{ +{ private final static String TEST_DIR = "functions/misc/"; private final static String TEST_NAME1 = "InvalidFunctionAssignmentTest1"; private final static String TEST_NAME2 = "InvalidFunctionAssignmentTest2"; private final static String TEST_NAME3 = "InvalidFunctionAssignmentTest3"; private final static String TEST_NAME4 = "InvalidFunctionAssignmentTest4"; private final static String TEST_CLASS_DIR = TEST_DIR + InvalidFunctionAssignmentTest.class.getSimpleName() + "/"; - + @Override public void setUp() { addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] {})); @@ -46,39 +43,33 @@ public class InvalidFunctionAssignmentTest extends AutomatedTestBase } @Test - public void testValidFunctionAssignmentInlined() { - runTest( TEST_NAME1, false ); + public void testValidFunctionAssignmentInlined() { + runTest( TEST_NAME1, false ); } @Test - public void testInvalidFunctionAssignmentInlined() { - runTest( TEST_NAME2, true ); - } + public void testInvalidFunctionAssignmentInlined() { + //MB: we now support UDFs in expressions and hence it's valid + runTest( TEST_NAME2, false ); + } @Test - public void testValidFunctionAssignment() { - runTest( TEST_NAME3, false ); + public void testValidFunctionAssignment() { + runTest( TEST_NAME3, false ); } @Test - public void testInvalidFunctionAssignment() { - runTest( TEST_NAME4, true ); - } + public void testInvalidFunctionAssignment() { + //MB: we now support UDFs in expressions and hence it's valid + runTest( TEST_NAME4, false ); + } - /** - * - * @param testName - */ - private void runTest( String testName, boolean exceptionExpected ) - { + private void runTest( String testName, boolean exceptionExpected ) { TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); - String HOME = SCRIPT_DIR + TEST_DIR; fullDMLScriptName = HOME + testName + ".dml"; programArgs = new String[]{}; - - //run tests - runTest(true, exceptionExpected, DMLException.class, -1); + runTest(true, exceptionExpected, DMLException.class, -1); } }
