Repository: ignite Updated Branches: refs/heads/ignite-1.5 ec2a64714 -> 484a3afd0
ignite-1.5 Added waitForCondition in tests with TTL. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/484a3afd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/484a3afd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/484a3afd Branch: refs/heads/ignite-1.5 Commit: 484a3afd05b9ad5a524a28c517ddc0a6b9dffcbc Parents: ec2a647 Author: sboikov <[email protected]> Authored: Mon Dec 14 10:58:57 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 14 10:58:57 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/484a3afd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 41e9016..cbb19fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -107,6 +107,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_SWAPPED; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNSWAPPED; import static org.apache.ignite.testframework.GridTestUtils.assertThrows; +import static org.apache.ignite.testframework.GridTestUtils.waitForCondition; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED; @@ -3216,9 +3217,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testEvictExpired() throws Exception { - IgniteCache<String, Integer> cache = jcache(); + final IgniteCache<String, Integer> cache = jcache(); - String key = primaryKeysForCache(cache, 1).get(0); + final String key = primaryKeysForCache(cache, 1).get(0); cache.put(key, 1); @@ -3230,7 +3231,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); - Thread.sleep(ttl + 100); + boolean wait = waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return cache.localPeek(key, ONHEAP) == null; + } + }, ttl + 1000); + + assertTrue("Failed to wait for entry expiration.", wait); // Expired entry should not be swapped. cache.localEvict(Collections.singleton(key)); @@ -3793,9 +3800,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testCompactExpired() throws Exception { - IgniteCache<String, Integer> cache = jcache(); + final IgniteCache<String, Integer> cache = jcache(); - String key = F.first(primaryKeysForCache(cache, 1)); + final String key = F.first(primaryKeysForCache(cache, 1)); cache.put(key, 1); @@ -3805,7 +3812,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); - Thread.sleep(ttl + 100); + waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return cache.localPeek(key, ONHEAP) == null; + } + }, ttl + 1000); // Peek will actually remove entry from cache. assertNull(cache.localPeek(key, ONHEAP));
