You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by ni...@apache.org on 2018/10/14 19:18:14 UTC
[06/11] systemml git commit: [SYSTEMML-2496] Skip MapReduce tests as
it is in maintenance mode
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
index c3b5311..4991183 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
@@ -180,17 +180,10 @@ public class FrameMatrixReblockTest extends AutomatedTestBase
private void runFrameReblockTest( String testname, boolean multColBlks, boolean sparse, String ofmt, ExecType et)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
index 2cbbf55..144f536 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
@@ -123,17 +123,10 @@ public class FrameMatrixWriteTest extends AutomatedTestBase
*/
private void runFrameWriteTest( String testname, boolean multColBlks, String ofmt, ExecType et)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMetaReadWriteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMetaReadWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMetaReadWriteTest.java
index ceeec07..19eec76 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMetaReadWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMetaReadWriteTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.util.DataConverter;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameMetaReadWriteTest extends AutomatedTestBase
@@ -87,17 +86,10 @@ public class FrameMetaReadWriteTest extends AutomatedTestBase
*/
private void runFrameReadWriteTest( OutputInfo oinfo, ExecType et)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
String ofmt = OutputInfo.outputInfoToStringExternal(oinfo);
@@ -130,9 +122,9 @@ public class FrameMetaReadWriteTest extends AutomatedTestBase
.createFrameReader(OutputInfo.getMatchingInputInfo(oinfo))
.readFrameFromHDFS(output("B"), rows, cols);
for( int j=0; j<cols; j++ ) {
- Assert.assertEquals("MV meta data wrong!",
+ assertEquals("MV meta data wrong!",
fA.getColumnMetadata(j).getMvValue(), fB.getColumnMetadata(j).getMvValue());
- Assert.assertEquals("Distinct meta data wrong!",
+ assertEquals("Distinct meta data wrong!",
fA.getColumnMetadata(j).getNumDistinct(), fB.getColumnMetadata(j).getNumDistinct());
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java
index 7f7e089..5b8809a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameReadWriteTest.java
@@ -36,7 +36,6 @@ import org.apache.sysml.runtime.util.UtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameReadWriteTest extends AutomatedTestBase
@@ -156,6 +155,9 @@ public class FrameReadWriteTest extends AutomatedTestBase
*/
private void runFrameReadWriteTest( OutputInfo oinfo, ValueType[] schema1, ValueType[] schema2, boolean parallel)
{
+ if(shouldSkipTest())
+ return;
+
boolean oldParText = CompilerConfig.FLAG_PARREADWRITE_TEXT;
boolean oldParBin = CompilerConfig.FLAG_PARREADWRITE_BINARY;
@@ -213,7 +215,7 @@ public class FrameReadWriteTest extends AutomatedTestBase
for ( int i=0; i<frame1.getNumRows(); i++ )
for( int j=0; j<lschema.length; j++ ) {
if( UtilFunctions.compareTo(lschema[j], frame1.get(i, j), frame2.get(i, j)) != 0)
- Assert.fail("Target value for cell ("+ i + "," + j + ") is " + frame1.get(i, j) +
+ fail("Target value for cell ("+ i + "," + j + ") is " + frame1.get(i, j) +
", is not same as original value " + frame2.get(i, j));
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingIntegratedTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingIntegratedTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingIntegratedTest.java
index 7302126..159e5a6 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingIntegratedTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingIntegratedTest.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.frame;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -126,11 +125,10 @@ public class FrameScalarCastingIntegratedTest extends AutomatedTestBase
private void runFrameScalarCastingTest(ValueType vtIn, RUNTIME_PLATFORM et)
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = et;
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
@@ -154,10 +152,10 @@ public class FrameScalarCastingIntegratedTest extends AutomatedTestBase
runTest(true, false, null, -1);
//compare output
- Assert.assertEquals(readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)), Double.valueOf(1));
+ assertEquals(readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)), Double.valueOf(1));
if( et != RUNTIME_PLATFORM.SPARK ) {
- Assert.assertTrue(Statistics.getNoOfCompiledSPInst()==0);
- Assert.assertTrue(Statistics.getNoOfExecutedSPInst()==0);
+ assertTrue(Statistics.getNoOfCompiledSPInst()==0);
+ assertTrue(Statistics.getNoOfExecutedSPInst()==0);
}
}
catch(Exception ex) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingTest.java
index dec63c4..8ee44d4 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameScalarCastingTest.java
@@ -30,7 +30,6 @@ import org.apache.sysml.runtime.util.UtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -98,6 +97,9 @@ public class FrameScalarCastingTest extends AutomatedTestBase
*/
private void runFrameCastingTest( String testname, ValueType vt)
{
+ if(shouldSkipTest())
+ return;
+
try
{
TestConfiguration config = getTestConfiguration(testname);
@@ -133,7 +135,7 @@ public class FrameScalarCastingTest extends AutomatedTestBase
.readFrameFromHDFS(output("B"), new ValueType[]{vt}, 1, 1)
.get(0, 0);
}
- Assert.assertEquals("Wrong output: "+retval+" (expected: "+inval+")", inval, retval);
+ assertEquals("Wrong output: "+retval+" (expected: "+inval+")", inval, retval);
}
catch(Exception ex) {
throw new RuntimeException(ex);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
index bd9f138..1d4e0cd 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
@@ -35,7 +35,6 @@ import org.apache.sysml.runtime.util.UtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameSchemaReadTest extends AutomatedTestBase
@@ -113,6 +112,9 @@ public class FrameSchemaReadTest extends AutomatedTestBase
*/
private void runFrameSchemaReadTest( String testname, ValueType[] schema, boolean wildcard)
{
+ if(shouldSkipTest())
+ return;
+
try
{
TestConfiguration config = getTestConfiguration(testname);
@@ -145,7 +147,7 @@ public class FrameSchemaReadTest extends AutomatedTestBase
ValueType[] schemaExpected = (testname.equals(TEST_NAME2) || wildcard) ?
Collections.nCopies(schema.length, ValueType.STRING).toArray(new ValueType[0]) : schema;
for( int i=0; i<schemaExpected.length; i++ ) {
- Assert.assertEquals("Wrong result: "+frame2.getSchema()[i]+".",
+ assertEquals("Wrong result: "+frame2.getSchema()[i]+".",
schemaExpected[i], frame2.getSchema()[i]);
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSerializationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSerializationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSerializationTest.java
index 954abc3..5933ce5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSerializationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSerializationTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.matrix.data.FrameBlock;
import org.apache.sysml.runtime.util.UtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameSerializationTest extends AutomatedTestBase
@@ -79,6 +78,9 @@ public class FrameSerializationTest extends AutomatedTestBase
*/
private void runFrameSerializeTest( ValueType[] schema, SerType stype)
{
+ if(shouldSkipTest())
+ return;
+
try
{
//data generation
@@ -123,14 +125,14 @@ public class FrameSerializationTest extends AutomatedTestBase
//check basic meta data
if( frame.getNumRows() != rows )
- Assert.fail("Wrong number of rows: "+frame.getNumRows()+", expected: "+rows);
+ fail("Wrong number of rows: "+frame.getNumRows()+", expected: "+rows);
//check correct values
for( int i=0; i<rows; i++ )
for( int j=0; j<schema.length; j++ ) {
double tmp = UtilFunctions.objectToDouble(schema[j], frame.get(i, j));
if( tmp != A[i][j] )
- Assert.fail("Wrong get value for cell ("+i+","+j+"): "+tmp+", expected: "+A[i][j]);
+ fail("Wrong get value for cell ("+i+","+j+"): "+tmp+", expected: "+A[i][j]);
}
}
catch(Exception ex) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/frame/ParforFrameIntermediateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/ParforFrameIntermediateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/ParforFrameIntermediateTest.java
index c9ac763..349d33e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/ParforFrameIntermediateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/ParforFrameIntermediateTest.java
@@ -57,16 +57,11 @@ public class ParforFrameIntermediateTest extends AutomatedTestBase
}
private void runParforFrameIntermediatesTest( ExecType et ) {
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK
- || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
index 9eb04ad..7038af7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.indexing;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.hops.OptimizerUtils;
@@ -38,49 +37,65 @@ public class IndexRangeBlockAlignmentTest extends AutomatedTestBase
@Test
public void testRowBlockFirstColumn() {
- Assert.assertEquals(Boolean.TRUE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(true,
OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testRowBlockColBlock() {
- Assert.assertEquals(Boolean.TRUE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(true,
OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockFirstColumn() {
- Assert.assertEquals(Boolean.TRUE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(true,
OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockColBlock() {
- Assert.assertEquals(Boolean.TRUE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(true,
OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testRowBlockFirstColumnNeg() {
- Assert.assertEquals(Boolean.FALSE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(false,
OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testRowBlockColBlockNeg() {
- Assert.assertEquals(Boolean.FALSE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(false,
OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockFirstColumnNeg() {
- Assert.assertEquals(Boolean.FALSE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(false,
OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockColBlockNeg() {
- Assert.assertEquals(Boolean.FALSE,
+ if(shouldSkipTest())
+ return;
+ assertEquals(false,
OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 7001, 9000, BRLEN, BCLEN));
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
index b1a0843..98958f9 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -128,20 +127,15 @@ public class Jdk7IssueRightIndexingTest extends AutomatedTestBase
*/
public void runIndexingTest( boolean sparse, ExecType et )
{
- RUNTIME_PLATFORM oldRTP = rtplatform;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
- if(et == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- rtplatform = (et==null) ? RUNTIME_PLATFORM.HYBRID :
- (et==ExecType.MR)? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.SINGLE_NODE;
- }
-
config.addVariable("rows", rows);
config.addVariable("cols", cols);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
index d70d2c8..0a68c7f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
@@ -71,19 +71,11 @@ public class LeftIndexingScalarTest extends AutomatedTestBase
private void runLeftIndexingTest( ExecType instType )
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- if(instType == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
- }
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
-
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
index 8f48cbe..e996d5a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
@@ -175,6 +175,11 @@ public class LeftIndexingSparseDenseTest extends AutomatedTestBase
*/
public void runLeftIndexingSparseSparseTest(LixType type, ExecType et, LeftIndexingOp.LeftIndexingMethod indexingMethod)
{
+ boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
int cl = -1;
int lcols1 = cols1;
switch( type ){
@@ -188,10 +193,6 @@ public class LeftIndexingSparseDenseTest extends AutomatedTestBase
}
int cu = cl+cols2-1;
-
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldRTP = rtplatform;
-
//setup range (column lower/upper)
try {
@@ -199,16 +200,6 @@ public class LeftIndexingSparseDenseTest extends AutomatedTestBase
LeftIndexingOp.FORCED_LEFT_INDEXING = indexingMethod;
}
- if(et == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- // rtplatform = (et==ExecType.MR)? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.SINGLE_NODE;
- rtplatform = RUNTIME_PLATFORM.HYBRID;
- }
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
TestConfiguration config = getTestConfiguration(TEST_NAME);
String TEST_CACHE_DIR = "";
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
index 0abdb07..16d7a4d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
@@ -165,6 +165,11 @@ public class LeftIndexingSparseSparseTest extends AutomatedTestBase
*/
public void runLeftIndexingSparseSparseTest(LixType type, ExecType et, LeftIndexingOp.LeftIndexingMethod indexingMethod)
{
+ boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
//setup range (column lower/upper)
int cl = -1;
switch( type ){
@@ -176,24 +181,12 @@ public class LeftIndexingSparseSparseTest extends AutomatedTestBase
}
int cu = cl+cols2-1;
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldRTP = rtplatform;
try
{
if(indexingMethod != null) {
LeftIndexingOp.FORCED_LEFT_INDEXING = indexingMethod;
}
- if(et == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- // rtplatform = (et==ExecType.MR)? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.SINGLE_NODE;
- rtplatform = RUNTIME_PLATFORM.HYBRID;
- }
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
TestConfiguration config = getTestConfiguration(TEST_NAME);
String TEST_CACHE_DIR = "";
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
index 82781ce..45e5357 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
@@ -69,24 +69,17 @@ public class LeftIndexingTest extends AutomatedTestBase
private void runTestLeftIndexing(ExecType et, LeftIndexingOp.LeftIndexingMethod indexingMethod) {
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldRTP = rtplatform;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(et);
+
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("LeftIndexingTest");
try
{
if(indexingMethod != null) {
LeftIndexingOp.FORCED_LEFT_INDEXING = indexingMethod;
}
-
- if(et == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- // rtplatform = (et==ExecType.MR)? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.SINGLE_NODE;
- rtplatform = RUNTIME_PLATFORM.HYBRID;
- }
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
config.addVariable("rows", rows);
config.addVariable("cols", cols);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingUpdateInPlaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingUpdateInPlaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingUpdateInPlaceTest.java
index afa2356..f6caf7c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingUpdateInPlaceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingUpdateInPlaceTest.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import org.junit.Test;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -117,8 +118,9 @@ public class LeftIndexingUpdateInPlaceTest extends AutomatedTestBase
*/
public void runLeftIndexingUpdateInPlaceTest(boolean sparseM1, boolean sparseM2, boolean vectorM2, boolean emptyM2)
{
- RUNTIME_PLATFORM oldRTP = rtplatform;
- rtplatform = RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(ExecType.CP);
+ if(shouldSkipTest())
+ return;
try {
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/PyDMLImplicitSlicingBounds.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/PyDMLImplicitSlicingBounds.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/PyDMLImplicitSlicingBounds.java
index 4dd8a35..21d9d54 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/PyDMLImplicitSlicingBounds.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/PyDMLImplicitSlicingBounds.java
@@ -126,6 +126,9 @@ public class PyDMLImplicitSlicingBounds extends AutomatedTestBase {
* @param testName The name of this test case.
*/
private void testPyDMLImplicitSlicingBounds(String testName) {
+ if(shouldSkipTest())
+ return;
+
// Create and load test configuration
getAndLoadTestConfiguration(testName);
String HOME = SCRIPT_DIR + TEST_DIR;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
index 625dd50..cf153b3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
@@ -97,6 +97,7 @@ public class RightIndexingMatrixTest extends AutomatedTestBase
}
public void runRightIndexingTest( ExecType et, boolean sparse ) {
+
Random rand = new Random(System.currentTimeMillis());
long rl = (long)(rand.nextDouble()*((double)rows))+1;
long ru = (long)(rand.nextDouble()*((double)(rows-rl+1)))+rl;
@@ -108,16 +109,10 @@ public class RightIndexingMatrixTest extends AutomatedTestBase
public void runRightIndexingTest( ExecType et, boolean sparse, long rl, long ru, long cl, long cu )
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
index 2d49d41..8840f83 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
@@ -73,21 +73,14 @@ public class RightIndexingVectorTest extends AutomatedTestBase
public void runRightIndexingTest( ExecType et )
{
- RUNTIME_PLATFORM oldRTP = rtplatform;
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM oldRTP = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
- if(et == ExecType.SPARK) {
- rtplatform = RUNTIME_PLATFORM.SPARK;
- }
- else {
- rtplatform = (et==ExecType.MR)? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.SINGLE_NODE;
- }
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
config.addVariable("rows", rows);
config.addVariable("cols", cols);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/RowBatchRightIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RowBatchRightIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RowBatchRightIndexingTest.java
index a9a967e..b60db11 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/RowBatchRightIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RowBatchRightIndexingTest.java
@@ -87,17 +87,10 @@ public class RowBatchRightIndexingTest extends AutomatedTestBase
*/
public void runRightIndexingTest( ExecType et, boolean sparse )
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/indexing/UnboundedScalarRightIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/UnboundedScalarRightIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/UnboundedScalarRightIndexingTest.java
index 0c592f5..960958e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/UnboundedScalarRightIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/UnboundedScalarRightIndexingTest.java
@@ -75,16 +75,10 @@ public class UnboundedScalarRightIndexingTest extends AutomatedTestBase
*/
public void runRightIndexingTest( ExecType et, int val )
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try {
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
index 74c2328..6051895 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.parser.Expression.ValueType;
@@ -131,9 +130,11 @@ public class FullDynWriteTest extends AutomatedTestBase
*/
private void runDynamicWriteTest( Type type, OutputInfo fmt, ExecType et )
{
- String TEST_NAME = (type==Type.Scalar) ? TEST_NAME1 : TEST_NAME2;
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (et==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ String TEST_NAME = (type==Type.Scalar) ? TEST_NAME1 : TEST_NAME2;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+
+ if(shouldSkipTest())
+ return;
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
@@ -160,7 +161,7 @@ public class FullDynWriteTest extends AutomatedTestBase
if( type == Type.Scalar ) {
long val = MapReduceTool.readIntegerFromHDFSFile(fname);
- Assert.assertEquals(val, sum);
+ assertEquals(val, sum);
}
else{
double[][] B = readMatrix(fname, OutputInfo.getMatchingInputInfo(fmt), rows, cols, 1000, 1000);
@@ -233,4 +234,4 @@ public class FullDynWriteTest extends AutomatedTestBase
ret += A[i][j];
return UtilFunctions.toLong(ret);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
index 94d52a3..1b24be7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
@@ -58,6 +58,9 @@ public class IOTest1 extends AutomatedTestBase
@Test
public void testSimple() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
index c785108..2ded599 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
@@ -58,6 +58,9 @@ public class IOTest2 extends AutomatedTestBase
@Test
public void testSimple() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
index bdbff77..58debde 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
@@ -58,6 +58,9 @@ public class IOTest3 extends AutomatedTestBase
@Test
public void testSimple() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
index d8b3171..4a95375 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
@@ -58,6 +58,9 @@ public class IOTest4 extends AutomatedTestBase
@Test
public void testSimple() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
index ca15671..8e0ba83 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
@@ -58,6 +58,9 @@ public class IOTest5 extends AutomatedTestBase
@Test
public void testSimple() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
index 0047489..faad9a8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
@@ -19,9 +19,7 @@
package org.apache.sysml.test.integration.functions.io;
-import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -47,46 +45,52 @@ public class ScalarIOTest extends AutomatedTestBase
@Test
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 + "!=" + 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 + "!=" + int_out_scalar, int_scalar, int_out_scalar);
+ if(!shouldSkipTest()) {
+ 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();
+ assertEquals("Values not equal: " + int_scalar + "!=" + 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();
+ assertEquals("Computation test for Integers failed: Values not equal: " + int_scalar + "!=" + int_out_scalar, int_scalar, int_out_scalar);
+ }
}
@Test
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 + "!=" + 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 + "!=" + double_out_scalar, double_scalar, double_out_scalar);
+ if(!shouldSkipTest()) {
+ 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();
+ assertEquals("Values not equal: " + double_scalar + "!=" + 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();
+ assertEquals("Computation test for Integers failed: Values not equal: " + double_scalar + "!=" + double_out_scalar, double_scalar, double_out_scalar);
+ }
}
@Test
public void testBooleanScalarWrite() {
-
+ if(shouldSkipTest())
+ return;
+
boolean boolean_scalar = true;
fullDMLScriptName = HOME + "ScalarWrite.dml";
@@ -95,12 +99,14 @@ public class ScalarIOTest extends AutomatedTestBase
boolean boolean_out_scalar = TestUtils.readDMLBoolean(output(OUT_FILE));
- Assert.assertEquals("Values not equal: " + boolean_scalar + "!=" + boolean_out_scalar, boolean_scalar, boolean_out_scalar);
+ assertEquals("Values not equal: " + boolean_scalar + "!=" + boolean_out_scalar, boolean_scalar, boolean_out_scalar);
}
@Test
public void testStringScalarWrite() {
-
+ if(shouldSkipTest())
+ return;
+
String string_scalar = "String Test.!";
fullDMLScriptName = HOME + "ScalarWrite.dml";
@@ -109,12 +115,15 @@ public class ScalarIOTest extends AutomatedTestBase
String string_out_scalar = TestUtils.readDMLString(output(OUT_FILE));
- Assert.assertEquals("Values not equal: " + string_scalar + "!=" + string_out_scalar, string_scalar, string_out_scalar);
+ assertEquals("Values not equal: " + string_scalar + "!=" + string_out_scalar, string_scalar, string_out_scalar);
}
@Test
public void testIntScalarRead() {
+ if(shouldSkipTest())
+ return;
+
int int_scalar = 464;
fullDMLScriptName = HOME + "ScalarWrite.dml";
@@ -135,6 +144,9 @@ public class ScalarIOTest extends AutomatedTestBase
@Test
public void testDoubleScalarRead() {
+ if(shouldSkipTest())
+ return;
+
double double_scalar = 464.5;
fullDMLScriptName = HOME + "ScalarWrite.dml";
@@ -154,7 +166,9 @@ public class ScalarIOTest extends AutomatedTestBase
@Test
public void testBooleanScalarRead() {
-
+ if(shouldSkipTest())
+ return;
+
boolean boolean_scalar = true;
fullDMLScriptName = HOME + "ScalarWrite.dml";
@@ -172,7 +186,9 @@ public class ScalarIOTest extends AutomatedTestBase
@Test
public void testStringScalarRead() {
-
+ if(shouldSkipTest())
+ return;
+
String string_scalar = "String Test.!";
fullDMLScriptName = HOME + "ScalarWrite.dml";
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
index d62fb15..e31a48a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
@@ -210,6 +210,8 @@ public class SeqParReadTest extends AutomatedTestBase {
private void runReadTypeFormatSparsitySizeTest(boolean parallel, OutputInfo fmt, boolean dense, boolean big ) {
boolean oldpar = CompilerConfig.FLAG_PARREADWRITE_TEXT;
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
index abc07ea..1397ea6 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.io.binary;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.parser.Expression.ValueType;
@@ -91,6 +90,9 @@ public class SerializeTest extends AutomatedTestBase
private void runSerializeTest( int rows, int cols, double sparsity )
{
+ if(shouldSkipTest())
+ return;
+
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
@@ -117,7 +119,7 @@ public class SerializeTest extends AutomatedTestBase
{
double val1 = mb.quickGetValue(i, j) * 7;
double val2 = mb2.quickGetValue(i, j);
- Assert.assertEquals(val1, val2, eps);
+ assertEquals(val1, val2, eps);
}
}
catch(Exception ex)
@@ -126,4 +128,4 @@ public class SerializeTest extends AutomatedTestBase
throw new RuntimeException(ex);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
index 9cdc3a4..5f34655 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -97,9 +96,7 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 0.1;
- RUNTIME_PLATFORM old_platform = rtplatform;
-
- rtplatform = RUNTIME_PLATFORM.SINGLE_NODE;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.SINGLE_NODE);
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
@@ -110,9 +107,7 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 1.0;
- RUNTIME_PLATFORM old_platform = rtplatform;
-
- rtplatform = RUNTIME_PLATFORM.SINGLE_NODE;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.SINGLE_NODE);
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
@@ -123,9 +118,7 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 0.1;
- RUNTIME_PLATFORM old_platform = rtplatform;
-
- rtplatform = RUNTIME_PLATFORM.HADOOP;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HADOOP);
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
@@ -136,9 +129,7 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 1.0;
- RUNTIME_PLATFORM old_platform = rtplatform;
-
- rtplatform = RUNTIME_PLATFORM.HADOOP;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HADOOP);
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
@@ -149,9 +140,8 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 0.1;
- RUNTIME_PLATFORM old_platform = rtplatform;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID);
- rtplatform = RUNTIME_PLATFORM.HYBRID;
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
@@ -162,15 +152,66 @@ public class CSVParametersTest extends AutomatedTestBase
setup();
sparsity = 1.0;
- RUNTIME_PLATFORM old_platform = rtplatform;
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID);
+
+ csvParameterTest(rtplatform, sparsity);
+
+ rtplatform = old_platform;
+ }
+
+
+ @Test
+ public void testCSVParametersSparseSpark() {
+ setup();
+ sparsity = 0.1;
+
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.SPARK);
+
+ csvParameterTest(rtplatform, sparsity);
+
+ rtplatform = old_platform;
+ }
+
+ @Test
+ public void testCSVParametersDenseSpark() {
+ setup();
+ sparsity = 1.0;
+
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.SPARK);
+
+ csvParameterTest(rtplatform, sparsity);
+
+ rtplatform = old_platform;
+ }
+
+ @Test
+ public void testCSVParametersSparseHybridSpark() {
+ setup();
+ sparsity = 0.1;
+
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
- rtplatform = RUNTIME_PLATFORM.HYBRID;
+ csvParameterTest(rtplatform, sparsity);
+
+ rtplatform = old_platform;
+ }
+
+ @Test
+ public void testCSVParametersDenseHybridSpark() {
+ setup();
+ sparsity = 1.0;
+
+ RUNTIME_PLATFORM old_platform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+
csvParameterTest(rtplatform, sparsity);
rtplatform = old_platform;
}
private void csvParameterTest(RUNTIME_PLATFORM platform, double sp) {
+ setRuntimePlatform(platform);
+ if(shouldSkipTest())
+ return;
//generate actual dataset
double[][] D = getRandomMatrix(rows, cols, 0, 1, sp, 7777);
@@ -221,4 +262,4 @@ public class CSVParametersTest extends AutomatedTestBase
TestUtils.compareScalars(dmlScalar, 0.0, eps);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
index 6746acc..cdfad51 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
@@ -128,6 +128,8 @@ public class FormatChangeTest extends AutomatedTestBase
}
private void formatChangeTest() {
+ if(shouldSkipTest())
+ return;
int rows = _rows;
int cols = _cols;
@@ -203,6 +205,8 @@ public class FormatChangeTest extends AutomatedTestBase
}
private void compareFiles(int rows, int cols, double sparsity, String dmlFile, String dmlFormat, String csvFile) {
+ if(shouldSkipTest())
+ return;
String HOME = SCRIPT_DIR + TEST_DIR;
// backup old DML and R script files
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
index 71d7061..733bf85 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
@@ -144,12 +144,10 @@ public class ReadCSVTest extends AutomatedTestBase
private void runCSVTest(int testNumber, RUNTIME_PLATFORM platform, boolean parallel)
{
- RUNTIME_PLATFORM oldPlatform = rtplatform;
- rtplatform = platform;
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(platform);
+ if(shouldSkipTest())
+ return;
boolean oldpar = CompilerConfig.FLAG_PARREADWRITE_TEXT;
@@ -188,4 +186,4 @@ public class ReadCSVTest extends AutomatedTestBase
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
index bdfbe9a..db67019 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
@@ -95,8 +95,9 @@ public class WriteCSVTest extends AutomatedTestBase
private void runCSVWriteTest(RUNTIME_PLATFORM platform, boolean header, String sep, boolean sparse) throws IOException {
- RUNTIME_PLATFORM oldPlatform = rtplatform;
- rtplatform = platform;
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(platform);
+ if(shouldSkipTest())
+ return;
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
index 77e8972..ae4ab89 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
@@ -48,6 +48,9 @@ public class FormatChangeTest extends AutomatedTestBase
@Test
public void testFormatChange() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
@@ -123,6 +126,9 @@ public class FormatChangeTest extends AutomatedTestBase
}
private void verifyDMLandMMFiles(int rows, int cols, double sparsity, String dmlFile, String dmlFormat, String mmFile) {
+ if(shouldSkipTest())
+ return;
+
String HOME = SCRIPT_DIR + TEST_DIR;
// backup old DML and R script files
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
index c1e5a08..9a1ffe2 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
@@ -89,12 +89,13 @@ public class ReadMMTest extends AutomatedTestBase
private void runMMTest(int testNumber, RUNTIME_PLATFORM platform, boolean parallel) {
- RUNTIME_PLATFORM oldPlatform = rtplatform;
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(platform);
boolean oldpar = CompilerConfig.FLAG_PARREADWRITE_TEXT;
+ if(shouldSkipTest())
+ return;
try
{
- rtplatform = platform;
CompilerConfig.FLAG_PARREADWRITE_TEXT = parallel;
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
index 418769c..998c175 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameCastingTest extends AutomatedTestBase
@@ -94,7 +93,7 @@ public class FrameCastingTest extends AutomatedTestBase
for( String[][] data : F2set )
for( int i=0; i<F1s.length; i++ )
for( int j=0; j<F1s[i].length; j++ )
- Assert.assertEquals("Wrong result: "+data[i][j]+".", new Double(data[i][j]), new Double(cF1[i][j]));
+ assertEquals("Wrong result: "+data[i][j]+".", new Double(data[i][j]), new Double(cF1[i][j]));
}
private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
@@ -155,4 +154,4 @@ public class FrameCastingTest extends AutomatedTestBase
data[i][j] += val;
return data;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
index ea0c8d5..6983d17 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameDecodeTest extends AutomatedTestBase
@@ -94,7 +93,7 @@ public class FrameDecodeTest extends AutomatedTestBase
for( String[][] data : F2set )
for( int i=0; i<F1s.length; i++ )
for( int j=0; j<F1s[i].length; j++ )
- Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
+ assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
@@ -149,4 +148,4 @@ public class FrameDecodeTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
index b2c8bb7..01c0e28 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameEncodeTest extends AutomatedTestBase
@@ -93,7 +92,7 @@ public class FrameEncodeTest extends AutomatedTestBase
for( String[][] data : F2set )
for( int i=0; i<F1s.length; i++ )
for( int j=0; j<F1s[i].length; j++ )
- Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
+ assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
@@ -147,4 +146,4 @@ public class FrameEncodeTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
index 19afe29..a19cf52 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameIndexingAppendTest extends AutomatedTestBase
@@ -94,7 +93,7 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
for( String[][] data : F2set )
for( int i=0; i<F1s.length; i++ )
for( int j=0; j<F1s[i].length; j++ )
- Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
+ assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
@@ -150,4 +149,4 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
index ca4b60c..34475e3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameLeftIndexingTest extends AutomatedTestBase
@@ -94,7 +93,7 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
for( String[][] data : F2set )
for( int i=0; i<F1s.length; i++ )
for( int j=0; j<F1s[i].length; j++ )
- Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
+ assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
@@ -150,4 +149,4 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
index 5d23863..d3eb936 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.commons.lang.ArrayUtils;
import org.apache.sysml.api.jmlc.Connection;
@@ -141,7 +140,7 @@ public class FrameReadMetaTest extends AutomatedTestBase
for( int i=0; i<rows; i++ )
for( int j=0; j<cols; j++ )
if( RC[j] != null ) {
- Assert.assertEquals("Wrong result: "+F[i][j]+".",
+ assertEquals("Wrong result: "+F[i][j]+".",
Double.valueOf(X[i][j]),
Double.valueOf(RC[j].get(F[i][j]).toString()));
}
@@ -186,4 +185,4 @@ public class FrameReadMetaTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
index 7fb6bfd..c6d3d76 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
@@ -33,7 +33,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
public class FrameTransformTest extends AutomatedTestBase
@@ -95,7 +94,7 @@ public class FrameTransformTest extends AutomatedTestBase
//check correct result (nnz 7 + 0 -> 8 distinct vals)
for( double[][] data : Yset )
- Assert.assertEquals("Wrong result: "+data[0][0]+".", new Double(8), new Double(data[0][0]));
+ assertEquals("Wrong result: "+data[0][0]+".", new Double(8), new Double(data[0][0]));
}
private static ArrayList<double[][]> execDMLScriptviaJMLC( String testname, String[][] X, String[][] M, boolean modelReuse)
@@ -202,4 +201,4 @@ public class FrameTransformTest extends AutomatedTestBase
for( int i=0; i<data.length; i++ )
data[i][col] = val;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCClonedPreparedScriptTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCClonedPreparedScriptTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCClonedPreparedScriptTest.java
index 80cab67..725b4d0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCClonedPreparedScriptTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCClonedPreparedScriptTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
@@ -125,7 +124,7 @@ public class JMLCClonedPreparedScriptTest extends AutomatedTestBase
}
//check expected failure
- Assert.assertTrue(failed==!clone || k==1);
+ assertTrue(failed==!clone || k==1);
}
private static class JMLCTask implements Callable<Double>
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/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 530fa89..00f2ec5 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
@@ -27,7 +27,6 @@ import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.runtime.instructions.cp.ScalarObject;
import org.apache.sysml.test.integration.AutomatedTestBase;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -147,7 +146,7 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
PreparedScript script = conn.prepareScript(str, new String[] {}, new String[] { "outInteger" }, false);
long result = script.executeScript().getLong("outInteger");
- Assert.assertEquals(5, result);
+ assertEquals(5, result);
conn.close();
}
@@ -158,7 +157,7 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
PreparedScript script = conn.prepareScript(str, new String[] {}, new String[] { "outDouble" }, false);
double result = script.executeScript().getDouble("outDouble");
- Assert.assertEquals(1.23, result, 0);
+ assertEquals(1.23, result, 0);
conn.close();
}
@@ -169,7 +168,7 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
PreparedScript script = conn.prepareScript(str, new String[] {}, new String[] { "outString" }, false);
String result = script.executeScript().getString("outString");
- Assert.assertEquals("hello", result);
+ assertEquals("hello", result);
conn.close();
}
@@ -180,7 +179,7 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
PreparedScript script = conn.prepareScript(str, new String[] {}, new String[] { "outBoolean" }, false);
boolean result = script.executeScript().getBoolean("outBoolean");
- Assert.assertEquals(false, result);
+ assertEquals(false, result);
conn.close();
}
@@ -192,8 +191,8 @@ public class JMLCInputOutputTest extends AutomatedTestBase {
ScalarObject so = script.executeScript().getScalarObject("outDouble");
double result = so.getDoubleValue();
- Assert.assertEquals(1.23, result, 0);
+ assertEquals(1.23, result, 0);
conn.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputStreamReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputStreamReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputStreamReadTest.java
index 49570a6..8605057 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputStreamReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCInputStreamReadTest.java
@@ -123,6 +123,9 @@ public class JMLCInputStreamReadTest extends AutomatedTestBase
private void runJMLCInputStreamReadTest(DataType dt, boolean sparse, String format, boolean metaData )
throws IOException
{
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCParfor2ForCompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCParfor2ForCompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCParfor2ForCompileTest.java
index 25cc037..c8a2cb5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCParfor2ForCompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/JMLCParfor2ForCompileTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.jmlc;
import java.io.IOException;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
@@ -68,10 +67,10 @@ public class JMLCParfor2ForCompileTest extends AutomatedTestBase
conn.close();
//check for existing or non-existing parfor
- Assert.assertTrue("INCORRECT PARFOR COUNT", Statistics.getParforOptCount()==(par?1:0));
+ assertTrue(Statistics.getParforOptCount()==(par?1:0));
}
catch(Exception ex) {
- Assert.fail("JMLC parfor test failed: "+ex.getMessage());
+ fail("JMLC parfor test failed: "+ex.getMessage());
} finally {
ConfigurationManager.resetStatistics();
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
index b51dc14..5d3ed7e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
@@ -81,6 +81,9 @@ public class MulticlassSVMScoreTest extends AutomatedTestBase
private void runJMLCMulticlassTest( boolean sparse, boolean flags )
throws IOException
{
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/NamespaceFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/NamespaceFunctionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/NamespaceFunctionTest.java
index 63d8be6..d0bb48e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/NamespaceFunctionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/NamespaceFunctionTest.java
@@ -31,7 +31,6 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-import org.junit.Assert;
import org.junit.Test;
public class NamespaceFunctionTest extends AutomatedTestBase
@@ -114,7 +113,7 @@ public class NamespaceFunctionTest extends AutomatedTestBase
//compare results
for(int i=0; i<rows; i++)
for(int j=0; j<cols; j++)
- Assert.assertEquals(X.quickGetValue(i, j)+10,
+ assertEquals(X.quickGetValue(i, j)+10,
Z.quickGetValue(i, j), 1e-10);
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
index 2ed066d..3b50442 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
@@ -29,7 +29,6 @@ import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-import org.junit.Assert;
import org.junit.Test;
public class ReuseModelVariablesTest extends AutomatedTestBase
@@ -110,7 +109,7 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
ArrayList<double[][]> Yset = execDMLScriptviaJMLC( TEST_NAME, Xset, modelReuse );
//check non-empty y
- Assert.assertEquals(Xset.size(), Yset.size());
+ assertEquals(Xset.size(), Yset.size());
}
private static ArrayList<double[][]> execDMLScriptviaJMLC( String testname, ArrayList<double[][]> X, boolean modelReuse)
@@ -182,4 +181,4 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/AssertExpressionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/AssertExpressionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/AssertExpressionTest.java
index adda447..8f3fdbb 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/AssertExpressionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/AssertExpressionTest.java
@@ -59,6 +59,9 @@ public class AssertExpressionTest extends AutomatedTestBase
*/
private void runPrintExpressionTest( String testname, boolean rewrites )
{
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
index df94686..f242938 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
@@ -113,6 +113,8 @@ public class ConditionalValidateTest extends AutomatedTestBase
private void runTest( String testName, boolean exceptionExpected, boolean fileExists )
{
String TEST_NAME = testName;
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
index 1032ad5..b507cd4 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLException;
@@ -90,6 +89,8 @@ public class DataTypeCastingTest extends AutomatedTestBase
{
String TEST_NAME = testName;
int numVals = (exceptionExpected ? 7 : 1);
+ if(shouldSkipTest())
+ return;
try
{
@@ -128,7 +129,7 @@ public class DataTypeCastingTest extends AutomatedTestBase
}
//compare results
- Assert.assertEquals(V[0][0], ret, 1e-16);
+ assertEquals(V[0][0], ret, 1e-16);
}
}
catch(Exception ex)
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
index 6462969..5a50d36 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
@@ -34,7 +34,6 @@ import org.apache.sysml.parser.ParserFactory;
import org.apache.sysml.parser.ParserWrapper;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -151,6 +150,9 @@ public class DataTypeChangeTest extends AutomatedTestBase
private void runTest( String testName, boolean exceptionExpected )
{
+ if(shouldSkipTest())
+ return;
+
String RI_HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = RI_HOME + testName + ".dml";
programArgs = new String[]{};
@@ -205,10 +207,10 @@ public class DataTypeChangeTest extends AutomatedTestBase
{
ex2.printStackTrace();
throw new RuntimeException(ex2);
- //Assert.fail( "Unexpected exception occured during test run." );
+ //fail( "Unexpected exception occured during test run." );
}
//check correctness
- Assert.assertEquals(expectedException, raisedException);
+ assertEquals(expectedException, raisedException);
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ExistsVariableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ExistsVariableTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ExistsVariableTest.java
index bdc0497..9aa563d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ExistsVariableTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ExistsVariableTest.java
@@ -20,7 +20,6 @@
package org.apache.sysml.test.integration.functions.misc;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -63,6 +62,8 @@ public class ExistsVariableTest extends AutomatedTestBase
}
private void runExistsTest(String testName, boolean pos) {
+ if(shouldSkipTest())
+ return;
TestConfiguration config = getTestConfiguration(testName);
loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
@@ -76,7 +77,7 @@ public class ExistsVariableTest extends AutomatedTestBase
//compare results
Double val = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1));
val = (val!=null) ? val : 0;
- Assert.assertTrue("Wrong result: "+param+" vs "+val,
+ assertTrue("Wrong result: "+param+" vs "+val,
val==Double.parseDouble(param));
}
}