# ignite-695: merging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2dc3e8bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2dc3e8bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2dc3e8bb Branch: refs/heads/ignite-695 Commit: 2dc3e8bb2eed1872e1e2a61b27c56a9bf38379d0 Parents: d1f6b26 Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue May 12 13:35:03 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue May 12 13:35:03 2015 +0300 ---------------------------------------------------------------------- .../ignite/testsuites/IgniteCacheTestSuite2.java | 15 ++++++++------- .../ignite/testsuites/IgniteCacheTestSuite3.java | 14 +++++--------- .../ignite/testsuites/IgniteCacheTestSuite4.java | 10 ++++------ 3 files changed, 17 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dc3e8bb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index dfd88a8..98e91d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -88,7 +88,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheDhtEntrySelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtInternalEntrySelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class)); -// suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); TODO-gg-4066 + suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class)); @@ -113,7 +113,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class)); -// suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); TODO-gg-5489 + suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAffinityHashIdResolverSelfTest.class)); @@ -127,11 +127,12 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); - // TODO: GG-7242, GG-7243: Enabled when fixed. -// suite.addTest(new TestSuite(GridCacheDhtRemoveFailureTest.class)); -// suite.addTest(new TestSuite(GridCacheNearRemoveFailureTest.class)); - // TODO: GG-7201: Enable when fixed. - //suite.addTest(new TestSuite(GridCacheDhtAtomicRemoveFailureTest.class)); + // TODO: GG-7242, GG-7243 already fixed. If next tests passed, when comment should be deleted. + suite.addTest(new TestSuite(GridCacheDhtRemoveFailureTest.class)); + // TODO: GG-7242, GG-7243 already fixed. If next tests passed, when comment should be deleted. + suite.addTest(new TestSuite(GridCacheNearRemoveFailureTest.class)); + // TODO: GG-7201 already fixed. If next tests passed, when comment should be deleted. + suite.addTest(new TestSuite(GridCacheDhtAtomicRemoveFailureTest.class)); suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class)); suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dc3e8bb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java index 9394693..4329928 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java @@ -56,12 +56,10 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCacheReplicatedEventSelfTest.class); suite.addTestSuite(GridCacheReplicatedSynchronousCommitTest.class); - // TODO: GG-7437. - // suite.addTestSuite(GridCacheReplicatedInvalidateSelfTest.class); + suite.addTestSuite(GridCacheReplicatedInvalidateSelfTest.class); suite.addTestSuite(GridCacheReplicatedLockSelfTest.class); - // TODO: enable when GG-7437 is fixed. - //suite.addTestSuite(GridCacheReplicatedMultiNodeLockSelfTest.class); - //suite.addTestSuite(GridCacheReplicatedMultiNodeSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMultiNodeLockSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMultiNodeSelfTest.class); suite.addTestSuite(GridCacheReplicatedNodeFailureSelfTest.class); suite.addTestSuite(GridCacheReplicatedTxSingleThreadedSelfTest.class); suite.addTestSuite(GridCacheReplicatedTxTimeoutSelfTest.class); @@ -76,12 +74,10 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCachePutArrayValueSelfTest.class); suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class); suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); - // TODO: GG-7569. - // suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class); + suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class); - // TODO: GG-7434 - // suite.addTestSuite(GridReplicatedTxPreloadTest.class); + suite.addTestSuite(GridReplicatedTxPreloadTest.class); suite.addTestSuite(IgniteTxReentryNearSelfTest.class); suite.addTestSuite(IgniteTxReentryColocatedSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dc3e8bb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index f7272d4..477e4e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -38,9 +38,8 @@ public class IgniteCacheTestSuite4 extends TestSuite { // Multi node update. suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class); - // TODO: GG-5353. - // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class); - // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class); + suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class); + suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class); suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class); suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class); @@ -87,9 +86,8 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(IgniteCacheTxLocalPeekModesTest.class); suite.addTestSuite(IgniteCacheTxReplicatedPeekModesTest.class); - // TODO: IGNITE-114. - // suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class); - // suite.addTestSuite(GridCacheVersionMultinodeTest.class); + suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class); + suite.addTestSuite(GridCacheVersionMultinodeTest.class); suite.addTestSuite(IgniteCacheNearReadCommittedTest.class); suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
