Merging from 1.5.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77a3f64f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77a3f64f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77a3f64f Branch: refs/heads/ignite-1843 Commit: 77a3f64f1d5ad1b313e6d321bd7a83ec8df62011 Parents: 5fb3bf6 Author: sboikov <[email protected]> Authored: Tue Nov 10 11:39:37 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 10 11:40:10 2015 +0300 ---------------------------------------------------------------------- ...niteCacheClientNodeChangingTopologyTest.java | 4 + .../testsuites/IgniteCacheTestSuite2.java | 114 ++++++++++++++++++- 2 files changed, 115 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/77a3f64f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index abff171..1e3382d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -1555,6 +1555,8 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testAtomicPrimaryPutAllMultinode() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-1685";); + multinode(PRIMARY, TestType.PUT_ALL); } @@ -1562,6 +1564,8 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testAtomicClockPutAllMultinode() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-1685";); + multinode(CLOCK, TestType.PUT_ALL); } http://git-wip-us.apache.org/repos/asf/ignite/blob/77a3f64f/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 bdc8884..5138dac 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 @@ -134,10 +134,118 @@ public class IgniteCacheTestSuite2 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 2"); + // Local cache. + suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class); + suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class); + suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class); + suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class); + suite.addTestSuite(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class); + suite.addTestSuite(GridCacheLocalLoadAllSelfTest.class); + suite.addTestSuite(GridCacheLocalLockSelfTest.class); + suite.addTestSuite(GridCacheLocalMultithreadedSelfTest.class); + suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class); + suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class); + suite.addTestSuite(GridCacheLocalEventSelfTest.class); + suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); + suite.addTestSuite(GridCacheVariableTopologySelfTest.class); + suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class); + suite.addTestSuite(GridCacheTransformEventSelfTest.class); + suite.addTestSuite(GridCacheLocalIsolatedNodesSelfTest.class); + + // Partitioned cache. + suite.addTestSuite(GridCachePartitionedGetSelfTest.class); + suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class)); + suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class)); + suite.addTest(new TestSuite(NoneRebalanceModeSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class)); + suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.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)); + suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedBasicStoreMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedEventSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedLockSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNearDisabledLockSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class)); + suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedTxTimeoutSelfTest.class)); + suite.addTest(new TestSuite(GridCacheFinishPartitionsSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtEntrySelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtInternalEntrySelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadMultiThreadedSelfTest.class)); + suite.addTest(new TestSuite(CacheDhtLocalPartitionAfterRemoveSelfTest.class)); + suite.addTest(new TestSuite(GridCacheColocatedPreloadRestartSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearPreloadRestartSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadStartStopSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.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)); + suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class)); + suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class)); + suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAffinityHashIdResolverSelfTest.class)); + suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class)); + suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class); + suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class)); + suite.addTest(new TestSuite(IgniteCacheNearOffheapGetSelfTest.class)); + + suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class)); + suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class)); + + suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); + + suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class)); + suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class)); + + suite.addTest(new TestSuite(IgniteCachePartitionMapUpdateTest.class)); + suite.addTest(new TestSuite(IgniteCacheClientNodePartitionsExchangeTest.class)); suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); - suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); - suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); - suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); + suite.addTest(new TestSuite(IgniteCacheServerNodeConcurrentStart.class)); + + suite.addTest(new TestSuite(IgniteCacheEntryProcessorNodeJoinTest.class)); + suite.addTest(new TestSuite(IgniteAtomicCacheEntryProcessorNodeJoinTest.class)); + suite.addTest(new TestSuite(GridCacheNearTxForceKeyTest.class)); + suite.addTest(new TestSuite(CrossCacheTxRandomOperationsTest.class)); + suite.addTest(new TestSuite(IgniteDynamicCacheAndNodeStop.class)); return suite; }
