Repository: ignite Updated Branches: refs/heads/ignite-1272 97e1dc23c -> f494f254e
ignite-1272: fixing tests for portable marshaller Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f494f254 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f494f254 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f494f254 Branch: refs/heads/ignite-1272 Commit: f494f254e03d9b9b2587e46d159e3a0f5556169c Parents: 97e1dc2 Author: Denis Magda <[email protected]> Authored: Mon Oct 12 18:24:53 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Oct 12 18:24:53 2015 +0300 ---------------------------------------------------------------------- .../ignite/testsuites/IgniteBasicTestSuite.java | 4 ++-- .../ignite/testsuites/IgniteP2PSelfTestSuite.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f494f254/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 1a9913f..f8d657b 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 @@ -75,7 +75,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTest(IgniteKernalSelfTestSuite.suite(ignoredTests)); suite.addTest(IgniteStartUpTestSuite.suite()); suite.addTest(IgniteExternalizableSelfTestSuite.suite()); - suite.addTest(IgniteP2PSelfTestSuite.suite()); + suite.addTest(IgniteP2PSelfTestSuite.suite(ignoredTests)); suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuite.suite(ignoredTests)); suite.addTest(IgniteStreamSelfTestSuite.suite()); @@ -113,4 +113,4 @@ public class IgniteBasicTestSuite extends TestSuite { return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f494f254/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java index ddf7d37..7bade98 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.internal.managers.deployment.GridDeploymentMessageCountSelfTest; import org.apache.ignite.p2p.GridP2PClassLoadingSelfTest; @@ -33,17 +34,26 @@ import org.apache.ignite.p2p.GridP2PRemoteClassLoadersSelfTest; import org.apache.ignite.p2p.GridP2PSameClassLoaderSelfTest; import org.apache.ignite.p2p.GridP2PTimeoutSelfTest; import org.apache.ignite.p2p.GridP2PUndeploySelfTest; +import org.apache.ignite.testframework.GridTestUtils; /** * P2P test suite. */ public class IgniteP2PSelfTestSuite extends TestSuite { /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + return suite(null); + } + + /** * @return P2P tests suite. * @throws Exception If failed. */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) - public static TestSuite suite() throws Exception { + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite P2P Test Suite"); suite.addTest(new TestSuite(GridP2PDoubleDeploymentSelfTest.class)); @@ -60,8 +70,8 @@ public class IgniteP2PSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridP2PTimeoutSelfTest.class)); suite.addTest(new TestSuite(GridP2PMissedResourceCacheSizeSelfTest.class)); suite.addTest(new TestSuite(GridP2PContinuousDeploymentSelfTest.class)); - suite.addTest(new TestSuite(GridDeploymentMessageCountSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridDeploymentMessageCountSelfTest.class, ignoredTests); return suite; } -} \ No newline at end of file +}
