ITS#7366 Update slapo-constraint tests

2025-12-26 17:49:59 -05:00 · 2012-08-23 13:09:05 +02:00 · 2012-08-23 13:09:05 +02:00 · 96b994e6dd
commit 96b994e6dd
parent a1c2dc66db
31 changed files with 55 additions and 29 deletions
--- a/tests/data/constraint/constraint.out
+++ b/tests/data/constraint/constraint.out
@ -23,3 +23,6 @@ FAIL
 FAIL
 FAIL
 FAIL
+FAIL
+FAIL
+FAIL
--- a/tests/data/constraint/t_fail_01.ldif
+++ b/tests/data/constraint/t_fail_01.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_02.ldif
+++ b/tests/data/constraint/t_fail_02.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_03.ldif
+++ b/tests/data/constraint/t_fail_03.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_04.ldif
+++ b/tests/data/constraint/t_fail_04.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_05.ldif
+++ b/tests/data/constraint/t_fail_05.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_06.ldif
+++ b/tests/data/constraint/t_fail_06.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com
--- a/tests/data/constraint/t_fail_07.ldif
+++ b/tests/data/constraint/t_fail_07.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com
--- a/tests/data/constraint/t_fail_08.ldif
+++ b/tests/data/constraint/t_fail_08.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_09.ldif
+++ b/tests/data/constraint/t_fail_09.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_fail_10.ldif
+++ b/tests/data/constraint/t_fail_10.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: example@not-allowed.com
--- a/tests/data/constraint/t_fail_11.ldif
+++ b/tests/data/constraint/t_fail_11.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 mail: original@example.com
--- a/tests/data/constraint/t_fail_12.ldif
+++ b/tests/data/constraint/t_fail_12.ldif
@ -0,0 +1,10 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+delete: mail
+mail: original@example.com
+-
+add: mail
+mail: notsooriginal@example.com
+-
+replace: cn
+cn: John Fail
--- a/tests/data/constraint/t_fail_13.ldif
+++ b/tests/data/constraint/t_fail_13.ldif
@ -0,0 +1,4 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+replace: givenname
+givenname: Joe
--- a/tests/data/constraint/t_fail_14.ldif
+++ b/tests/data/constraint/t_fail_14.ldif
@ -0,0 +1,4 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+replace: sn
+sn: Down
--- a/tests/data/constraint/t_ok_01.ldif
+++ b/tests/data/constraint/t_ok_01.ldif
@ -1,3 +1,3 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
--- a/tests/data/constraint/t_ok_02.ldif
+++ b/tests/data/constraint/t_ok_02.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com
--- a/tests/data/constraint/t_ok_03.ldif
+++ b/tests/data/constraint/t_ok_03.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com
--- a/tests/data/constraint/t_ok_04.ldif
+++ b/tests/data/constraint/t_ok_04.ldif
@ -1,3 +1,3 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
--- a/tests/data/constraint/t_ok_05.ldif
+++ b/tests/data/constraint/t_ok_05.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: a@example.com
--- a/tests/data/constraint/t_ok_06.ldif
+++ b/tests/data/constraint/t_ok_06.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 -
--- a/tests/data/constraint/t_ok_07.ldif
+++ b/tests/data/constraint/t_ok_07.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 -
--- a/tests/data/constraint/t_ok_08.ldif
+++ b/tests/data/constraint/t_ok_08.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_ok_09.ldif
+++ b/tests/data/constraint/t_ok_09.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com
--- a/tests/data/constraint/t_ok_10.ldif
+++ b/tests/data/constraint/t_ok_10.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_ok_11.ldif
+++ b/tests/data/constraint/t_ok_11.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_ok_12.ldif
+++ b/tests/data/constraint/t_ok_12.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_ok_13.ldif
+++ b/tests/data/constraint/t_ok_13.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com
--- a/tests/data/constraint/t_ok_14.ldif
+++ b/tests/data/constraint/t_ok_14.ldif
@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: description
 description: desc1
--- a/tests/data/constraint/user.ldif
+++ b/tests/data/constraint/user.ldif
@ -1,7 +1,8 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 objectclass: inetOrgPerson
 objectclass: organizationalPerson
-cn: John
+cn: John Doe
+givenname: John
 sn: Doe
 mail: original@example.com
 description: desc1
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@ -13,7 +13,7 @@ ROOTLDIF="$CONSTRAINTDIR/root.ldif"
 USERLDIF="$CONSTRAINTDIR/user.ldif"
 RESULTOUT="$CONSTRAINTDIR/constraint.out"
 SCRIPTOUT="$TESTDIR/constraint.out"
-USERDN="cn=user,$BASEDN"
+USERDN="cn=John Doe,$BASEDN"

 CONFDIR=$TESTDIR/slapd.d
 mkdir -p $TESTDIR $CONFDIR $DBDIR1
@ -91,6 +91,10 @@ olcOverlay: constraint
 olcConstraintAttribute: mail count 3
 olcConstraintAttribute: mail regex ^[[:alnum:]]+@example.com$
 olcConstraintAttribute: description count 2
+# cn value has to be concatenated givenName SP sn
+olcConstraintAttribute: cn,sn,givenName
+  set "(this/givenName + [ ] + this/sn) & this/cn"
+  restrict="ldap:///$USERDN??sub?(objectClass=inetOrgPerson)"
 EOF

 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
@ -123,7 +127,7 @@ fi
 echo "Running constraint tests..."
 for ldif in $SRCDIR/data/constraint/{*ok*,*fail*}.ldif; do
 	### reload
-	$LDAPDELETE -D "$MANAGERDN" -H $URI1 -w $PASSWD $USERDN &>/dev/null
+	$LDAPDELETE -D "$MANAGERDN" -H $URI1 -w $PASSWD "$USERDN" &>/dev/null
 	RC=$?
 	if test $RC != 0 ; then
 		echo "ldapdelete failed ($RC)!"