From: Howard Chu Date: Wed, 24 Aug 2005 08:55:12 +0000 (+0000) Subject: ITS#3968 Add tests for valsort overlay, with fixes. X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~586 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27467a79e7efe92c12c45283288d2a824266b849;p=openldap ITS#3968 Add tests for valsort overlay, with fixes. --- diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf new file mode 100644 index 0000000000..7b8cbf4533 --- /dev/null +++ b/tests/data/slapd-valsort.conf @@ -0,0 +1,57 @@ +# stand-alone slapd config -- for testing (with unique overlay) +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 2004-2005 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . + +include ./schema/core.schema +include ./schema/cosine.schema +include ./schema/inetorgperson.schema +include ./schema/openldap.schema + +# +pidfile ./testrun/slapd.1.pid +argsfile ./testrun/slapd.1.args + +#mod#modulepath ../servers/slapd/back-@BACKEND@/ +#mod#moduleload back_@BACKEND@.la +#monitormod#modulepath ../servers/slapd/back-monitor/ +#monitormod#moduleload back_monitor.la +#valsortmod#moduleload ../servers/slapd/overlays/valsort.la + +####################################################################### +# database definitions +####################################################################### + +database @BACKEND@ +suffix "o=valsort" +directory ./testrun/db.1.a +rootdn "cn=Manager,o=valsort" +rootpw secret +#bdb#index objectClass eq +#bdb#index cn,sn,uid pres,eq,sub +#hdb#index objectClass eq +#hdb#index cn,sn,uid pres,eq,sub +#ldbm#index objectClass eq +#ldbm#index cn,sn,uid pres,eq,sub + +overlay valsort +valsort-attr sn ou=users,o=valsort alpha-ascend +valsort-attr departmentNumber ou=users,o=valsort alpha-ascend +valsort-attr mailPreferenceOption ou=users,o=valsort numeric-ascend +valsort-attr ou ou=users,o=valsort weighted +valsort-attr employeeType ou=users,o=valsort weighted alpha-ascend + +database config +rootpw secret + +#monitor#database monitor diff --git a/tests/data/test-valsort.ldif b/tests/data/test-valsort.ldif new file mode 100755 index 0000000000..c2c7f3e245 --- /dev/null +++ b/tests/data/test-valsort.ldif @@ -0,0 +1,49 @@ +# base + +dn: o=valsort +objectClass: top +objectClass: organization +o: valsort +description: valsort test database + +# container + +dn: ou=users,o=valsort +objectClass: top +objectClass: organizationalUnit +ou: users +description: container for test valsort users + +# manager +dn: uid=george,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: george +sn: jungle +sn: alpha +sn: zib +sn: tree +cn: george +businessCategory: test +carLicense: SAMPLE +departmentNumber: 1 +departmentNumber: 5 +departmentNumber: 3 +departmentNumber: 10 +departmentNumber: 72 +departmentNumber: 37 +departmentNumber: 46 +displayName: George +employeeNumber: 5150 +employeeType: {1}contractor +employeeType: {1}staff +employeeType: {1}anarchist +givenName: Big G +ou: {1}Chemistry +ou: {8}Academia +ou: {3}Hum Bio +ou: {2}Computer Science +mailPreferenceOption: 3 +mailPreferenceOption: 87 +mailPreferenceOption: 22 +mailPreferenceOption: 1 +mailPreferenceOption: 66 diff --git a/tests/data/valsort1.out b/tests/data/valsort1.out new file mode 100755 index 0000000000..c470762cca --- /dev/null +++ b/tests/data/valsort1.out @@ -0,0 +1,45 @@ +dn: o=valsort +objectClass: top +objectClass: organization +o: valsort +description: valsort test database + +dn: ou=users,o=valsort +objectClass: top +objectClass: organizationalUnit +ou: users +description: container for test valsort users + +dn: uid=george,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: george +sn: alpha +sn: jungle +sn: tree +sn: zib +cn: george +businessCategory: test +carLicense: SAMPLE +departmentNumber: 1 +departmentNumber: 10 +departmentNumber: 3 +departmentNumber: 37 +departmentNumber: 46 +departmentNumber: 5 +departmentNumber: 72 +displayName: George +employeeNumber: 5150 +employeeType: anarchist +employeeType: contractor +employeeType: staff +givenName: Big G +ou: Chemistry +ou: Computer Science +ou: Hum Bio +ou: Academia +mailPreferenceOption: 1 +mailPreferenceOption: 3 +mailPreferenceOption: 22 +mailPreferenceOption: 66 +mailPreferenceOption: 87 + diff --git a/tests/data/valsort2.out b/tests/data/valsort2.out new file mode 100755 index 0000000000..c235865a4b --- /dev/null +++ b/tests/data/valsort2.out @@ -0,0 +1,45 @@ +dn: o=valsort +objectClass: top +objectClass: organization +o: valsort +description: valsort test database + +dn: ou=users,o=valsort +objectClass: top +objectClass: organizationalUnit +ou: users +description: container for test valsort users + +dn: uid=george,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: george +sn: zib +sn: tree +sn: jungle +sn: alpha +cn: george +businessCategory: test +carLicense: SAMPLE +departmentNumber: 72 +departmentNumber: 5 +departmentNumber: 46 +departmentNumber: 37 +departmentNumber: 3 +departmentNumber: 10 +departmentNumber: 1 +displayName: George +employeeNumber: 5150 +employeeType: staff +employeeType: contractor +employeeType: anarchist +givenName: Big G +ou: Chemistry +ou: Computer Science +ou: Hum Bio +ou: Academia +mailPreferenceOption: 87 +mailPreferenceOption: 66 +mailPreferenceOption: 22 +mailPreferenceOption: 3 +mailPreferenceOption: 1 + diff --git a/tests/data/valsort3.out b/tests/data/valsort3.out new file mode 100755 index 0000000000..caefe1e3ec --- /dev/null +++ b/tests/data/valsort3.out @@ -0,0 +1,61 @@ +dn: o=valsort +objectClass: top +objectClass: organization +o: valsort +description: valsort test database + +dn: ou=users,o=valsort +objectClass: top +objectClass: organizationalUnit +ou: users +description: container for test valsort users + +dn: uid=george,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: george +sn: zib +sn: tree +sn: jungle +sn: alpha +cn: george +businessCategory: test +carLicense: SAMPLE +departmentNumber: 72 +departmentNumber: 5 +departmentNumber: 46 +departmentNumber: 37 +departmentNumber: 3 +departmentNumber: 10 +departmentNumber: 1 +displayName: George +employeeNumber: 5150 +employeeType: staff +employeeType: contractor +employeeType: anarchist +givenName: Big G +ou: Chemistry +ou: Computer Science +ou: Hum Bio +ou: Academia +mailPreferenceOption: 87 +mailPreferenceOption: 66 +mailPreferenceOption: 22 +mailPreferenceOption: 3 +mailPreferenceOption: 1 + +dn: uid=dave,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: dave +sn: nothere +cn: dave +businessCategory: otest +carLicense: TEST +departmentNumber: 42 +displayName: Dave +employeeNumber: 69 +employeeType: contractor +givenName: Dave +ou: Test +ou: Is +ou: Okay + diff --git a/tests/run.in b/tests/run.in index e880f88205..363c48703d 100644 --- a/tests/run.in +++ b/tests/run.in @@ -42,6 +42,7 @@ AC_translucent=translucent@BUILD_TRANSLUCENT@ AC_unique=unique@BUILD_UNIQUE@ AC_rwm=rwm@BUILD_RWM@ AC_syncprov=syncprov@BUILD_SYNCPROV@ +AC_valsort=valsort@BUILD_VALSORT@ # misc AC_WITH_SASL=@WITH_SASL@ @@ -52,6 +53,7 @@ AC_ACI_ENABLED=aci@SLAPD_ACI_ENABLED@ export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql export AC_glue AC_pcache AC_ppolicy AC_refint AC_retcode AC_rwm AC_unique AC_syncprov export AC_translucent AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED +export AC_valsort if test ! -x ../servers/slapd/slapd ; then echo "Could not locate slapd(8)" diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh index c570e59d38..1f78c01ba3 100755 --- a/tests/scripts/conf.sh +++ b/tests/scripts/conf.sh @@ -50,6 +50,7 @@ sed -e "s/@BACKEND@/${BACKEND}/" \ -e "s/^#${AC_syncprov}#//" \ -e "s/^#${AC_translucent}#//" \ -e "s/^#${AC_unique}#//" \ + -e "s/^#${AC_valsort}#//" \ -e "s/^#${MON}#//" \ -e "s/^#${MONMOD}#//" \ -e "s/^#${SASL}#//" \ diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 07bd16ab53..2a5be5fa3f 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -33,6 +33,7 @@ WITH_SASL=${AC_WITH_SASL-no} USE_SASL=${SLAPD_USE_SASL-no} WITHTLS=${AC_WITHTLS-yes} ACI=${AC_ACI_ENABLED-acino} +VALSORT=${AC_valsort-valsortno} DATADIR=./testdata PROGDIR=./progs @@ -97,6 +98,7 @@ METACONF=$DATADIR/slapd-meta.conf METACONF2=$DATADIR/slapd-meta2.conf GLUELDAPCONF=$DATADIR/slapd-glue-ldap.conf ACICONF=$DATADIR/slapd-aci.conf +VALSORTCONF=$DATADIR/slapd-valsort.conf CONF1=$TESTDIR/slapd.1.conf CONF2=$TESTDIR/slapd.2.conf @@ -186,6 +188,7 @@ LDIFTRANSLUCENTCONFIG=$DATADIR/test-translucent-config.ldif LDIFTRANSLUCENTADD=$DATADIR/test-translucent-add.ldif LDIFTRANSLUCENTMERGED=$DATADIR/test-translucent-merged.ldif LDIFMETA=$DATADIR/test-meta.ldif +LDIFVALSORT=$DATADIR/test-valsort.ldif SQLADD=$DATADIR/sql-add.ldif MONITOR="" REFDN="c=US" @@ -206,6 +209,8 @@ TRANSLUCENTDN="uid=binder,o=translucent" TRANSLUCENTPASSWD="bindtest" METABASEDN="ou=Meta,dc=example,dc=com" METAMANAGERDN="cn=Manager,$METABASEDN" +VALSORTDN="cn=Manager,o=valsort" +VALSORTBASEDN="o=valsort" LOG1=$TESTDIR/slapd.1.log LOG2=$TESTDIR/slapd.2.log @@ -223,6 +228,9 @@ SEARCHFLT2=$TESTDIR/ldapsearch2.flt LDIFFLT=$TESTDIR/ldif.flt TESTOUT=$TESTDIR/test.out INITOUT=$TESTDIR/init.out +VALSORTOUT1=$DATADIR/valsort1.out +VALSORTOUT2=$DATADIR/valsort2.out +VALSORTOUT3=$DATADIR/valsort3.out SERVER1OUT=$TESTDIR/server1.out SERVER1FLT=$TESTDIR/server1.flt diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort new file mode 100755 index 0000000000..fd86e31b35 --- /dev/null +++ b/tests/scripts/test042-valsort @@ -0,0 +1,219 @@ +#! /bin/sh +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 2004-2005 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . + +echo "running defines.sh" +. $SRCDIR/scripts/defines.sh + +if test $VALSORT = valsortno; then + echo "Valsort overlay not available, test skipped" + exit 0 +fi + +mkdir -p $TESTDIR $DBDIR1 + +echo "Running slapadd to build slapd database..." +. $CONFFILTER $BACKEND $MONITORDB < $VALSORTCONF > $CONF1 +$SLAPADD -f $CONF1 -l $LDIFVALSORT +RC=$? +if test $RC != 0 ; then + echo "slapadd failed ($RC)!" + exit $RC +fi + +echo "Starting slapd on TCP/IP port $PORT1..." +$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & +PID=$! +if test $WAIT != 0 ; then + echo PID $PID + read foo +fi +KILLPIDS="$PID" + +echo "Testing slapd sorted values operations..." +for i in 0 1 2 3 4 5; do + $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ + 'objectclass=*' > /dev/null 2>&1 + RC=$? + if test $RC = 0 ; then + break + fi + echo "Waiting 5 seconds for slapd to start..." + sleep 5 +done + +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Testing ascending and weighted sort" + +FILTER="objectClass=*" +$LDAPSEARCH -b "$VALSORTBASEDN" -h $LOCALHOST -p $PORT1 \ + "$FILTER" > $SEARCHOUT 2>&1 + +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Filtering ldapsearch results..." +. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $VALSORTOUT1 > $CMPOUT + +if test $? != 0 ; then + echo "Comparison failed" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit 1 +fi + +echo ">>>>> Test succeeded" + +echo "Reconfiguring slapd to test valsort descending" + +$LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -w $PASSWD > \ + $TESTOUT 2>&1 << EOMODS +version: 1 +dn: olcOverlay={0}valsort,olcDatabase={1}$BACKEND,cn=config +changetype: modify +replace: olcValSortAttr +olcValSortAttr: employeeType "ou=users,o=valsort" weighted alpha-descend +olcValSortAttr: ou "ou=users,o=valsort" weighted +olcValSortAttr: mailPreferenceOption "ou=users,o=valsort" numeric-descend +olcValSortAttr: departmentNumber "ou=users,o=valsort" alpha-descend +olcValSortAttr: sn "ou=users,o=valsort" alpha-descend + +EOMODS + +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Testing descending and weighted sort" + +$LDAPSEARCH -b "$VALSORTBASEDN" -h $LOCALHOST -p $PORT1 \ + "$FILTER" > $SEARCHOUT 2>&1 + +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Filtering ldapsearch results..." +. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $VALSORTOUT2 > $CMPOUT + +if test $? != 0 ; then + echo "Comparison failed" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit 1 +fi + +echo ">>>>> Test succeeded" + +echo "Adding a valsort record with weighted ou..." + +$LDAPADD -D "$VALSORTDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \ + > /dev/null << EOTVALSORT1 +dn: uid=dave,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: dave +sn: nothere +cn: dave +businessCategory: otest +carLicense: TEST +departmentNumber: 42 +displayName: Dave +employeeNumber: 69 +employeeType: {1}contractor +givenName: Dave +ou: {1}Test +ou: {3}Okay +ou: {2}Is +EOTVALSORT1 + +RC=$? +if test $RC != 0 ; then + echo "ldapadd failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +#echo ---------------------- +#$LDAPSEARCH -b "o=valsort" -h $LOCALHOST -p $PORT1 + +echo "Adding a non-weighted valsort record with ou..." + +$LDAPADD -D "$VALSORTDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ + $TESTOUT 2>&1 << EOTVALSORT2 +dn: uid=bill,ou=users,o=valsort +objectClass: OpenLDAPperson +uid: bill +sn: johnson +cn: bill +businessCategory: rtest +carLicense: ABC123 +departmentNumber: 42 +displayName: Bill +employeeNumber: 5150 +employeeType: {1}contractor +givenName: Bill +ou: Test +ou: Okay +ou: Is +EOTVALSORT2 + +RC=$? +if test $RC != 19 ; then + echo "valsort check failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit -1 +fi + +$LDAPSEARCH -b "$VALSORTBASEDN" -h $LOCALHOST -p $PORT1 \ + "$FILTER" > $SEARCHOUT 2>&1 + +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Filtering ldapsearch results..." +. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $VALSORTOUT3 > $CMPOUT + +if test $? != 0 ; then + echo "Comparison failed" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit 1 +fi + +test $KILLSERVERS != no && kill -HUP $KILLPIDS + +echo ">>>>> Test succeeded" +exit 0