Repository: ignite Updated Branches: refs/heads/ignite-4652 0cf2cf932 -> f979979a1
ignite-db-x move affinity test to another suit Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47c7df9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47c7df9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47c7df9d Branch: refs/heads/ignite-4652 Commit: 47c7df9dcd3facf43e60209ee36b5888936bcd56 Parents: 1124723 Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Authored: Fri Feb 3 18:30:20 2017 +0300 Committer: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Committed: Fri Feb 3 18:30:20 2017 +0300 ---------------------------------------------------------------------- .../ignite/testsuites/IgniteCacheTestSuite.java | 10 ---------- .../ignite/testsuites/IgniteCacheTestSuite5.java | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/47c7df9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 66bba34..1cf2c14 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -229,16 +229,6 @@ public class IgniteCacheTestSuite extends TestSuite { // Warmup closure tests. suite.addTestSuite(IgniteWarmupClosureSelfTest.class); - // Affinity tests. - suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class); - suite.addTestSuite(FairAffinityFunctionSelfTest.class); - suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class); - suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); - suite.addTestSuite(IgniteCacheAffinitySelfTest.class); - suite.addTestSuite(AffinityClientNodeSelfTest.class); - suite.addTestSuite(LocalAffinityFunctionTest.class); - suite.addTestSuite(AffinityHistoryCleanupTest.class); - // Swap tests. suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/47c7df9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index b4d0822..d225501 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -18,6 +18,14 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; +import org.apache.ignite.GridCacheAffinityBackupsSelfTest; +import org.apache.ignite.IgniteCacheAffinitySelfTest; +import org.apache.ignite.cache.affinity.AffinityClientNodeSelfTest; +import org.apache.ignite.cache.affinity.AffinityHistoryCleanupTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityDynamicCacheSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionNodesSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionSelfTest; +import org.apache.ignite.cache.affinity.local.LocalAffinityFunctionTest; import org.apache.ignite.internal.processors.cache.CacheNearReaderUpdateTest; import org.apache.ignite.internal.processors.cache.CacheRebalancingSelfTest; import org.apache.ignite.internal.processors.cache.CacheSerializableTransactionsTest; @@ -32,7 +40,6 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinity import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteActiveOnStartNodeJoinValidationSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCachePartitionLossPolicySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest; import org.apache.ignite.internal.processors.cache.store.IgniteCacheWriteBehindNoUpdateSelfTest; @@ -70,6 +77,16 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTestSuite(CacheRebalancingSelfTest.class); + // Affinity tests. + suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class); + suite.addTestSuite(FairAffinityFunctionSelfTest.class); + suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class); + suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); + suite.addTestSuite(IgniteCacheAffinitySelfTest.class); + suite.addTestSuite(AffinityClientNodeSelfTest.class); + suite.addTestSuite(LocalAffinityFunctionTest.class); + suite.addTestSuite(AffinityHistoryCleanupTest.class); + return suite; } }
