From 4f0362bc7817d05a7c3e2c8a33c7e9eb62989257 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 30 Nov 2015 12:29:17 +0000 Subject: [PATCH] Fix unit tests git-svn-id: https://svn.argeo.org/commons/trunk@8656 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../test/org/argeo/osgi/useradmin/LdifParserTest.java | 11 ++++++----- .../org/argeo/osgi/useradmin/LdifUserAdminTest.java | 6 ++++-- .../ext/test/org/argeo/osgi/useradmin/basic.ldif | 8 ++++---- .../src/org/argeo/osgi/useradmin/LdifName.java | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java index 75a5c34b3..34ac98b1c 100644 --- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java +++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java @@ -22,19 +22,20 @@ public class LdifParserTest extends TestCase implements BasicTestConstants { LdapName rootDn = new LdapName(ROOT_USER_DN); Attributes rootAttributes = res.get(rootDn); assertNotNull(rootAttributes); - assertEquals("Superuser", rootAttributes.get("description").get()); - byte[] rawPwEntry = (byte[]) rootAttributes.get("userpassword").get(); + assertEquals("Superuser", + rootAttributes.get(LdifName.description.name()).get()); + byte[] rawPwEntry = (byte[]) rootAttributes.get( + LdifName.userPassword.name()).get(); assertEquals("{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE=", new String(rawPwEntry)); byte[] hashedPassword = DigestUtils.sha1("demo".getBytes()); assertEquals("{SHA}" + Base64.encodeBase64String(hashedPassword), new String(rawPwEntry)); - LdapName adminDn = new LdapName( - ADMIN_GROUP_DN); + LdapName adminDn = new LdapName(ADMIN_GROUP_DN); Attributes adminAttributes = res.get(adminDn); assertNotNull(adminAttributes); - Attribute memberAttribute = adminAttributes.get("member"); + Attribute memberAttribute = adminAttributes.get(LdifName.member.name()); assertNotNull(memberAttribute); NamingEnumeration members = memberAttribute.getAll(); List users = new ArrayList(); diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java index 051677417..27e3c1dfc 100644 --- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java +++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java @@ -66,8 +66,10 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants { byte[] hashedPassword = ("{SHA}" + Base64 .encodeBase64String(DigestUtils.sha1("demo".getBytes()))) .getBytes(); - assertTrue(rootUser.hasCredential("userpassword", hashedPassword)); - assertTrue(demoUser.hasCredential("userpassword", hashedPassword)); + assertTrue(rootUser.hasCredential(LdifName.userPassword.name(), + hashedPassword)); + assertTrue(demoUser.hasCredential(LdifName.userPassword.name(), + hashedPassword)); // search Role[] search = userAdmin.getRoles(null); diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif index 963407177..d4b984809 100644 --- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif +++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif @@ -21,11 +21,11 @@ objectClass: person objectClass: top cn: demo User description: Demo user -givenname: Demo +givenName: Demo mail: demo@localhost sn: User uid: demo -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 +userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 dn: uid=root+cn=Super Admin,ou=People,dc=demo,dc=example,dc=org objectClass: inetOrgPerson @@ -34,11 +34,11 @@ objectClass: organizationalPerson objectClass: top cn: Super Admin description: Superuser -givenname: Root +givenName: Root mail: root@localhost sn: Root uid: root -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 +userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 dn: cn=admin,ou=Roles,dc=demo,dc=example,dc=org objectClass: groupOfNames diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java index 25125e0fb..8693f60dd 100644 --- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java +++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java @@ -9,7 +9,7 @@ import javax.naming.ldap.LdapName; */ public enum LdifName { // Attributes - dn, cn, sn, uid, mail, displayName, objectClass, userPassword, givenName, description, + dn, cn, sn, uid, mail, displayName, objectClass, userPassword, givenName, description, member, // POSIX attributes uidNumber, gidNumber, homeDirectory, loginShell, gecos, // Object classes -- 2.30.2