Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 d7127e0ca -> c7753d873
# ignite-648: uncomment p2p disabled tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7753d87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7753d87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7753d87 Branch: refs/heads/ignite-648 Commit: c7753d873c3958912b1154d1e2b713d1e0939ce3 Parents: d7127e0 Author: Artem Shutak <[email protected]> Authored: Thu May 14 16:54:43 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu May 14 16:54:43 2015 +0300 ---------------------------------------------------------------------- ...CachePartitionedMultiJvmFullApiSelfTest.java | 15 ++++++++++++++ ...dCacheReplicatedMultiJvmFullApiSelfTest.java | 7 +++++++ .../testsuites/IgniteMultiJvmTestSuite.java | 21 ++++++++++---------- 3 files changed, 32 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7753d87/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java index 336949a..807564a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.processors.cache.multijvm.framework.*; /** * Multy Jvm tests. @@ -27,4 +28,18 @@ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartit protected boolean isMultiJvm() { return true; } + + @Override protected void afterTest() throws Exception { + super.afterTest(); // TODO: CODE: implement. + + IgniteExProcessProxy.killAll(); + } + + @Override public void testPutAllRemoveAll() throws Exception { + super.testPutAllRemoveAll(); // TODO: CODE: implement. + } + + @Override public void testPutAllPutAll() throws Exception { + super.testPutAllPutAll(); // TODO: CODE: implement. + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7753d87/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java index b135099..5e57673 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; +import org.apache.ignite.internal.processors.cache.multijvm.framework.*; /** * Multy Jvm tests. @@ -27,4 +28,10 @@ public class GridCacheReplicatedMultiJvmFullApiSelfTest extends GridCacheReplica protected boolean isMultiJvm() { return true; } + + @Override protected void afterTest() throws Exception { + super.afterTest(); // TODO: CODE: implement. + + IgniteExProcessProxy.killAll(); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7753d87/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMultiJvmTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMultiJvmTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMultiJvmTestSuite.java index cb900b7..72de5e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMultiJvmTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMultiJvmTestSuite.java @@ -33,8 +33,7 @@ public class IgniteMultiJvmTestSuite extends TestSuite { // Multi-node. suite.addTestSuite(GridCacheReplicatedMultiJvmFullApiSelfTest.class); - // Hangs (see "Remote node has peer class loading enabled flag different from local"). -// suite.addTestSuite(GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.class); @@ -43,24 +42,24 @@ public class IgniteMultiJvmTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.class); -// suite.addTestSuite(GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.class); -// suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheNearOnlyMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.class); @@ -70,7 +69,7 @@ public class IgniteMultiJvmTestSuite extends TestSuite { suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class); - // TODO create multi Jvm tests + // TODO create multi Jvm runners for tests. // suite.addTestSuite(GridCacheNearReloadAllSelfTest.class); // suite.addTestSuite(GridCacheColocatedReloadAllSelfTest.class); // suite.addTestSuite(GridCacheAtomicReloadAllSelfTest.class); @@ -86,7 +85,7 @@ public class IgniteMultiJvmTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.class); // Private cache API. - // TODO create multi Jvm tests + // TODO create multi Jvm runners for tests // suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); // suite.addTestSuite(GridCacheExReplicatedFullApiSelfTest.class); // suite.addTestSuite(GridCacheExNearFullApiSelfTest.class);
