From ac9f3408b28fd8a898f756e617377a549ae21d8b Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 26 Feb 2018 23:03:27 +0100 Subject: [PATCH] FIX: reset cache statistics (fixes test cases in eclipse when run in different order) (#1289) --- src/test/java/org/tests/cache/TestQueryCacheInsert.java | 1 + src/test/java/org/tests/readaudit/TestReadAudit.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/src/test/java/org/tests/cache/TestQueryCacheInsert.java index dad6caf1f..3a5ca02ea 100644 --- a/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -45,6 +45,7 @@ public class TestQueryCacheInsert extends BaseTestCase { Ebean.save(doda); ServerCache queryCache = Ebean.getServerCacheManager().getQueryCache(EBasicVer.class); + queryCache.getStatistics(true); Optional found0 = Ebean.find(EBasicVer.class) .where().eq("description", "OddButUniqueSillyExample") diff --git a/src/test/java/org/tests/readaudit/TestReadAudit.java b/src/test/java/org/tests/readaudit/TestReadAudit.java index 22a0257d6..d41e7fd13 100644 --- a/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -83,6 +83,9 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache() { resetCounters(); + ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class); + beanCache.getStatistics(true); + EBasicChangeLog found = server.find(EBasicChangeLog.class, id1); assertThat(found).isNotNull(); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -91,7 +94,6 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(EBasicChangeLog.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo(id1); - ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class); ServerCacheStatistics statistics = beanCache.getStatistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0); @@ -109,6 +111,9 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache_sharedBean() { resetCounters(); + ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class); + beanCache.getStatistics(true); + Country found = server.find(Country.class, "AR"); assertThat(found).isNotNull(); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -117,7 +122,6 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(Country.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo("AR"); - ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class); ServerCacheStatistics statistics = beanCache.getStatistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0);