diff --git a/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java b/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java index f31bfaab7..4e1b4b380 100644 --- a/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java +++ b/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java @@ -18,25 +18,20 @@ import org.redisson.api.LocalCachedMapOptions.SyncStrategy; import org.redisson.api.MapOptions.WriteMode; import org.redisson.api.RLocalCachedMap; import org.redisson.api.RMap; -import org.redisson.cache.Cache; -import org.redisson.cache.CacheKey; -import org.redisson.cache.CacheValue; import org.redisson.client.codec.Codec; import org.redisson.client.codec.DoubleCodec; import org.redisson.client.codec.IntegerCodec; import org.redisson.client.codec.StringCodec; import org.redisson.codec.CompositeCodec; -import mockit.Deencapsulation; - public class RedissonLocalCachedMapTest extends BaseMapTest { public abstract class UpdateTest { RLocalCachedMap map1; RLocalCachedMap map2; - Cache cache1; - Cache cache2; + Map cache1; + Map cache2; public void execute() throws InterruptedException { LocalCachedMapOptions options = LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LFU) @@ -44,10 +39,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { .reconnectionStrategy(ReconnectionStrategy.CLEAR) .cacheSize(5); map1 = redisson.getLocalCachedMap("test2", options); - cache1 = Deencapsulation.getField(map1, "cache"); + cache1 = map1.getCachedMap(); map2 = redisson.getLocalCachedMap("test2", options); - cache2 = Deencapsulation.getField(map2, "cache"); + cache2 = map2.getCachedMap(); map1.put("1", 1); map1.put("2", 2); @@ -68,16 +63,16 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { RLocalCachedMap map1; RLocalCachedMap map2; - Cache cache1; - Cache cache2; + Map cache1; + Map cache2; public void execute() throws InterruptedException { LocalCachedMapOptions options = LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LFU).cacheSize(5); map1 = redisson.getLocalCachedMap("test", options); - cache1 = Deencapsulation.getField(map1, "cache"); + cache1 = map1.getCachedMap(); map2 = redisson.getLocalCachedMap("test", options); - cache2 = Deencapsulation.getField(map2, "cache"); + cache2 = map2.getCachedMap(); map1.put("1", 1); map1.put("2", 2); @@ -201,10 +196,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { public void testInvalidationOnUpdateNonBinaryCodec() throws InterruptedException { LocalCachedMapOptions options = LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LFU).cacheSize(5); RLocalCachedMap map1 = redisson.getLocalCachedMap("test", new StringCodec(), options); - Cache cache1 = Deencapsulation.getField(map1, "cache"); + Map cache1 = map1.getCachedMap(); RLocalCachedMap map2 = redisson.getLocalCachedMap("test", new StringCodec(), options); - Cache cache2 = Deencapsulation.getField(map2, "cache"); + Map cache2 = map2.getCachedMap(); map1.put("1", "1"); map1.put("2", "2"); @@ -258,10 +253,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { .syncStrategy(SyncStrategy.NONE); RLocalCachedMap map1 = redisson.getLocalCachedMap("test", options); - Cache cache1 = Deencapsulation.getField(map1, "cache"); + Map cache1 = map1.getCachedMap(); RLocalCachedMap map2 = redisson.getLocalCachedMap("test", options); - Cache cache2 = Deencapsulation.getField(map2, "cache"); + Map cache2 = map2.getCachedMap(); map1.put("1", 1); map1.put("2", 2); @@ -305,10 +300,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { .syncStrategy(SyncStrategy.INVALIDATE); RLocalCachedMap map1 = redisson.getLocalCachedMap("test", options); - Cache cache1 = Deencapsulation.getField(map1, "cache"); + Map cache1 = map1.getCachedMap(); RLocalCachedMap map2 = redisson.getLocalCachedMap("test", options); - Cache cache2 = Deencapsulation.getField(map2, "cache"); + Map cache2 = map2.getCachedMap(); map1.put("1", 1); map1.put("2", 2); @@ -336,10 +331,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { .syncStrategy(SyncStrategy.NONE); RLocalCachedMap map1 = redisson.getLocalCachedMap("test", options); - Cache cache1 = Deencapsulation.getField(map1, "cache"); + Map cache1 = map1.getCachedMap(); RLocalCachedMap map2 = redisson.getLocalCachedMap("test", options); - Cache cache2 = Deencapsulation.getField(map2, "cache"); + Map cache2 = map2.getCachedMap(); map1.put("1", 1); map1.put("2", 2); @@ -388,7 +383,7 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testLFU() { RLocalCachedMap map = redisson.getLocalCachedMap("test", LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LFU).cacheSize(5)); - Cache cache = Deencapsulation.getField(map, "cache"); + Map cache = map.getCachedMap(); map.put("12", 1); map.put("14", 2); @@ -406,7 +401,7 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testLRU() { RLocalCachedMap map = redisson.getLocalCachedMap("test", LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LRU).cacheSize(5)); - Cache cache = Deencapsulation.getField(map, "cache"); + Map cache = map.getCachedMap(); map.put("12", 1); map.put("14", 2); @@ -424,7 +419,7 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testSizeCache() { RLocalCachedMap map = redisson.getLocalCachedMap("test", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + Map cache = map.getCachedMap(); map.put("12", 1); map.put("14", 2); @@ -453,13 +448,13 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testPutGetCache() { RLocalCachedMap map = redisson.getLocalCachedMap("test", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + Map cache = map.getCachedMap(); map.put("12", 1); map.put("14", 2); map.put("15", 3); - assertThat(cache).containsValues(new CacheValue("12", 1), new CacheValue("12", 2), new CacheValue("15", 3)); + assertThat(cache).containsValues(1, 2, 3); assertThat(map.get("12")).isEqualTo(1); assertThat(map.get("14")).isEqualTo(2); assertThat(map.get("15")).isEqualTo(3); @@ -473,8 +468,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testGetAllCache() { - RMap map = redisson.getLocalCachedMap("getAll", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("getAll", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put("1", 100); map.put("2", 200); map.put("3", 300); @@ -516,10 +511,10 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testPutAllCache() throws InterruptedException { - Map map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Map map1 = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); - Cache cache1 = Deencapsulation.getField(map1, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + RLocalCachedMap map1 = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); + Map cache1 = map1.getCachedMap(); map.put(1, "1"); map.put(2, "2"); map.put(3, "3"); @@ -545,8 +540,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testAddAndGet() throws InterruptedException { - RMap map = redisson.getLocalCachedMap("getAll", new CompositeCodec(redisson.getConfig().getCodec(), IntegerCodec.INSTANCE), LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("getAll", new CompositeCodec(redisson.getConfig().getCodec(), IntegerCodec.INSTANCE), LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(1, 100); Integer res = map.addAndGet(1, 12); @@ -573,8 +568,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testFastPutIfAbsent() throws Exception { - RMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); SimpleKey key = new SimpleKey("1"); SimpleValue value = new SimpleValue("2"); @@ -592,8 +587,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testReadAllEntrySet() { - RMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); map.put(new SimpleKey("33"), new SimpleValue("44")); map.put(new SimpleKey("5"), new SimpleValue("6")); @@ -609,8 +604,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testPutIfAbsent() throws Exception { - RMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); SimpleKey key = new SimpleKey("1"); SimpleValue value = new SimpleValue("2"); @@ -644,8 +639,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testRemoveValue() { - RMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); boolean res = map.remove(new SimpleKey("1"), new SimpleValue("2")); @@ -660,8 +655,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testRemoveValueFail() { - RMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple12", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); boolean res = map.remove(new SimpleKey("2"), new SimpleValue("1")); @@ -694,8 +689,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testReplaceOldValueFail() { - RMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); boolean res = map.replace(new SimpleKey("1"), new SimpleValue("43"), new SimpleValue("31")); @@ -708,8 +703,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testReplaceOldValueSuccess() { - RMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); boolean res = map.replace(new SimpleKey("1"), new SimpleValue("2"), new SimpleValue("3")); @@ -741,8 +736,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testReplaceValue() { - RMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); SimpleValue res = map.replace(new SimpleKey("1"), new SimpleValue("3")); @@ -755,8 +750,8 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testReadAllValues() { - RMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + RLocalCachedMap map = redisson.getLocalCachedMap("simple", LocalCachedMapOptions.defaults()); + Map cache = map.getCachedMap(); map.put(new SimpleKey("1"), new SimpleValue("2")); map.put(new SimpleKey("33"), new SimpleValue("44")); @@ -790,7 +785,7 @@ public class RedissonLocalCachedMapTest extends BaseMapTest { @Test public void testRemove() { RLocalCachedMap map = redisson.getLocalCachedMap("test", LocalCachedMapOptions.defaults()); - Cache cache = Deencapsulation.getField(map, "cache"); + Map cache = map.getCachedMap(); map.put("12", 1); assertThat(cache.size()).isEqualTo(1);