From 303b56ff382a3dbada94b46d4e6fa3f1d09138b0 Mon Sep 17 00:00:00 2001 From: Ahmet Mircik Date: Mon, 3 May 2021 19:49:30 +0300 Subject: [PATCH] test fix --- .../eviction/EvictionPolicyEvaluatorTest.java | 15 ++++++++++----- .../LRUEvictionPolicyComparatorTest.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionPolicyEvaluatorTest.java b/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionPolicyEvaluatorTest.java index d52e743fa9c45..299d1dd51466a 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionPolicyEvaluatorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionPolicyEvaluatorTest.java @@ -125,20 +125,25 @@ public EvictionPolicyComparator getComparator() { = new ArrayList>(); long baseTime = System.currentTimeMillis(); - + long minCreationTime = -1; for (int i = 0; i < recordCount; i++) { long creationTime = baseTime + (i * 100); + minCreationTime = minCreationTime == -1 ? creationTime : Math.min(creationTime, minCreationTime); + CacheObjectRecord record = new CacheObjectRecord(i, creationTime, Long.MAX_VALUE); if (i == expectedEvictedRecordValue) { - // The record in the middle will be minimum access time. - // So, it will be selected for eviction - record.setLastAccessTime(baseTime - 1000); + // The record in the middle will be minimum access + // time. So, it will be selected for eviction + // (set creation-time also to keep this condition + // true --> creation-time <= last-access-time) + record.setCreationTime(minCreationTime); + record.setLastAccessTime(minCreationTime + 1); } else if (i == expectedExpiredRecordValue) { record.setExpirationTime(System.currentTimeMillis()); } else { record.setLastAccessTime(creationTime + 1000); } - records.add(new SimpleEvictionCandidate(i, record)); + records.add(new SimpleEvictionCandidate<>(i, record)); } sleepAtLeastMillis(1); diff --git a/hazelcast/src/test/java/com/hazelcast/internal/eviction/impl/comparator/LRUEvictionPolicyComparatorTest.java b/hazelcast/src/test/java/com/hazelcast/internal/eviction/impl/comparator/LRUEvictionPolicyComparatorTest.java index 5ec31d895c0e4..133b21eb8ea23 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/eviction/impl/comparator/LRUEvictionPolicyComparatorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/eviction/impl/comparator/LRUEvictionPolicyComparatorTest.java @@ -63,7 +63,7 @@ public void lru_comparator_does_not_prematurely_select_newly_created_entries() { assertEquals(descOrderByIdleTimes, givenEntries); } - private static long idleTime(TestEntryView entryView) { + private static long idleTime(EvictableEntryView entryView) { return NOW - Math.max(entryView.getCreationTime(), entryView.getLastAccessTime()); }