From 8840383e14338edc40df56e5a5177d9d3dfc363f Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sat, 30 Jun 2007 21:40:25 +0000
Subject: [PATCH] new implementation and additional testcases

---
 opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml    |   18 ++
 opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters |  315 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 189 insertions(+), 144 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
index 19dc4d9..e274753 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
@@ -34,7 +34,6 @@
           <script>
             CurrentTestPath={}
             envAlreadyLoaded='true'
-            CurrentTestPath['group']='indexes'
           </script>
           
           <call function="'testGroup_Preamble'" />
@@ -108,11 +107,21 @@
           else: 
             testLine = line.split(' ')
             indexTests.append(indexTest(testLine[0], testLine[1], testLine[2], testLine[3], testLine[4]))
-              
+          
+        iteration=0
+        previousTestName=''
+        testNumber=0
       </script>
       <iterate var="test" in="indexTests">
         <sequence>
-          <testcase name="'Indexes: Search: %s: %s' % ( test.getAttribute(), test.getName())" >
+          <script>
+          iteration=iteration+1
+          if previousTestName != test.getName():
+            previousTestName=test.getName()
+            testNumber=0
+            
+          </script>
+          <testcase name="'Indexes: 1.Search: %03d-%03d.%s: %s%02d' % ( len(indexTests)-iteration, iteration, test.getAttribute(), test.getName(), testNumber)" >
             <sequence>
               <call function="'testCase_Preamble'" />
               <message>
@@ -138,6 +147,9 @@
               <message level="'debug'">'%s searchReturnCode=[%s] srt=[%s] searchResultString=[%s] string looked for=[%s]' % (test.desc(), searchReturnCode, srt, searchResultString, test.getSearchString())</message>
               <tcstatus result="'%s' % test.getStatus()" />
               <call function="'testCase_Postamble'" />
+              <script>
+                testNumber=testNumber+1
+              </script>
             </sequence>
           </testcase>
         </sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters
index 409ca71..4f67d9a 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters
@@ -1,143 +1,176 @@
 uid presence uid=* 0 NOT-INDEXED
-uid exactMatch1 uid=jwallace 0 INDEXED
-uid exactMatch2 (uid=jwallace) 0 INDEXED
-uid subString1 uid=j* 0 INDEXED
-uid subString2 (uid=j*) 0 INDEXED
-uid subString3 uid=*allace 0 NOT-INDEXED
-uid subString4 (uid=*allace) 0 NOT-INDEXED
-uid subString5 uid=jw*ce 0 INDEXED
-uid subString6 (uid=jw*ce) 0 INDEXED
-uid approximate1 uid~=wallace 0 NOT-INDEXED
-uid approximate2 uid~=jwalace 0 NOT-INDEXED
-uid negate1 !(uid=jwallace) 0 NOT-INDEXED
-uid complexAnd1 (uid=j*&l=sunnyvale) 0 INDEXED
-udi complexAnd2 (uid=j*&l=~sunyvale) 0 INDEXED
-uid complexAnd3 (uid=j*&!l=cupertino) 0 INDEXED
-uid complexAnd4 (uid=j*&l=sun*) 0 INDEXED
-uid complexOr0 (uid=jwallace|uid=jwalker) 0 INDEXED
-uid complexOr1 (uid=jwallace|l=Sun*) 0 INDEXED
-uid complexOr2 (uid=jwallace|l=~unnyvale) 0 INDEXED
-uid complexOr3 (uid=jwallace|!l=Cupertino) 0 INDEXED
-uid complexOr4 (uid=jwallace|!l=Cuper*) 0 INDEXED
-uid complexOr5 (uid=j*|l=sunnyvale) 0 INDEXED
-uid complexOr6 (uid=j*|!l=Cupertino) 0 INDEXED
-uid complexOr7 (uid=j*|!l=Cuper*) 0 INDEXED
-uid complexOr8 (uid=j*|!l~=Cuperino) 0 INDEXED
-uid complexOr9 (uid=j*|l~=sunyvale) 0 INDEXED
+uid presence UID=* 0 NOT-INDEXED
+uid presence uId=* 0 NOT-INDEXED
+uid presence UiD=* 0 NOT-INDEXED
+uid exactMatch uid=jwallace 0 INDEXED
+uid exactMatch (uid=jwallace) 0 INDEXED
+uid exactMatch (&(uid=jwallace)) 0 INDEXED
+uid exactMatch (|(uid=jwallace)) 0 INDEXED
+uid exactMatch (&(&(uid=jwallace))) 0 INDEXED
+uid exactMatch (&(|(uid=jwallace))) 0 INDEXED
+uid exactMatch (|(&(uid=jwallace))) 0 INDEXED
+uid exactMatch (|(|(uid=jwallace))) 0 INDEXED
+uid exactMatch (|(|(uid=jwallace))) 0 INDEXED
+uid subString uid=j* 0 INDEXED
+uid subString (uid=j*) 0 INDEXED
+uid subString uid=*allace 0 NOT-INDEXED
+uid subString (uid=*allace) 0 NOT-INDEXED
+uid subString uid=jw*ce 0 INDEXED
+uid subString (uid=jw*ce) 0 INDEXED
+uid approximate uid~=wallace 0 NOT-INDEXED
+uid approximate uid~=jwalace 0 NOT-INDEXED
+uid negate !(uid=jwallace) 0 NOT-INDEXED
+uid negate (!(uid=jwallace)) 0 NOT-INDEXED
+uid negate (!(&(uid=jwallace))) 0 NOT-INDEXED
+uid negate (!(|(uid=jwallace))) 0 NOT-INDEXED
+uid complexAnd (uid=j*&l=sunnyvale) 0 INDEXED
+udi complexAnd (uid=j*&l=~sunyvale) 0 INDEXED
+uid complexAnd (uid=j*&!l=cupertino) 0 INDEXED
+uid complexAnd (uid=j*&l=sun*) 0 INDEXED
+uid complexAnd (&(uid=j*)(l=sun*)) 0 INDEXED
+uid complexOr (uid=jwallace|uid=jwalker) 0 INDEXED
+uid complexOr (uid=jwallace|l=Sun*) 0 INDEXED
+uid complexOr (uid=jwallace|l=~unnyvale) 0 INDEXED
+uid complexOr (uid=jwallace|!l=Cupertino) 0 INDEXED
+uid complexOr (uid=jwallace|!l=Cuper*) 0 INDEXED
+uid complexOr (uid=j*|l=sunnyvale) 0 INDEXED
+uid complexOr (uid=j*|!l=Cupertino) 0 INDEXED
+uid complexOr (uid=j*|!l=Cuper*) 0 INDEXED
+uid complexOr (uid=j*|!l~=Cuperino) 0 INDEXED
+uid complexOr (uid=j*|l~=sunyvale) 0 INDEXED
+uid complexOr (|(uid=j*)(l=sunnyvale)) 0 INDEXED
+uid complexOr (|(&(uid=j*)(uid=*lace))) 0 INDEXED
 sn presence sn=* 0 INDEXED
-sn exactMatch1 sn=Bergin 0 INDEXED
-sn exactMatch2 (sn=Bergin) 0 INDEXED
-sn subString1 sn=Ber* 0 INDEXED
-sn subString2 (sn=Ber*) 0 INDEXED
-sn subString3 sn=*ergin 0 INDEXED
-sn subString4 (sn=*ergin) 0 INDEXED
-sn subString5 sn=*ergi* 0 INDEXED
-sn subString6 (sn=*ergi*) 0 INDEXED
-sn approximate1 sn~=begin 0 NOT-INDEXED
-sn approximate2 (sn~=begin) 0 NOT-INDEXED
-mail presence1 mail=* 0 INDEXED
-mail presence2 Mail=* 0 INDEXED
-mail presence3 MAIL=* 0 INDEXED
-mail presence4 mAiL=* 0 INDEXED
-mail exactMatch1 mail=kvaughan@example.com 0 INDEXED
-mail exactMatch2 (mail=kvaughan@example.com) 0 INDEXED
-#mail exactMatch3 ((mail=kvaughan@example.com)) 0 INDEXED
-#mail exactMatch4 (((((((mail=kvaughan@example.com))))))) 0 INDEXED
-mail subString1 mail=kvaughan* 0 INDEXED
-mail subString2 (mail=kvaughan*) 0 INDEXED
-mail subString3 mail=*aughan@example.com 0 INDEXED
-mail subString4 (mail=*aughan@example.com) 0 INDEXED
-mail subString5 mail=*aughan@example.* 0 INDEXED
-mail subString6 (mail=*aughan@example.*) 0 INDEXED
-givenName presence1 givenName=* 0 INDEXED
-givenName presence2 (givenName=*) 0 INDEXED
-givenName presence3 givenname=* 0 INDEXED
-givenName presence4 (givenname=*) 0 INDEXED
-givenName presence5 GIVENNAME=* 0 INDEXED
-givenName presence6 (GIVENNAME=*) 0 INDEXED
-givenName presence7 GivenName=* 0 INDEXED
-givenName presence8 (GivenName=*) 0 INDEXED
-givenName presence9 GiVeNnaMe=* 0 INDEXED
-givenName presenceA (GiVeNnaMe=*) 0 INDEXED
-givenName presenceB gIvEnNaMe=* 0 INDEXED
-givenName presenceC (gIvEnNaMe=*) 0 INDEXED
-givenName exactMatch1 givenName=kirsten 0 INDEXED
-givenName exactMatch2 (givenName=kirsten) 0 INDEXED
-givenName exactMatch3 givenName=Kirsten 0 INDEXED
-givenName exactMatch4 (givenName=Kirsten) 0 INDEXED
-givenName exactMatch5 givenname=kirsten 0 INDEXED
-givenName exactMatch6 (givenname=kirsten) 0 INDEXED
-givenName exactMatch7 givenname=KIRSTEN 0 INDEXED
-givenName exactMatch8 (givenname=KIRSTEN) 0 INDEXED
-givenName exactMatch9 GIVENNAME=kirsten 0 INDEXED
-givenName exactMatchA (GIVENNAME=kirsten) 0 INDEXED
-givenName exactMatchB GIVENNAME=KIRSTEN 0 INDEXED
-givenName exactMatchC (GIVENNAME=KIRSTEN) 0 INDEXED
-givenName exactMatchD gIvEnNaMe=kIrStEn 0 INDEXED
-givenName exactMatchE (gIvEnNaMe=kIrStEn) 0 INDEXED
-givenName subString1 givenName=kirst* 0 INDEXED
-givenName subString2 (givenName=kirst*) 0 INDEXED
-givenName subString3 GivenName=kirst* 0 INDEXED
-givenName subString4 (GivenName=kirst*) 0 INDEXED
-givenName subString5 givenname=kirst* 0 INDEXED
-givenName subString6 (givenname=kirst*) 0 INDEXED
-givenName subString7 GIVENNAME=kirst* 0 INDEXED
-givenName subString8 (GIVENNAME=kirst*) 0 INDEXED
-givenName subString9 givenName=*rsten 0 INDEXED
-givenName subStringA (givenName=*rsten) 0 INDEXED
-givenName subStringB GivenName=*rsten 0 INDEXED
-givenName subStringC (GivenName=*rsten) 0 INDEXED
-givenName subStringD givenname=*rsten 0 INDEXED
-givenName subStringE (givenname=*rsten) 0 INDEXED
-givenName subStringF givenName=*rste* 0 INDEXED
-givenName subStringG (givenName=*rste*) 0 INDEXED
-givenName subStringH GivenName=*rste* 0 INDEXED
-givenName subStringI (GivenName=*rste*) 0 INDEXED
-givenName subStringJ GIVENNAME=*rste* 0 INDEXED
-givenName subStringK (GIVENNAME=*rste*) 0 INDEXED
-cn presence1 cn=* 0 INDEXED
-cn presence2 (cn=*) 0 INDEXED
-cn presence3 CN=* 0 INDEXED
-cn presence4 (CN=*) 0 INDEXED
-cn presence5 Cn=* 0 INDEXED
-cn presence6 (Cn=*) 0 INDEXED
-cn subString1 cn=Andy* 0 INDEXED
-cn subString2 (cn=Andy*) 0 INDEXED
-cn subString3 cn=andy* 0 INDEXED
-cn subString4 (cn=andy*) 0 INDEXED
-cn subString5 CN=aNDY* 0 INDEXED
-cn subString6 (CN=aNDY*) 0 INDEXED
-cn subString7 cN=andy* 0 INDEXED
-cn subString8 (cN=andy*) 0 INDEXED
-cn subString9 cn=andy* 0 INDEXED
-cn subStringA cn=*ergin 0 INDEXED
-cn subStringB (cn=*ergin) 0 INDEXED
-cn subStringC cn=*Bergin 0 INDEXED
-cn subStringD (cn=*Bergin) 0 INDEXED
-cn subStringE cN=*Bergin 0 INDEXED
-cn subStringF (cN=*Bergin) 0 INDEXED
-cn subStringG cn=*bERGIN 0 INDEXED
-cn subStringH (cn=*bERGIN) 0 INDEXED
-cn subStringI CN=*bERGIN 0 INDEXED
-cn subStringJ (CN=*bERGIN) 0 INDEXED
-cn subStringK (CN=*bERGIN) 0 INDEXED
-cn subStringL (cn=and*rgin) 0 INDEXED
-cn subStringM (cn=aN*bErGiN) 0 INDEXED
-telephoneNumber presence1 telephoneNumber=* 0 INDEXED
-telephoneNumber presence2 (telephoneNumber=*) 0 INDEXED
-telephoneNumber presence3 telephonenumber=* 0 INDEXED
-telephoneNumber presence4 (telephonenumber=*) 0 INDEXED
-telephoneNumber presence5 TelephoneNumber=* 0 INDEXED
-telephoneNumber presence6 (TelephoneNumber=*) 0 INDEXED
-telephoneNumber presence7 TELEPHONENUMBER=* 0 INDEXED
-telephoneNumber presence8 (TELEPHONENUMBER=*) 0 INDEXED
-telephoneNumber subString1 telephoneNumber=*8585 0 INDEXED
-telephoneNumber subString2 (telephoneNumber=*8585) 0 INDEXED
-telephoneNumber subString3 telephoneNumber=+1* 0 INDEXED
-telephoneNumber subString4 (telephoneNumber=+1*) 0 INDEXED
-telephoneNumber subString5 telephoneNumber=*408* 0 INDEXED
-telephoneNumber subString6 (telephoneNumber=*408*) 0 INDEXED
-telephoneNumber subString7 telephoneNumber=+1*8585 0 INDEXED
-telephoneNumber subString8 (telephoneNumber=+1*8585) 0 INDEXED
-telephoneNumber subString9 telephoneNumber=+1*08*8585 0 INDEXED
-telephoneNumber subStringA (telephoneNumber=+1*08*8585) 0 INDEXED
+sn presence SN=* 0 INDEXED
+sn presence sN=* 0 INDEXED
+sn presence Sn=* 0 INDEXED
+sn exactMatch sn=Bergin 0 INDEXED
+sn exactMatch (sn=Bergin) 0 INDEXED
+sn subString sn=Ber* 0 INDEXED
+sn subString (sn=Ber*) 0 INDEXED
+sn subString sn=*ergin 0 INDEXED
+sn subString (sn=*ergin) 0 INDEXED
+sn subString sn=*ergi* 0 INDEXED
+sn subString (sn=*ergi*) 0 INDEXED
+sn approximate sn~=begin 0 NOT-INDEXED
+sn approximate (sn~=begin) 0 NOT-INDEXED
+mail presence mail=* 0 INDEXED
+mail presence Mail=* 0 INDEXED
+mail presence MAIL=* 0 INDEXED
+mail presence mAiL=* 0 INDEXED
+mail exactMatch mail=kvaughan@example.com 0 INDEXED
+mail exactMatch (mail=kvaughan@example.com) 0 INDEXED
+#mail exactMatch ((mail=kvaughan@example.com)) 0 INDEXED
+#mail exactMatch (((((((mail=kvaughan@example.com))))))) 0 INDEXED
+mail subString mail=kvaughan* 0 INDEXED
+mail subString (mail=kvaughan*) 0 INDEXED
+mail subString mail=*aughan@example.com 0 INDEXED
+mail subString (mail=*aughan@example.com) 0 INDEXED
+mail subString mail=*aughan@example.* 0 INDEXED
+ail subString (mail=*aughan@example.*) 0 INDEXED
+givenName presence givenName=* 0 INDEXED
+givenName presence (givenName=*) 0 INDEXED
+givenName presence givenname=* 0 INDEXED
+givenName presence (givenname=*) 0 INDEXED
+givenName presence GIVENNAME=* 0 INDEXED
+givenName presence (GIVENNAME=*) 0 INDEXED
+givenName presence GivenName=* 0 INDEXED
+givenName presence (GivenName=*) 0 INDEXED
+givenName presence GiVeNnaMe=* 0 INDEXED
+givenName presence (GiVeNnaMe=*) 0 INDEXED
+givenName presence gIvEnNaMe=* 0 INDEXED
+givenName presence (gIvEnNaMe=*) 0 INDEXED
+givenName exactMatch givenName=kirsten 0 INDEXED
+givenName exactMatch (givenName=kirsten) 0 INDEXED
+givenName exactMatch givenName=Kirsten 0 INDEXED
+givenName exactMatch (givenName=Kirsten) 0 INDEXED
+givenName exactMatch givenname=kirsten 0 INDEXED
+givenName exactMatch (givenname=kirsten) 0 INDEXED
+givenName exactMatch givenname=KIRSTEN 0 INDEXED
+givenName exactMatch (givenname=KIRSTEN) 0 INDEXED
+givenName exactMatch GIVENNAME=kirsten 0 INDEXED
+givenName exactMatch (GIVENNAME=kirsten) 0 INDEXED
+givenName exactMatch GIVENNAME=KIRSTEN 0 INDEXED
+givenName exactMatch (GIVENNAME=KIRSTEN) 0 INDEXED
+givenName exactMatch gIvEnNaMe=kIrStEn 0 INDEXED
+givenName exactMatch (gIvEnNaMe=kIrStEn) 0 INDEXED
+givenName subString givenName=kirst* 0 INDEXED
+givenName subString (givenName=kirst*) 0 INDEXED
+givenName subString GivenName=kirst* 0 INDEXED
+givenName subString (GivenName=kirst*) 0 INDEXED
+givenName subString givenname=kirst* 0 INDEXED
+givenName subString (givenname=kirst*) 0 INDEXED
+givenName subString GIVENNAME=kirst* 0 INDEXED
+givenName subString (GIVENNAME=kirst*) 0 INDEXED
+givenName subString givenName=*rsten 0 INDEXED
+givenName subString (givenName=*rsten) 0 INDEXED
+givenName subString GivenName=*rsten 0 INDEXED
+givenName subString (GivenName=*rsten) 0 INDEXED
+givenName subString givenname=*rsten 0 INDEXED
+givenName subString (givenname=*rsten) 0 INDEXED
+givenName subString givenName=*rste* 0 INDEXED
+givenName subString (givenName=*rste*) 0 INDEXED
+givenName subString GivenName=*rste* 0 INDEXED
+givenName subString (GivenName=*rste*) 0 INDEXED
+givenName subString GIVENNAME=*rste* 0 INDEXED
+givenName subString (GIVENNAME=*rste*) 0 INDEXED
+cn presence cn=* 0 INDEXED
+cn presence (cn=*) 0 INDEXED
+cn presence CN=* 0 INDEXED
+cn presence (CN=*) 0 INDEXED
+cn presence Cn=* 0 INDEXED
+cn presence (Cn=*) 0 INDEXED
+cn subString cn=Andy* 0 INDEXED
+cn subString (cn=Andy*) 0 INDEXED
+cn subString cn=andy* 0 INDEXED
+cn subString (cn=andy*) 0 INDEXED
+cn subString CN=aNDY* 0 INDEXED
+cn subString (CN=aNDY*) 0 INDEXED
+cn subString cN=andy* 0 INDEXED
+cn subString (cN=andy*) 0 INDEXED
+cn subString cn=andy* 0 INDEXED
+cn subString cn=*ergin 0 INDEXED
+cn subString (cn=*ergin) 0 INDEXED
+cn subString cn=*Bergin 0 INDEXED
+cn subString (cn=*Bergin) 0 INDEXED
+cn subString cN=*Bergin 0 INDEXED
+cn subString (cN=*Bergin) 0 INDEXED
+cn subString cn=*bERGIN 0 INDEXED
+cn subString (cn=*bERGIN) 0 INDEXED
+cn subString CN=*bERGIN 0 INDEXED
+cn subString (CN=*bERGIN) 0 INDEXED
+cn subString (CN=*bERGIN) 0 INDEXED
+cn subString (cn=and*rgin) 0 INDEXED
+cn subString (cn=aN*bErGiN) 0 INDEXED
+telephoneNumber presence telephoneNumber=* 0 INDEXED
+telephoneNumber presence (telephoneNumber=*) 0 INDEXED
+telephoneNumber presence telephonenumber=* 0 INDEXED
+telephoneNumber presence (telephonenumber=*) 0 INDEXED
+telephoneNumber presence TelephoneNumber=* 0 INDEXED
+telephoneNumber presence (TelephoneNumber=*) 0 INDEXED
+telephoneNumber presence TELEPHONENUMBER=* 0 INDEXED
+telephoneNumber presence (TELEPHONENUMBER=*) 0 INDEXED
+telephoneNumber presence (&(TELEPHONENUMBER=*)) 0 INDEXED
+telephoneNumber presence (|(TELEPHONENUMBER=*)) 0 INDEXED
+telephoneNumber presence (&(&(TELEPHONENUMBER=*))) 0 INDEXED
+telephoneNumber presence (|(|(TELEPHONENUMBER=*))) 0 INDEXED
+telephoneNumber presence (&(|(TELEPHONENUMBER=*))) 0 INDEXED
+telephoneNumber presence (|(&(TELEPHONENUMBER=*))) 0 INDEXED
+telephoneNumber subString telephoneNumber=*8585 0 INDEXED
+telephoneNumber subString (telephoneNumber=*8585) 0 INDEXED
+telephoneNumber subString telephoneNumber=+1* 0 INDEXED
+telephoneNumber subString (telephoneNumber=+1*) 0 INDEXED
+telephoneNumber subString telephoneNumber=*408* 0 INDEXED
+telephoneNumber subString (telephoneNumber=*408*) 0 INDEXED
+telephoneNumber subString telephoneNumber=+1*8585 0 INDEXED
+telephoneNumber subString (telephoneNumber=+1*8585) 0 INDEXED
+telephoneNumber subString telephoneNumber=+1*08*8585 0 INDEXED
+telephoneNumber subString (telephoneNumber=+1*08*8585) 0 INDEXED
+telephoneNumber subString (&(telephoneNumber=+1*08*8585)) 0 INDEXED
+telephoneNumber subString (|(telephoneNumber=+1*08*8585)) 0 INDEXED
+telephoneNumber subString (&(&(telephoneNumber=+1*08*8585))) 0 INDEXED
+telephoneNumber subString (&(|(telephoneNumber=+1*08*8585))) 0 INDEXED
+telephoneNumber subString (|(&(telephoneNumber=+1*08*8585))) 0 INDEXED
+telephoneNumber subString (|(|(|(|(|(|(|(telephoneNumber=+1*08*8585)))))))) 0 INDEXED
+telephoneNumber subString (&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(telephoneNumber=+1*08*8585)))))))))))))))) 0 INDEXED
+telephoneNumber subString (&(|(&(|(&(|(&(|(&(|(&(|(&(|(&(|(telephoneNumber=+1*08*8585))))))))))))))))) 0 INDEXED

--
Gitblit v1.10.0