Standardise user admin unit tests

git-svn-id: https://svn.argeo.org/commons/trunk@9103 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java
index 56c9b92cd7a23291c0689982b987ed9bcea6e8ad..5bf1b5b0f2f417b561092ca78f8b7c5e5feaf386 100644 (file)
--- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java
+++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java
@@ -1,8 +1,8 @@
 package org.argeo.osgi.useradmin;
 
 interface BasicTestConstants {
-       final static String ROOT_USER_DN = "uid=root+cn=Super Admin,ou=People,dc=demo,dc=example,dc=org";
-       final static String DEMO_USER_DN = "uid=demo,ou=People,dc=demo,dc=example,dc=org";
-       final static String ADMIN_GROUP_DN = "cn=admin,ou=Roles,dc=demo,dc=example,dc=org";
-       final static String EDITOR_GROUP_DN = "cn=editor,ou=Roles,dc=demo,dc=example,dc=org";
+       final static String ROOT_USER_DN = "uid=root,ou=users,dc=example,dc=com";
+       final static String DEMO_USER_DN = "uid=demo,ou=users,dc=example,dc=com";
+       final static String ADMIN_GROUP_DN = "cn=admin,ou=groups,dc=example,dc=com";
+       final static String EDITORS_GROUP_DN = "cn=editors,ou=groups,dc=example,dc=com";
 }

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 27e3c1dfc9a6a23f98615751d9ca82d2745e2a17..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"));

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 d4b9848090cc52781bc569f0f6e1abf85eba8208..b7328b0b976079f31883b36a06d12927821b22c8 100644 (file)
--- 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
@@ -1,25 +1,25 @@
-dn: dc=demo,dc=example,dc=org
+dn: dc=example,dc=com
 objectClass: domain
 objectClass: extensibleObject
 objectClass: top
-dc: demo
+dc: example
 
-dn: ou=Roles,dc=demo,dc=example,dc=org
+dn: ou=groups,dc=example,dc=com
 objectClass: organizationalUnit
 objectClass: top
-ou: Roles
+ou: groups
 
-dn: ou=People,dc=demo,dc=example,dc=org
+dn: ou=users,dc=example,dc=com
 objectClass: organizationalUnit
 objectClass: top
-ou: People
+ou: users
 
-dn: uid=demo,ou=People,dc=demo,dc=example,dc=org
+dn: uid=demo,ou=users,dc=example,dc=com
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
 objectClass: person
 objectClass: top
-cn: demo User
+cn: Demo User
 description: Demo user
 givenName: Demo
 mail: demo@localhost
@@ -27,29 +27,28 @@ sn: User
 uid: demo
 userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9
 
-dn: uid=root+cn=Super Admin,ou=People,dc=demo,dc=example,dc=org
+dn: uid=root,ou=users,dc=example,dc=com
 objectClass: inetOrgPerson
 objectClass: person
 objectClass: organizationalPerson
 objectClass: top
-cn: Super Admin
+cn: Super User
 description: Superuser
-givenName: Root
+givenName: Super
 mail: root@localhost
-sn: Root
+sn: User
 uid: root
 userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9
 
-dn: cn=admin,ou=Roles,dc=demo,dc=example,dc=org
+dn: cn=admin,ou=groups,dc=example,dc=com
 objectClass: groupOfNames
 objectClass: top
 cn: admin
-member: uid=root+cn=Super Admin,ou=People,dc=demo,dc=example,dc=org
+member: uid=root,ou=users,dc=example,dc=com
 
-dn: cn=editor,ou=Roles,dc=demo,dc=example,dc=org
+dn: cn=editors,ou=groups,dc=example,dc=com
 objectClass: groupOfNames
 objectClass: top
-cn: editor
-member: cn=admin,ou=Roles,dc=demo,dc=example,dc=org
-member: uid=demo,ou=People,dc=demo,dc=example,dc=org
-
+cn: editors
+member: cn=admin,ou=groups,dc=example,dc=com
+member: uid=demo,ou=users,dc=example,dc=com