Standardise user admin unit tests

[lgpl/argeo-commons.git] / org.argeo.security.core / ext / test / org / argeo / osgi / useradmin / LdifUserAdminTest.java

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 05167741781ef21b490ae5e3412ea8f40912a972..c8bc583ed322b96c34c80eab76744d3a6537dc4a 100644 (file)
--- 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
@@ -45,7 +45,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
                assertEquals(1, members.length);
                assertEquals(rootUser, members[0]);
 
-               Group editorGroup = (Group) userAdmin.getRole(EDITOR_GROUP_DN);
+               Group editorGroup = (Group) userAdmin.getRole(EDITORS_GROUP_DN);
                assertNotNull(editorGroup);
                members = editorGroup.getMembers();
                assertEquals(2, members.length);
@@ -57,7 +57,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
                assertEquals(3, rootRoles.size());
                assertTrue(rootRoles.contains(ROOT_USER_DN));
                assertTrue(rootRoles.contains(ADMIN_GROUP_DN));
-               assertTrue(rootRoles.contains(EDITOR_GROUP_DN));
+               assertTrue(rootRoles.contains(EDITORS_GROUP_DN));
 
                // properties
                assertEquals("root@localhost", rootUser.getProperties().get("mail"));
@@ -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);