Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 d0821edec -> 0491ad249
ignite-471-2: fixing test suites Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0491ad24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0491ad24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0491ad24 Branch: refs/heads/ignite-471-2 Commit: 0491ad2496114bf13a1a551310c78fa18c10e258 Parents: d0821ed Author: Denis Magda <[email protected]> Authored: Tue May 19 16:33:54 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Tue May 19 16:33:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/testframework/config/GridTestProperties.java | 3 +++ .../ignite/testframework/junits/IgniteTestResources.java | 2 +- .../apache/ignite/testsuites/IgniteBasicTestSuite.java | 11 ++++++++++- .../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 10 ++++++++-- 4 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0491ad24/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index 8791ec8..9345618 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -64,6 +64,9 @@ public final class GridTestProperties { private static final Map<String, Map<String, String>> pathProps = new HashMap<>(); /** */ + public static final String MARSH_CLASS_NAME = "marshaller.class"; + + /** */ static { // Initialize IGNITE_HOME system property. String igniteHome = System.getProperty("IGNITE_HOME"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0491ad24/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 50bc5e8..734eb51 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -230,7 +230,7 @@ public class IgniteTestResources { */ @SuppressWarnings("unchecked") public synchronized Marshaller getMarshaller() throws IgniteCheckedException { - String marshallerName = GridTestProperties.getProperty("marshaller.class"); + String marshallerName = GridTestProperties.getProperty(GridTestProperties.MARSH_CLASS_NAME); Marshaller marsh; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0491ad24/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 56ff951..939346c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -26,8 +26,11 @@ import org.apache.ignite.internal.processors.closure.*; import org.apache.ignite.internal.processors.continuous.*; import org.apache.ignite.internal.product.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.marshaller.jdk.*; +import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.messaging.*; import org.apache.ignite.spi.*; +import org.apache.ignite.testframework.config.*; /** * Basic test suite. @@ -42,7 +45,13 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTest(IgniteLangSelfTestSuite.suite()); suite.addTest(IgniteUtilSelfTestSuite.suite()); - suite.addTest(IgniteMarshallerSelfTestSuite.suite()); + + Object marshClass = GridTestProperties.getProperty(GridTestProperties.MARSH_CLASS_NAME); + + if (marshClass == null || marshClass.equals(OptimizedMarshaller.class.getName()) || + marshClass.equals(JdkMarshaller.class.getName())) + suite.addTest(IgniteMarshallerSelfTestSuite.suite()); + suite.addTest(IgniteKernalSelfTestSuite.suite()); suite.addTest(IgniteStartUpTestSuite.suite()); suite.addTest(IgniteExternalizableSelfTestSuite.suite()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0491ad24/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index dd3ce27..e33f143 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -23,7 +23,9 @@ import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.internal.processors.cache.distributed.replicated.*; +import org.apache.ignite.marshaller.jdk.*; +import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.testframework.config.*; /** * Test suite. @@ -38,7 +40,11 @@ public class IgniteCacheFailoverTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class); - suite.addTestSuite(GridCacheIncrementTransformTest.class); + Object marshClass = GridTestProperties.getProperty(GridTestProperties.MARSH_CLASS_NAME); + + if (marshClass == null || marshClass.equals(OptimizedMarshaller.class.getName()) || + marshClass.equals(JdkMarshaller.class.getName())) + suite.addTestSuite(GridCacheIncrementTransformTest.class); // Failure consistency tests. suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
