Repository: systemml Updated Branches: refs/heads/master b0910631e -> 52b1b5716
[SYSTEMML-658] Test for JMLC scalar string value types Uncomment test for automatically treating scalar strings as having string as the value type. Closes #739. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/52b1b571 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/52b1b571 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/52b1b571 Branch: refs/heads/master Commit: 52b1b5716a5f6b157a9b868db8104a34d6c3d3fb Parents: b091063 Author: Janardhan Pulivarthi <[email protected]> Authored: Wed Mar 7 14:38:16 2018 -0800 Committer: Deron Eriksson <[email protected]> Committed: Wed Mar 7 14:38:17 2018 -0800 ---------------------------------------------------------------------- .../functions/jmlc/JMLCInputOutputTest.java | 32 +++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/52b1b571/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputOutputTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputOutputTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputOutputTest.java index 66cea7b..530fa89 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputOutputTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputOutputTest.java @@ -108,23 +108,21 @@ public class JMLCInputOutputTest extends AutomatedTestBase { conn.close(); } - // See: https://issues.apache.org/jira/browse/SYSTEMML-658 - // @Test - // public void testScalarInputString() throws IOException, DMLException { - // Connection conn = new Connection(); - // String str = conn.readScript(baseDirectory + File.separator + - // "scalar-input.dml"); - // PreparedScript script = conn.prepareScript(str, new String[] { - // "inScalar1", "inScalar2" }, new String[] {}, - // false); - // String inScalar1 = "hello"; - // String inScalar2 = "goodbye"; - // script.setScalar("inScalar1", inScalar1); - // script.setScalar("inScalar2", inScalar2); - // - // setExpectedStdOut("total:hellogoodbye"); - // script.executeScript(); - // } + @Test + public void testScalarInputString() throws IOException, DMLException { + Connection conn = new Connection(); + String str = conn.readScript(baseDirectory + File.separator + "scalar-input.dml"); + PreparedScript script = conn.prepareScript(str, new String[] { "inScalar1", "inScalar2" }, new String[] {}, + false); + String inScalar1 = "Plant"; + String inScalar2 = " Trees"; + script.setScalar("inScalar1", inScalar1); + script.setScalar("inScalar2", inScalar2); + + setExpectedStdOut("total:Plant Trees"); + script.executeScript(); + conn.close(); + } @Test public void testScalarInputStringExplicitValueType() throws IOException, DMLException {
