Repository: incubator-systemml Updated Branches: refs/heads/master c7d990ce6 -> f7e7a5fa8
[SYSTEMML-999] Synchronize MLContext and Frame test suites Included MLContextMultipleScriptsTest and MLContextScratchCleanupTest in corresponding package suite which restores 12 tests. Also updated other suite classes for consistency. Closes #266. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/f7e7a5fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/f7e7a5fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/f7e7a5fa Branch: refs/heads/master Commit: f7e7a5fa86d3a3fbe5e50c3d57d128fd62efd5bc Parents: c7d990c Author: Glenn Weidner <gweid...@us.ibm.com> Authored: Fri Sep 30 18:32:25 2016 -0700 Committer: Glenn Weidner <gweid...@us.ibm.com> Committed: Fri Sep 30 18:32:25 2016 -0700 ---------------------------------------------------------------------- .../sysml/test/integration/functions/frame/ZPackageSuite.java | 6 ++++++ .../test/integration/functions/mlcontext/ZPackageSuite.java | 5 ++++- .../apache/sysml/test/integration/mlcontext/ZPackageSuite.java | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f7e7a5fa/src/test_suites/java/org/apache/sysml/test/integration/functions/frame/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/frame/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/frame/ZPackageSuite.java index 25127ce..50d7a67 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/frame/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/frame/ZPackageSuite.java @@ -26,13 +26,19 @@ import org.junit.runners.Suite; * won't run two of them at once. */ @RunWith(Suite.class) @Suite.SuiteClasses({ + FrameAppendDistTest.class, FrameAppendTest.class, FrameCastingTest.class, FrameConverterTest.class, FrameCopyTest.class, + FrameEvictionTest.class, + FrameFunctionTest.class, FrameGetSetTest.class, + FrameIndexingDistTest.class, FrameIndexingTest.class, FrameMatrixCastingTest.class, + FrameMatrixReblockTest.class, + FrameMatrixWriteTest.class, FrameMetaReadWriteTest.class, FrameReadWriteTest.class, FrameScalarCastingTest.class, http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f7e7a5fa/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java index 63f8760..e5911ea 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java @@ -26,10 +26,13 @@ import org.junit.runners.Suite; * won't run two of them at once. */ @RunWith(Suite.class) @Suite.SuiteClasses({ + DataFrameMatrixConversionTest.class, + DataFrameRowFrameConversionTest.class, + DataFrameVectorFrameConversionTest.class, + FrameTest.class, GNMFTest.class }) - /** This class is just a holder for the above JUnit annotations. */ public class ZPackageSuite { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f7e7a5fa/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java index 387579f..9bb1a55 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java @@ -27,8 +27,10 @@ import org.junit.runners.Suite; * they should not be run in parallel. */ @RunWith(Suite.class) @Suite.SuiteClasses({ - org.apache.sysml.test.integration.mlcontext.MLContextTest.class, - org.apache.sysml.test.integration.mlcontext.MLContextFrameTest.class + org.apache.sysml.test.integration.mlcontext.MLContextFrameTest.class, + org.apache.sysml.test.integration.mlcontext.MLContextMultipleScriptsTest.class, + org.apache.sysml.test.integration.mlcontext.MLContextScratchCleanupTest.class, + org.apache.sysml.test.integration.mlcontext.MLContextTest.class })
