Repository: ignite Updated Branches: refs/heads/ignite-1016 [created] 8f5a4c9de
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/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 1deb3bc..df657e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -22,10 +22,10 @@ import junit.framework.TestSuite; import org.apache.ignite.GridCacheAffinityBackupsSelfTest; import org.apache.ignite.IgniteCacheAffinitySelfTest; import org.apache.ignite.cache.IgniteWarmupClosureSelfTest; -import org.apache.ignite.cache.affinity.IgniteClientNodeAffinityTest; -import org.apache.ignite.cache.affinity.fair.GridFairAffinityFunctionNodesSelfTest; -import org.apache.ignite.cache.affinity.fair.GridFairAffinityFunctionSelfTest; -import org.apache.ignite.cache.affinity.fair.IgniteFairAffinityDynamicCacheSelfTest; +import org.apache.ignite.cache.affinity.AffinityClientNodeSelfTest; +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.store.GridCacheBalancingStoreSelfTest; import org.apache.ignite.cache.store.GridCacheLoadOnlyStoreAdapterSelfTest; import org.apache.ignite.cache.store.StoreResourceInjectionSelfTest; @@ -183,12 +183,12 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteWarmupClosureSelfTest.class); // Affinity tests. - suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class); - suite.addTestSuite(GridFairAffinityFunctionSelfTest.class); - suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class); + suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class); + suite.addTestSuite(FairAffinityFunctionSelfTest.class); + suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class); suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); suite.addTestSuite(IgniteCacheAffinitySelfTest.class); - suite.addTestSuite(IgniteClientNodeAffinityTest.class); + suite.addTestSuite(AffinityClientNodeSelfTest.class); // Swap tests. suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/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 bd24e51..93bd26c 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 @@ -18,6 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionExcludeNeighborsSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionExcludeNeighborsSelfTest; import org.apache.ignite.internal.processors.cache.CacheDhtLocalPartitionAfterRemoveSelfTest; import org.apache.ignite.internal.processors.cache.CrossCacheTxRandomOperationsTest; import org.apache.ignite.internal.processors.cache.GridCacheAtomicMessageCountSelfTest; @@ -32,7 +36,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdate import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop; import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionNotLoadedEventSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedAffinityFilterSelfTest; import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; @@ -101,7 +104,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxSingleThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityClientSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionSelfTest; @@ -162,7 +164,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class)); suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class)); - suite.addTest(new TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class)); + suite.addTest(new TestSuite(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class)); + suite.addTest(new TestSuite(FairAffinityFunctionExcludeNeighborsSelfTest.class)); suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class)); @@ -198,7 +201,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheNearPreloadRestartSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadStartStopSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAffinityFilterSelfTest.class)); + suite.addTest(new TestSuite(RendezvousAffinityFunctionBackupFilterSelfTest.class)); + suite.addTest(new TestSuite(FairAffinityFunctionBackupFilterSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class)); suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f5a4c9d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index cb39660..f3fbf15 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -47,6 +47,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CachePeekMode; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlFieldsQuery; @@ -179,6 +180,9 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac IgniteCacheReplicatedQuerySelfTest.CacheKey.class, IgniteCacheReplicatedQuerySelfTest.CacheValue.class ); + if (cacheMode() != CacheMode.LOCAL) + cc.setAffinity(new RendezvousAffinityFunction()); + // Explicitly set number of backups equal to number of grids. if (cacheMode() == CacheMode.PARTITIONED) cc.setBackups(gridCount());