This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 432c6a3 Consolidating some STS caching tests
432c6a3 is described below
commit 432c6a3cbc9bb5db99a0c7822c80001338746e08
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Apr 9 12:37:51 2020 +0100
Consolidating some STS caching tests
---
.../cxf/sts/cache/EhCacheIdentityCacheTest.java | 109 +--------------------
.../cxf/sts/cache/MemoryIdentityCacheTest.java | 36 +++++--
2 files changed, 32 insertions(+), 113 deletions(-)
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
index 4ef4071..e7948c9 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
@@ -18,124 +18,23 @@
*/
package org.apache.cxf.sts.cache;
-//import java.security.Principal;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.sts.IdentityMapper;
-import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.BeforeClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class EhCacheIdentityCacheTest {
+public class EhCacheIdentityCacheTest extends MemoryIdentityCacheTest {
@BeforeClass
public static void init() throws Exception {
}
- // tests TokenStore apis for storing in the cache.
- @org.junit.Test
- public void testOneMapping() throws Exception {
- IdentityMapper mapper = new CacheIdentityMapper();
+ @Override
+ protected AbstractIdentityCache getIdentityCache(IdentityMapper mapper) {
Bus bus = BusFactory.getDefaultBus();
- EHCacheIdentityCache cache = new EHCacheIdentityCache(mapper, bus);
-
- cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
- assertEquals(2, cache.size());
- assertNotNull(cache.get("user_aaa", "REALM_A"));
- assertNotNull(cache.get("user_bbb", "REALM_B"));
-
- cache.close();
- }
-
-
- @org.junit.Test
- public void testTwoDistinctMappings() {
- IdentityMapper mapper = new CacheIdentityMapper();
- Bus bus = BusFactory.getDefaultBus();
- EHCacheIdentityCache cache = new EHCacheIdentityCache(mapper, bus);
-
- cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
- cache.mapPrincipal("REALM_C", new CustomTokenPrincipal("user_ccc"),
"REALM_D");
- assertEquals(4, cache.size());
- assertNotNull(cache.get("user_aaa", "REALM_A"));
- assertNotNull(cache.get("user_bbb", "REALM_B"));
- assertNotNull(cache.get("user_ccc", "REALM_C"));
- assertNotNull(cache.get("user_ddd", "REALM_D"));
-
- cache.close();
- }
-
- @org.junit.Test
- public void testTwoDistinctAndOneRelatedMapping() {
- IdentityMapper mapper = new CacheIdentityMapper();
- Bus bus = BusFactory.getDefaultBus();
- EHCacheIdentityCache cache = new EHCacheIdentityCache(mapper, bus);
-
- cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
- cache.mapPrincipal("REALM_C", new CustomTokenPrincipal("user_ccc"),
"REALM_D");
- cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_D");
- //now, mapping from A -> D and B -> D are cached as well
- assertEquals(4, cache.size());
- assertNotNull(cache.get("user_aaa", "REALM_A"));
- assertNotNull(cache.get("user_bbb", "REALM_B"));
- assertNotNull(cache.get("user_ccc", "REALM_C"));
- assertNotNull(cache.get("user_ddd", "REALM_D"));
- assertEquals(4, cache.get("user_aaa", "REALM_A").size());
- assertEquals(4, cache.get("user_bbb", "REALM_B").size());
- assertEquals(4, cache.get("user_ccc", "REALM_C").size());
- assertEquals(4, cache.get("user_ddd", "REALM_D").size());
-
- cache.close();
- }
-
- @org.junit.Test
- public void testTwoDistinctAndTwoRelatedMapping() {
- IdentityMapper mapper = new CacheIdentityMapper();
- Bus bus = BusFactory.getDefaultBus();
- EHCacheIdentityCache cache = new EHCacheIdentityCache(mapper, bus);
-
- cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
- cache.mapPrincipal("REALM_D", new CustomTokenPrincipal("user_ddd"),
"REALM_E");
- assertEquals(4, cache.size());
- //No Mapping occured between A,B and D,E (C not involved at all)
- assertEquals(2, cache.get("user_aaa", "REALM_A").size());
- assertEquals(2, cache.get("user_bbb", "REALM_B").size());
- assertEquals(2, cache.get("user_ddd", "REALM_D").size());
- assertEquals(2, cache.get("user_eee", "REALM_E").size());
-
- cache.mapPrincipal("REALM_B", new CustomTokenPrincipal("user_bbb"),
"REALM_C");
- assertEquals(5, cache.size());
- assertNotNull(cache.get("user_aaa", "REALM_A"));
- assertNotNull(cache.get("user_bbb", "REALM_B"));
- assertNotNull(cache.get("user_ccc", "REALM_C"));
- assertNotNull(cache.get("user_ddd", "REALM_D"));
- assertNotNull(cache.get("user_eee", "REALM_E"));
- assertEquals(3, cache.get("user_aaa", "REALM_A").size());
- assertEquals(3, cache.get("user_bbb", "REALM_B").size());
- assertEquals(3, cache.get("user_ccc", "REALM_C").size());
- //No mapping occurred between A,B,C and D,E -> distinct
- assertEquals(2, cache.get("user_ddd", "REALM_D").size());
- assertEquals(2, cache.get("user_eee", "REALM_E").size());
-
- cache.mapPrincipal("REALM_C", new CustomTokenPrincipal("user_ccc"),
"REALM_E");
- //All mappings are known now
- assertEquals(5, cache.size());
- assertNotNull(cache.get("user_aaa", "REALM_A"));
- assertNotNull(cache.get("user_bbb", "REALM_B"));
- assertNotNull(cache.get("user_ccc", "REALM_C"));
- assertNotNull(cache.get("user_ddd", "REALM_D"));
- assertNotNull(cache.get("user_eee", "REALM_E"));
- assertEquals(5, cache.get("user_aaa", "REALM_A").size());
- assertEquals(5, cache.get("user_bbb", "REALM_B").size());
- assertEquals(5, cache.get("user_ccc", "REALM_C").size());
- assertEquals(5, cache.get("user_ddd", "REALM_D").size());
- assertEquals(5, cache.get("user_eee", "REALM_E").size());
-
- cache.close();
+ return new EHCacheIdentityCache(mapper, bus);
}
}
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
index ddbde7c..3a7c58a 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
@@ -19,6 +19,9 @@
package org.apache.cxf.sts.cache;
//import java.security.Principal;
+import java.io.Closeable;
+import java.io.IOException;
+
import org.apache.cxf.sts.IdentityMapper;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
@@ -38,19 +41,22 @@ public class MemoryIdentityCacheTest {
@org.junit.Test
public void testOneMapping() throws Exception {
IdentityMapper mapper = new CacheIdentityMapper();
- MemoryIdentityCache cache = new MemoryIdentityCache(mapper);
+ AbstractIdentityCache cache = getIdentityCache(mapper);
cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
assertEquals(2, cache.size());
assertNotNull(cache.get("user_aaa", "REALM_A"));
assertNotNull(cache.get("user_bbb", "REALM_B"));
- }
+ if (cache instanceof Closeable) {
+ ((Closeable)cache).close();
+ }
+ }
@org.junit.Test
- public void testTwoDistinctMappings() {
+ public void testTwoDistinctMappings() throws IOException {
IdentityMapper mapper = new CacheIdentityMapper();
- MemoryIdentityCache cache = new MemoryIdentityCache(mapper);
+ AbstractIdentityCache cache = getIdentityCache(mapper);
cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
cache.mapPrincipal("REALM_C", new CustomTokenPrincipal("user_ccc"),
"REALM_D");
@@ -60,12 +66,15 @@ public class MemoryIdentityCacheTest {
assertNotNull(cache.get("user_ccc", "REALM_C"));
assertNotNull(cache.get("user_ddd", "REALM_D"));
+ if (cache instanceof Closeable) {
+ ((Closeable)cache).close();
+ }
}
@org.junit.Test
- public void testTwoDistinctAndOneRelatedMapping() {
+ public void testTwoDistinctAndOneRelatedMapping() throws IOException {
IdentityMapper mapper = new CacheIdentityMapper();
- MemoryIdentityCache cache = new MemoryIdentityCache(mapper);
+ AbstractIdentityCache cache = getIdentityCache(mapper);
cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
cache.mapPrincipal("REALM_C", new CustomTokenPrincipal("user_ccc"),
"REALM_D");
@@ -80,12 +89,16 @@ public class MemoryIdentityCacheTest {
assertEquals(4, cache.get("user_bbb", "REALM_B").size());
assertEquals(4, cache.get("user_ccc", "REALM_C").size());
assertEquals(4, cache.get("user_ddd", "REALM_D").size());
+
+ if (cache instanceof Closeable) {
+ ((Closeable)cache).close();
+ }
}
@org.junit.Test
- public void testTwoDistinctAndTwoRelatedMapping() {
+ public void testTwoDistinctAndTwoRelatedMapping() throws IOException {
IdentityMapper mapper = new CacheIdentityMapper();
- MemoryIdentityCache cache = new MemoryIdentityCache(mapper);
+ AbstractIdentityCache cache = getIdentityCache(mapper);
cache.mapPrincipal("REALM_A", new CustomTokenPrincipal("user_aaa"),
"REALM_B");
cache.mapPrincipal("REALM_D", new CustomTokenPrincipal("user_ddd"),
"REALM_E");
@@ -123,6 +136,13 @@ public class MemoryIdentityCacheTest {
assertEquals(5, cache.get("user_ccc", "REALM_C").size());
assertEquals(5, cache.get("user_ddd", "REALM_D").size());
assertEquals(5, cache.get("user_eee", "REALM_E").size());
+
+ if (cache instanceof Closeable) {
+ ((Closeable)cache).close();
+ }
}
+ protected AbstractIdentityCache getIdentityCache(IdentityMapper mapper) {
+ return new MemoryIdentityCache(mapper);
+ }
}
