You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/05/19 18:03:16 UTC
incubator-systemml git commit: [SYSTEMML-656] Fix scalar input
boolean addition test
Repository: incubator-systemml
Updated Branches:
refs/heads/master 195ff182b -> 17aac2108
[SYSTEMML-656] Fix scalar input boolean addition test
Closes #162.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/17aac210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/17aac210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/17aac210
Branch: refs/heads/master
Commit: 17aac210856517e3b0818f25c8b87b8b96a38f41
Parents: 195ff18
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Thu May 19 11:00:59 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Thu May 19 11:00:59 2016 -0700
----------------------------------------------------------------------
.../functions/jmlc/JMLCInputOutputTest.java | 32 +++++++++-----------
.../functions/jmlc/ZPackageSuite.java | 1 +
2 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/17aac210/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 2bed8d7..66cea7b 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
@@ -76,23 +76,21 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
conn.close();
}
- // See: https://issues.apache.org/jira/browse/SYSTEMML-656
- // @Test
- // public void testScalarInputBoolean() 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);
- // boolean inScalar1 = true;
- // boolean inScalar2 = true;
- // script.setScalar("inScalar1", inScalar1);
- // script.setScalar("inScalar2", inScalar2);
- //
- // setExpectedStdOut("total:TRUE");
- // script.executeScript();
- // }
+ @Test
+ public void testScalarInputBoolean() 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);
+ boolean inScalar1 = true;
+ boolean inScalar2 = true;
+ script.setScalar("inScalar1", inScalar1);
+ script.setScalar("inScalar2", inScalar2);
+
+ setExpectedStdOut("total:2.0");
+ script.executeScript();
+ conn.close();
+ }
@Test
public void testScalarInputLong() throws IOException, DMLException {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/17aac210/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
----------------------------------------------------------------------
diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
index e643aa8..9bf6a1c 100644
--- a/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
@@ -33,6 +33,7 @@ import org.junit.runners.Suite;
FrameLeftIndexingTest.class,
FrameReadMetaTest.class,
FrameTransformTest.class,
+ JMLCInputOutputTest.class,
ReuseModelVariablesTest.class,
SystemTMulticlassSVMScoreTest.class
})