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/16 11:41:29 UTC
[4/5] karaf git commit: Simplify assertions
Simplify assertions
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3b72701c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3b72701c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3b72701c
Branch: refs/heads/master
Commit: 3b72701cdbf06961d2185348b29cbfd5e1f92763
Parents: e973e3c
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Aug 16 11:52:11 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Aug 16 11:52:11 2017 +0200
----------------------------------------------------------------------
.../modules/ldap/LdapCaseInsensitiveDNTest.java | 20 +--
.../jaas/modules/ldap/LdapLoginModuleTest.java | 131 +++----------------
2 files changed, 23 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3b72701c/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
index bcf460d..8e3a56e 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
@@ -15,12 +15,14 @@
*/
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 java.security.Principal;
import javax.security.auth.Subject;
@@ -65,20 +67,8 @@ public class LdapCaseInsensitiveDNTest extends LdapLoginModuleTest {
assertTrue(module.commit());
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());
http://git-wip-us.apache.org/repos/asf/karaf/blob/3b72701c/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
index 140d5df..847dcf3 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
@@ -27,6 +27,7 @@ import org.apache.karaf.jaas.boot.principal.RolePrincipal;
import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.NamePasswordCallbackHandler;
import org.apache.log4j.Level;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,13 +38,12 @@ import javax.security.auth.login.LoginException;
import java.io.File;
import java.io.IOException;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+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;
@@ -79,20 +79,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
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());
@@ -119,21 +107,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(1, subject.getPrincipals().size());
-
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal pr : subject.getPrincipals()) {
- if (pr instanceof UserPrincipal) {
- assertEquals("cheese", pr.getName());
- foundUser = true;
- } else if (pr instanceof RolePrincipal) {
- assertEquals("admin", pr.getName());
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- // cheese is not an admin so no roles should be returned
- assertFalse(foundRole);
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("cheese"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), Matchers.empty());
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -152,21 +127,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(1, subject.getPrincipals().size());
-
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal pr : subject.getPrincipals()) {
- if (pr instanceof UserPrincipal) {
- assertEquals("cheese", pr.getName());
- foundUser = true;
- } else if (pr instanceof RolePrincipal) {
- assertEquals("admin", pr.getName());
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- // cheese is not an admin so no roles should be returned
- assertFalse(foundRole);
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("cheese"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), Matchers.empty());
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -234,20 +196,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(2, subject.getPrincipals().size());
-
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal principal : subject.getPrincipals()) {
- if (principal instanceof UserPrincipal) {
- assertEquals("admin", principal.getName());
- foundUser = true;
- } else if (principal instanceof RolePrincipal) {
- assertEquals("karaf", principal.getName());
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- assertTrue(foundRole);
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("admin"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("karaf"));
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -266,23 +216,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(4, subject.getPrincipals().size());
-
- final List<String> roles = new ArrayList<>(Arrays.asList("karaf", "test", "another"));
-
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal principal : subject.getPrincipals()) {
- if (principal instanceof UserPrincipal) {
- assertEquals("admin", principal.getName());
- foundUser = true;
- } else if (principal instanceof RolePrincipal) {
- assertTrue(roles.remove(principal.getName()));
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- assertTrue(foundRole);
- assertTrue(roles.isEmpty());
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("admin"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("karaf", "test", "another"));
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -301,23 +236,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(4, subject.getPrincipals().size());
-
- final List<String> roles = new ArrayList<>(Arrays.asList("karaf", "test", "another"));
-
- 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) {
- assertTrue(roles.remove(pr.getName()));
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- assertTrue(foundRole);
- assertTrue(roles.isEmpty());
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("admin"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("karaf", "test", "another"));
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());
@@ -340,23 +260,8 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
assertTrue(module.commit());
assertEquals(2, subject.getPrincipals().size());
-
- final List<String> roles = new ArrayList<>(Arrays.asList("karaf"));
-
- boolean foundUser = false;
- boolean foundRole = false;
- for (Principal principal : subject.getPrincipals()) {
- if (principal instanceof UserPrincipal) {
- assertEquals("admin", principal.getName());
- foundUser = true;
- } else if (principal instanceof RolePrincipal) {
- assertTrue(roles.remove(principal.getName()));
- foundRole = true;
- }
- }
- assertTrue(foundUser);
- assertTrue(foundRole);
- assertTrue(roles.isEmpty());
+ assertThat(names(subject.getPrincipals(UserPrincipal.class)), containsInAnyOrder("admin"));
+ assertThat(names(subject.getPrincipals(RolePrincipal.class)), containsInAnyOrder("karaf"));
assertTrue(module.logout());
assertEquals("Principals should be gone as the user has logged out", 0, subject.getPrincipals().size());