ignite-4535 : Added more config variations for Full API tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc571fce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc571fce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc571fce Branch: refs/heads/ignite-3477-master Commit: bc571fce555689a59d575868b4bf4cb66ebba1af Parents: 5157bc8 Author: Ilya Lantukh <[email protected]> Authored: Fri Apr 7 17:05:27 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Fri Apr 7 17:05:27 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheReloadSelfTest.java | 3 ++- .../cache/GridCacheTtlManagerEvictionSelfTest.java | 7 ++++--- .../org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 4 ++-- .../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 5 ++--- .../org/apache/ignite/testsuites/IgniteCacheTestSuite3.java | 8 ++++---- .../ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java | 1 - 6 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java index f3340f4..50bed2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java @@ -21,6 +21,7 @@ import java.util.Collections; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.CacheStoreAdapter; @@ -173,7 +174,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < N_ENTRIES; i++) load(cache, i, true); - assertEquals(MAX_CACHE_ENTRIES, cache.size()); + assertEquals(MAX_CACHE_ENTRIES, cache.size(CachePeekMode.ONHEAP)); } finally { stopGrid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java index 23f06c6..29ffe87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java @@ -23,6 +23,7 @@ import javax.cache.expiry.Duration; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -117,12 +118,12 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest if (log.isTraceEnabled()) cctx.ttl().printMemoryStats(); - final String firstKey = "Some test entry key#0"; + final String firstKey = "Some test entry key#1"; final String lastKey = "Some test entry key#" + ENTRIES_TO_PUT; - assertFalse("first key should be evicted", cache.containsKey(firstKey)); + assertNull("first key should be evicted", cache.localPeek(firstKey, CachePeekMode.ONHEAP)); - assertTrue("last key should NOT be evicted", cache.containsKey(lastKey)); + assertNotNull("last key should NOT be evicted", cache.localPeek(lastKey, CachePeekMode.ONHEAP)); assertEquals("Ttl Manager should NOT track evicted entries", ENTRIES_LIMIT, cctx.ttl().pendingSize()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/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 eaa0701..5c1a879 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 @@ -258,8 +258,8 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class); suite.addTestSuite(IgniteCacheManyAsyncOperationsTest.class); suite.addTestSuite(GridCacheTtlManagerSelfTest.class); - // TODO GG-11140. - // suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class); + // TODO: ignite-4534 +// suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class); suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class); suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class); suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/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 17e8fe9..c2fd382 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 @@ -121,6 +121,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGet import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicApiSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEventSelfTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalIsolatedNodesSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalLoadAllSelfTest; @@ -154,8 +155,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class); suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class); suite.addTestSuite(GridCacheLocalEventSelfTest.class); - // TODO TODO GG-11140. - // suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); + suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); suite.addTestSuite(GridCacheVariableTopologySelfTest.class); suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheTransformEventSelfTest.class); @@ -222,7 +222,6 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class)); - // TODO GG-11140. suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class)); suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/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 1c2f98b..caa18d0 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 @@ -24,6 +24,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheConditionalDeploymen import org.apache.ignite.internal.processors.cache.GridCacheEntryVersionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheOrderedPreloadingSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReferenceCleanupSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheReloadSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReplicatedSynchronousCommitTest; import org.apache.ignite.internal.processors.cache.GridCacheTransactionalEntryProcessorDeploymentSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheValueBytesPreloadingSelfTest; @@ -60,6 +61,7 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicOpSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEventSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedLockSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeLockSelfTest; @@ -131,8 +133,7 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCachePutArrayValueSelfTest.class); suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class); - // TODO TODO GG-11140. - // suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); + suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class); @@ -177,8 +178,7 @@ public class IgniteCacheTestSuite3 extends TestSuite { // Memory leak tests. suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class); - // TODO GG-11140. - // suite.addTestSuite(GridCacheReloadSelfTest.class); + suite.addTestSuite(GridCacheReloadSelfTest.class); suite.addTestSuite(GridCacheMixedModeSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java index 2d48411..0e68385 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java @@ -44,7 +44,6 @@ public class IgniteCacheQuerySelfTestSuite2 extends TestSuite { suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); - // TODO GG-11140. suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
