Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade tests to EhCache 2.10+

Browse Source 
Issue: SPR-13794
This commit is contained in:
Sam Brannen
2016-07-11 17:17:03 +02:00
parent f7f37cdb1b
commit 22345f7c25
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java vendored
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ public class EhCacheSupportTests {
assertTrue("Correct number of caches loaded", cm.getCacheNames().length == 1); assertTrue("Correct number of caches loaded", cm.getCacheNames().length == 1);
Cache myCache1 = cm.getCache("myCache1"); Cache myCache1 = cm.getCache("myCache1");
assertFalse("myCache1 is not eternal", myCache1.getCacheConfiguration().isEternal()); assertFalse("myCache1 is not eternal", myCache1.getCacheConfiguration().isEternal());
assertTrue("myCache1.maxElements == 300", myCache1.getCacheConfiguration().getMaxElementsInMemory() == 300); assertTrue("myCache1.maxElements == 300", myCache1.getCacheConfiguration().getMaxEntriesLocalHeap() == 300);
} }
finally { finally {
cacheManagerFb.destroy(); cacheManagerFb.destroy();
@@ -162,10 +162,10 @@ public class EhCacheSupportTests {
CacheConfiguration config = cache.getCacheConfiguration(); CacheConfiguration config = cache.getCacheConfiguration();
assertEquals("myCache1", cache.getName()); assertEquals("myCache1", cache.getName());
if (useCacheManagerFb){ if (useCacheManagerFb){
assertEquals("myCache1.maxElements", 300, config.getMaxElementsInMemory()); assertEquals("myCache1.maxElements", 300, config.getMaxEntriesLocalHeap());
} }
else { else {
assertEquals("myCache1.maxElements", 10000, config.getMaxElementsInMemory()); assertEquals("myCache1.maxElements", 10000, config.getMaxEntriesLocalHeap());
} }
// Cache region is not defined. Should create one with default properties. // Cache region is not defined. Should create one with default properties.
@@ -178,7 +178,7 @@ public class EhCacheSupportTests {
cache = (Cache) cacheFb.getObject(); cache = (Cache) cacheFb.getObject();
config = cache.getCacheConfiguration(); config = cache.getCacheConfiguration();
assertEquals("undefinedCache", cache.getName()); assertEquals("undefinedCache", cache.getName());
assertTrue("default maxElements is correct", config.getMaxElementsInMemory() == 10000); assertTrue("default maxElements is correct", config.getMaxEntriesLocalHeap() == 10000);
assertFalse("default eternal is correct", config.isEternal()); assertFalse("default eternal is correct", config.isEternal());
assertTrue("default timeToLive is correct", config.getTimeToLiveSeconds() == 120); assertTrue("default timeToLive is correct", config.getTimeToLiveSeconds() == 120);
assertTrue("default timeToIdle is correct", config.getTimeToIdleSeconds() == 120); assertTrue("default timeToIdle is correct", config.getTimeToIdleSeconds() == 120);
@@ -190,7 +190,7 @@ public class EhCacheSupportTests {
cacheFb.setCacheManager(cacheManagerFb.getObject()); cacheFb.setCacheManager(cacheManagerFb.getObject());
} }
cacheFb.setBeanName("undefinedCache2"); cacheFb.setBeanName("undefinedCache2");
cacheFb.setMaxElementsInMemory(5); cacheFb.setMaxEntriesLocalHeap(5);
cacheFb.setTimeToLive(8); cacheFb.setTimeToLive(8);
cacheFb.setTimeToIdle(7); cacheFb.setTimeToIdle(7);
cacheFb.setDiskExpiryThreadIntervalSeconds(10); cacheFb.setDiskExpiryThreadIntervalSeconds(10);
@@ -199,7 +199,7 @@ public class EhCacheSupportTests {
config = cache.getCacheConfiguration(); config = cache.getCacheConfiguration();
assertEquals("undefinedCache2", cache.getName()); assertEquals("undefinedCache2", cache.getName());
assertTrue("overridden maxElements is correct", config.getMaxElementsInMemory() == 5); assertTrue("overridden maxElements is correct", config.getMaxEntriesLocalHeap() == 5);
assertTrue("default timeToLive is correct", config.getTimeToLiveSeconds() == 8); assertTrue("default timeToLive is correct", config.getTimeToLiveSeconds() == 8);
assertTrue("default timeToIdle is correct", config.getTimeToIdleSeconds() == 7); assertTrue("default timeToIdle is correct", config.getTimeToIdleSeconds() == 7);
assertTrue("overridden diskExpiryThreadIntervalSeconds is correct", config.getDiskExpiryThreadIntervalSeconds() == 10); assertTrue("overridden diskExpiryThreadIntervalSeconds is correct", config.getDiskExpiryThreadIntervalSeconds() == 10);
@@ -253,7 +253,7 @@ public class EhCacheSupportTests {
cacheFb.afterPropertiesSet(); cacheFb.afterPropertiesSet();
Ehcache myCache1 = cm.getEhcache("myCache1"); Ehcache myCache1 = cm.getEhcache("myCache1");
assertTrue(myCache1 instanceof SelfPopulatingCache); assertTrue(myCache1 instanceof SelfPopulatingCache);
assertEquals("myKey1", myCache1.get("myKey1").getValue()); assertEquals("myKey1", myCache1.get("myKey1").getObjectValue());
} }
finally { finally {
cacheManagerFb.destroy(); cacheManagerFb.destroy();
@@ -282,7 +282,7 @@ public class EhCacheSupportTests {
cacheFb.afterPropertiesSet(); cacheFb.afterPropertiesSet();
Ehcache myCache1 = cm.getEhcache("myCache1"); Ehcache myCache1 = cm.getEhcache("myCache1");
assertTrue(myCache1 instanceof UpdatingSelfPopulatingCache); assertTrue(myCache1 instanceof UpdatingSelfPopulatingCache);
assertEquals("myKey1", myCache1.get("myKey1").getValue()); assertEquals("myKey1", myCache1.get("myKey1").getObjectValue());
} }
finally { finally {
cacheManagerFb.destroy(); cacheManagerFb.destroy();