From e1704a2aa0cfb0436fe1afec662515316e94836d Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Tue, 31 Jul 2007 03:01:56 +0000
Subject: [PATCH] 1. fixed 2 ldap filter invalid syntaxes 2. fixed bad function call for indexes_remove
---
opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml | 2 +-
opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters | 56 +++++++++++++++++++++++++++-----------------------------
2 files changed, 28 insertions(+), 30 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 4839ad1..9ef1f31 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,7 @@
CurrentTestPath={'group':'indexes','suite':'indexes'}
envAlreadyLoaded='true'
_setupSteps=['testGroup_Preamble','testSuite_Preamble','indexes_setup']
- _testSteps=['indexes_search','indexes_modify','indexes_add','indexes_delete']
+ _testSteps=['indexes_search','indexes_modify','indexes_add','indexes_remove']
_cleanupSteps=['indexes_cleanup','testSuite_Postamble','testGroup_Postamble']
</script>
<!---
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 fba2e87..49915ab 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/search.filters
@@ -2,15 +2,15 @@
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 equality uid=jwallace 0 INDEXED
+uid equality (uid=jwallace) 0 INDEXED
+uid equality (&(uid=jwallace)) 0 INDEXED
+uid equality (|(uid=jwallace)) 0 INDEXED
+uid equality (&(&(uid=jwallace))) 0 INDEXED
+uid equality (&(|(uid=jwallace))) 0 INDEXED
+uid equality (|(&(uid=jwallace))) 0 INDEXED
+uid equality (|(|(uid=jwallace))) 0 INDEXED
+uid equality (|(|(uid=jwallace))) 0 INDEXED
uid substring uid=j* 0 INDEXED
uid substring (uid=j*) 0 INDEXED
uid substring uid=*allace 0 NOT-INDEXED
@@ -52,8 +52,8 @@
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 equality sn=Bergin 0 INDEXED
+sn equality (sn=Bergin) 0 INDEXED
sn substring sn=Ber* 0 INDEXED
sn substring (sn=Ber*) 0 INDEXED
sn substring sn=*ergin 0 INDEXED
@@ -66,10 +66,8 @@
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 equality mail=kvaughan@example.com 0 INDEXED
+mail equality (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
@@ -88,20 +86,20 @@
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 equality givenName=kirsten 0 INDEXED
+givenName equality (givenName=kirsten) 0 INDEXED
+givenName equality givenName=Kirsten 0 INDEXED
+givenName equality (givenName=Kirsten) 0 INDEXED
+givenName equality givenname=kirsten 0 INDEXED
+givenName equality (givenname=kirsten) 0 INDEXED
+givenName equality givenname=KIRSTEN 0 INDEXED
+givenName equality (givenname=KIRSTEN) 0 INDEXED
+givenName equality GIVENNAME=kirsten 0 INDEXED
+givenName equality (GIVENNAME=kirsten) 0 INDEXED
+givenName equality GIVENNAME=KIRSTEN 0 INDEXED
+givenName equality (GIVENNAME=KIRSTEN) 0 INDEXED
+givenName equality gIvEnNaMe=kIrStEn 0 INDEXED
+givenName equality (gIvEnNaMe=kIrStEn) 0 INDEXED
givenName substring givenName=kirst* 0 INDEXED
givenName substring (givenName=kirst*) 0 INDEXED
givenName substring GivenName=kirst* 0 INDEXED
--
Gitblit v1.10.0