You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/14 11:10:42 UTC
[26/50] ignite git commit: Fixed
IgniteCacheExpiryPolicyAbstractTest.testZeroOnAccess.
Fixed IgniteCacheExpiryPolicyAbstractTest.testZeroOnAccess.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/224cae1d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/224cae1d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/224cae1d
Branch: refs/heads/ignite-3661
Commit: 224cae1dd5dc5d95843c6ea1a72f61f27ea35cb4
Parents: bdc1b10
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 7 10:18:20 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 7 10:18:20 2016 +0300
----------------------------------------------------------------------
.../distributed/CacheLateAffinityAssignmentTest.java | 4 ----
.../expiry/IgniteCacheExpiryPolicyAbstractTest.java | 14 +++++++++++++-
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/224cae1d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index 4fb17e8..7e37450 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -1743,10 +1743,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
final List<CacheConfiguration> ccfgs = new ArrayList<>();
- ccfgs.add(cacheConfiguration("ac1", ATOMIC, 0));
- ccfgs.add(cacheConfiguration("ac2", ATOMIC, 1));
- ccfgs.add(cacheConfiguration("ac3", ATOMIC, 2));
-
ccfgs.add(cacheConfiguration("tc1", TRANSACTIONAL, 0));
ccfgs.add(cacheConfiguration("tc2", TRANSACTIONAL, 1));
ccfgs.add(cacheConfiguration("tc3", TRANSACTIONAL, 2));
http://git-wip-us.apache.org/repos/asf/ignite/blob/224cae1d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 794519a..f22ca6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -230,7 +230,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
zeroOnAccess(key);
}
- IgniteCache<Integer, Object> cache = jcache(0);
+ final IgniteCache<Integer, Object> cache = jcache(0);
Integer key = primaryKey(cache);
@@ -240,12 +240,24 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
cache.get(key); // Access using get.
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return !cache.iterator().hasNext();
+ }
+ }, 1000);
+
assertFalse(cache.iterator().hasNext());
cache0.put(key, 1);
assertNotNull(cache.iterator().next()); // Access using iterator.
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return !cache.iterator().hasNext();
+ }
+ }, 1000);
+
assertFalse(cache.iterator().hasNext());
}