You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/08/17 14:30:06 UTC
[14/27] karaf git commit: Use matcher in tests
Use matcher in tests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6aa806d2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6aa806d2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6aa806d2
Branch: refs/heads/model_features
Commit: 6aa806d2ad0df30d162693f8daa013dc6b0f110f
Parents: 01d0aae
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Aug 16 11:34:37 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Aug 16 11:34:37 2017 +0200
----------------------------------------------------------------------
.../karaf/jaas/modules/PrincipalAssert.java | 40 ------------
.../karaf/jaas/modules/PrincipalHelper.java | 29 +++++++++
.../karaf/jaas/modules/ldap/LdapCacheTest.java | 67 +++++++++-----------
.../properties/PropertiesBackingEngineTest.java | 2 +-
.../properties/PropertiesLoginModuleTest.java | 14 ++--
5 files changed, 67 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa806d2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalAssert.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalAssert.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalAssert.java
deleted file mode 100644
index c19fd2b..0000000
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalAssert.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-package org.apache.karaf.jaas.modules;
-
-import static java.util.stream.Collectors.toList;
-
-import java.security.Principal;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.security.auth.Subject;
-
-import org.junit.Assert;
-
-public class PrincipalAssert {
-
- public static List<String> names(List<? extends Principal> principals) {
- return principals.stream().map(r->r.getName()).collect(toList());
- }
-
- public static void assertPrincipalNamed(Subject subject, Class<? extends Principal> clazz, String expectedName) {
- Long numMatching = subject.getPrincipals(clazz).stream()
- .filter(pr -> expectedName.equals(pr.getName()))
- .collect(Collectors.counting());
- Assert.assertEquals("Expected " + clazz.getSimpleName() + " principal in subject with name=" + expectedName,
- 1l, numMatching.intValue());
- }
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa806d2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalHelper.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalHelper.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalHelper.java
new file mode 100644
index 0000000..9893193
--- /dev/null
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/PrincipalHelper.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+package org.apache.karaf.jaas.modules;
+
+import static java.util.stream.Collectors.toList;
+
+import java.security.Principal;
+import java.util.Collection;
+import java.util.List;
+
+public class PrincipalHelper {
+
+ public static List<String> names(Collection<? extends Principal> principals) {
+ return principals.stream().map(r->r.getName()).collect(toList());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa806d2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
index 1b88a16..b9d252d 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
@@ -15,6 +15,16 @@
*/
package org.apache.karaf.jaas.modules.ldap;
+import static org.apache.karaf.jaas.modules.PrincipalHelper.names;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
@@ -22,9 +32,6 @@ import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
-import java.io.File;
-import java.io.IOException;
-import java.security.Principal;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
@@ -42,9 +49,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
@RunWith(FrameworkRunner.class)
@CreateLdapServer(transports = {@CreateTransport(protocol = "LDAP")})
@CreateDS(name = "LdapLoginModuleTest-class",
@@ -78,42 +82,16 @@ public class LdapCacheTest extends AbstractLdapTestUnit {
assertEquals(2, subject.getPrincipals().size());
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal pr : subject.getPrincipals()) {
- if (pr instanceof UserPrincipal) {
- assertEquals("admin", pr.getName());
- foundUser = true;
- } else if (pr instanceof RolePrincipal) {
- assertEquals("admin", pr.getName());
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- assertTrue(foundRole);
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("admin"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("admin"));
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
- DirContext context = new LDAPCache(new LDAPOptions(options)).open();
-
- // Make "admin" user a member of a new "another" group
-
-// dn: cn=admin,ou=groups,dc=example,dc=com
-// objectClass: top
-// objectClass: groupOfNames
-// cn: admin
-// member: cn=admin,ou=people,dc=example,dc=com
- Attributes entry = new BasicAttributes();
- entry.put(new BasicAttribute("cn", "another"));
- Attribute oc = new BasicAttribute("objectClass");
- oc.add("top");
- oc.add("groupOfNames");
- entry.put(oc);
- Attribute mb = new BasicAttribute("member");
- mb.add("cn=admin,ou=people,dc=example,dc=com");
- entry.put(mb);
- context.createSubcontext("cn=another,ou=groups,dc=example,dc=com", entry);
+ LDAPCache ldapCache = new LDAPCache(new LDAPOptions(options));
+ DirContext context = ldapCache.open();
+ addUserToGroup(context, "cn=admin,ou=people,dc=example,dc=com", "another");
+ ldapCache.close();
Thread.sleep(100);
@@ -126,6 +104,19 @@ public class LdapCacheTest extends AbstractLdapTestUnit {
assertEquals("Postcondition", 3, subject.getPrincipals().size());
}
+ private void addUserToGroup(DirContext context, String userCn, String group) throws NamingException {
+ Attributes entry = new BasicAttributes();
+ entry.put(new BasicAttribute("cn", group));
+ Attribute oc = new BasicAttribute("objectClass");
+ oc.add("top");
+ oc.add("groupOfNames");
+ entry.put(oc);
+ Attribute mb = new BasicAttribute("member");
+ mb.add(userCn);
+ entry.put(mb);
+ context.createSubcontext("cn=" + group +",ou=groups,dc=example,dc=com", entry);
+ }
+
protected Properties ldapLoginModuleOptions() throws IOException {
String basedir = System.getProperty("basedir");
if (basedir == null) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa806d2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineTest.java
index 0c811da..c1360d6 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.karaf.jaas.modules.properties;
-import static org.apache.karaf.jaas.modules.PrincipalAssert.names;
+import static org.apache.karaf.jaas.modules.PrincipalHelper.names;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa806d2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java
index 26d90a7..9d43fba 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.karaf.jaas.modules.properties;
-import static org.apache.karaf.jaas.modules.PrincipalAssert.assertPrincipalNamed;
+import static org.apache.karaf.jaas.modules.PrincipalHelper.names;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.io.IOException;
@@ -61,8 +63,8 @@ public class PropertiesLoginModuleTest {
Assert.assertEquals(2, subject.getPrincipals().size());
- assertPrincipalNamed(subject, UserPrincipal.class, "abc");
- assertPrincipalNamed(subject, RolePrincipal.class, "myrole");
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("abc"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("myrole"));
Assert.assertTrue(module.logout());
Assert.assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -122,9 +124,9 @@ public class PropertiesLoginModuleTest {
Assert.assertTrue(module.commit());
Assert.assertEquals(3, subject.getPrincipals().size());
- assertPrincipalNamed(subject, UserPrincipal.class, "pqr");
- assertPrincipalNamed(subject, GroupPrincipal.class, "group1");
- assertPrincipalNamed(subject, RolePrincipal.class, "r1");
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("pqr"));
+ assertThat(names(subject.getPrincipals(GroupPrincipal.class)), containsInAnyOrder("group1"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("r1"));
} finally {
if (!f.delete()) {
Assert.fail("Could not delete temporary file: " + f);