[shiro] branch master updated: Adding some more ehcache unit tests

[fpapon]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/master by this push:
     new d661c29  Adding some more ehcache unit tests
     new 5c8dd9d  Merge pull request #180 from coheigea/ehcache_tests
d661c29 is described below

commit d661c29919c422271970d6088bab092e732e67ce
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Mon Nov 18 11:08:29 2019 +0000

    Adding some more ehcache unit tests
---
 .../shiro/cache/ehcache/EhCacheManagerTest.java    | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git 
a/support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
 
b/support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
index c15ffa8..c06a7e4 100644
--- 
a/support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
+++ 
b/support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
@@ -26,6 +26,9 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
+import java.util.Collection;
+import java.util.Set;
+
 /**
  * TODO - Class JavaDoc
  *
@@ -75,4 +78,124 @@ public class EhCacheManagerTest {
         assertEquals(value, "world");
     }
 
+    @Test
+    public void testRemove() {
+        net.sf.ehcache.CacheManager ehCacheManager = 
cacheManager.getCacheManager();
+        assertNull(ehCacheManager);
+
+        Cache<String, String> cache = cacheManager.getCache("test");
+
+        ehCacheManager = cacheManager.getCacheManager();
+        assertNotNull(ehCacheManager);
+
+        assertNotNull(cache);
+        cache.put("hello", "world");
+        cache.put("hello2", "world2");
+        String value = cache.get("hello");
+        assertNotNull(value);
+        assertEquals(value, "world");
+        assertEquals("world2", cache.get("hello2"));
+        assertEquals(2, cache.size());
+
+        assertEquals("world", cache.remove("hello"));
+        assertEquals(1, cache.size());
+        assertEquals("world2", cache.remove("hello2"));
+        assertEquals(0, cache.size());
+
+        assertNull(cache.remove("blah"));
+    }
+
+    @Test
+    public void testClear() {
+        net.sf.ehcache.CacheManager ehCacheManager = 
cacheManager.getCacheManager();
+        assertNull(ehCacheManager);
+
+        Cache<String, String> cache = cacheManager.getCache("test");
+
+        ehCacheManager = cacheManager.getCacheManager();
+        assertNotNull(ehCacheManager);
+
+        assertNotNull(cache);
+        cache.put("hello", "world");
+        cache.put("hello2", "world2");
+        String value = cache.get("hello");
+        assertNotNull(value);
+        assertEquals(value, "world");
+        assertEquals("world2", cache.get("hello2"));
+        assertEquals(2, cache.size());
+
+        cache.clear();
+        assertEquals(0, cache.size());
+
+        assertNull(cache.get("hello"));
+    }
+
+    @Test
+    public void testKeys() {
+        net.sf.ehcache.CacheManager ehCacheManager = 
cacheManager.getCacheManager();
+        assertNull(ehCacheManager);
+
+        Cache<String, String> cache = cacheManager.getCache("test");
+
+        ehCacheManager = cacheManager.getCacheManager();
+        assertNotNull(ehCacheManager);
+
+        assertNotNull(cache);
+        cache.put("hello", "world");
+        cache.put("hello2", "world2");
+        String value = cache.get("hello");
+        assertNotNull(value);
+        assertEquals(value, "world");
+        assertEquals("world2", cache.get("hello2"));
+        assertEquals(2, cache.size());
+
+        Set<String> keys = cache.keys();
+        assertEquals(2, keys.size());
+        assertTrue(keys.contains("hello"));
+        assertTrue(keys.contains("hello2"));
+
+        assertEquals("world", cache.remove("hello"));
+        assertEquals(1, cache.size());
+
+        keys = cache.keys();
+        assertEquals(1, keys.size());
+        assertTrue(keys.contains("hello2"));
+
+        assertNull(cache.remove("blah"));
+    }
+
+    @Test
+    public void testValues() {
+        net.sf.ehcache.CacheManager ehCacheManager = 
cacheManager.getCacheManager();
+        assertNull(ehCacheManager);
+
+        Cache<String, String> cache = cacheManager.getCache("test");
+
+        ehCacheManager = cacheManager.getCacheManager();
+        assertNotNull(ehCacheManager);
+
+        assertNotNull(cache);
+        cache.put("hello", "world");
+        cache.put("hello2", "world2");
+        String value = cache.get("hello");
+        assertNotNull(value);
+        assertEquals(value, "world");
+        assertEquals("world2", cache.get("hello2"));
+        assertEquals(2, cache.size());
+
+        Collection<String> values = cache.values();
+        assertEquals(2, values.size());
+        assertTrue(values.contains("world"));
+        assertTrue(values.contains("world2"));
+
+        assertEquals("world", cache.remove("hello"));
+        assertEquals(1, cache.size());
+
+        values = cache.values();
+        assertEquals(1, values.size());
+        assertTrue(values.contains("world2"));
+
+        assertNull(cache.remove("blah"));
+    }
+
 }