Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 df808af91 -> 48afb862d
ignite-471-2: added ability to remove particular test Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/099ef55e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/099ef55e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/099ef55e Branch: refs/heads/ignite-471-2 Commit: 099ef55eff621f648e2b07fd94938f0a811ce4fa Parents: 2460267 Author: Denis Magda <dma...@gridgain.com> Authored: Tue May 26 11:45:28 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue May 26 11:45:28 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheFailoverTestSuite.java | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/099ef55e/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 e33f143..c7f85b3 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,9 +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.marshaller.jdk.*; -import org.apache.ignite.marshaller.optimized.*; -import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Test suite. @@ -36,15 +36,20 @@ public class IgniteCacheFailoverTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Cache Failover Test Suite"); suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.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); + GridTestUtils.addTestIfNeeded(suite, GridCacheIncrementTransformTest.class, ignoredTests); // Failure consistency tests. suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
