From bcc1cff8250e7a843622f413676bb77c66a8ef38 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 17 Aug 2007 19:08:29 +0000
Subject: [PATCH] Refactored four of the aci test suites to account for the new parameter, expectedResult, in the searchStringForSubstring function.
---
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 553 ++++++---------------
opends/tests/functional-tests/testcases/aci/global_acis.xml | 203 ++-----
opends/tests/functional-tests/testcases/aci/aci_target.xml | 474 +++++-------------
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 224 ++------
4 files changed, 420 insertions(+), 1,034 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 782884c..246cd4a 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -112,13 +112,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Preamble - existing branch, user searching entry that will be non-targeted in future tests'
</message>
@@ -212,13 +209,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, user searching non-targeted entry'
</message>
@@ -239,13 +233,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, admin deleting aci'
</message>
@@ -354,13 +345,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=new aci branch,o=More Branches,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=new aci branch,o=More Branches,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN - new branch, user searching non-targeted entry'
</message>
@@ -380,13 +368,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=new non-aci branch,o=More Branches,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=new non-aci branch,o=More Branches,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN - new branch, admin deleting aci'
</message>
@@ -422,13 +407,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=new aci branch,o=More Branches,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=new aci branch,o=More Branches,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN - new branch, postamble admin deleting new entries'
</message>
@@ -516,13 +498,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with trailing wildcard, user searching non-targeted entry'
</message>
@@ -543,13 +522,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with trailing wildcard, admin deleting aci'
</message>
@@ -658,13 +634,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with leading wildcard, user searching non-targeted entry'
</message>
@@ -685,13 +658,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with leading wildcard, admin deleting aci'
</message>
@@ -800,13 +770,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with internal wildcard, user searching non-targeted entry'
</message>
@@ -827,13 +794,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with internal wildcard, admin deleting aci'
</message>
@@ -942,13 +906,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with multiple wildcards, user searching non-targeted entry'
</message>
@@ -969,13 +930,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with multiple wildcards, admin deleting aci'
</message>
@@ -1218,13 +1176,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN Below Entry, user searching non-targeted entry'
</message>
@@ -1245,13 +1200,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN Below Entry, admin deleting aci'
</message>
@@ -1711,22 +1663,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid: scarter' }
+ 'testString' : 'uid: scarter' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci2="(targetattr=\"*\")(version 3.0; acl \"add_aci15\"; deny (search,read) userdn=\"ldap:///all\";)"
</script>
@@ -1770,13 +1716,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target enable and disable ACIs, disable ACIs'
</message>
@@ -1816,22 +1759,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid: scarter' }
+ 'testString' : 'uid: scarter' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target enable and disable ACIs, enable ACIs'
</message>
@@ -1871,13 +1808,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, admin deleting aci'
</message>
@@ -1986,13 +1920,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target enable and disable global ACIs, disable ACIs'
</message>
@@ -2032,22 +1963,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid: scarter' }
+ 'testString' : 'uid: scarter' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target enable and disable global ACIs, enable ACIs'
</message>
@@ -2160,13 +2085,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals all, user searching targeted entry as anonymous user'
</message>
@@ -2185,13 +2107,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals all, admin deleting aci'
</message>
@@ -2300,13 +2219,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals anyone, user searching targeted entry as anonymous user'
</message>
@@ -2325,13 +2241,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals anyone, admin deleting aci'
</message>
@@ -2440,13 +2353,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn not equals all, user searching targeted entry as anonymous user'
</message>
@@ -2465,13 +2375,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn not equals all, admin deleting aci'
</message>
@@ -2580,13 +2487,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self, user searching targeted entry as self'
</message>
@@ -2607,13 +2511,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self, admin deleting aci'
</message>
@@ -2722,13 +2623,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard, user searching targeted entry as self'
</message>
@@ -2749,13 +2647,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard, admin deleting aci'
</message>
@@ -2864,13 +2759,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, user searching targeted entry as self'
</message>
@@ -2891,13 +2783,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, admin deleting aci'
</message>
@@ -3006,13 +2895,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, deny, user searching targeted entry as self'
</message>
@@ -3033,13 +2919,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, deny, admin deleting aci'
</message>
@@ -3144,13 +3027,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, allow and deny, user searching targeted entry as self'
</message>
@@ -3171,13 +3051,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, allow and deny, admin deleting aci'
</message>
@@ -3431,7 +3308,20 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'creatorsName:' }
+ 'testString' : 'creatorsName:' ,
+ 'expectedResult' : '0' }
+ </call>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'createTimestamp:' ,
+ 'expectedResult' : '0' }
+ </call>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'entryDN:' ,
+ 'expectedResult' : '0' }
</call>
<if expr="returnCode != '0'">
@@ -3440,58 +3330,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'createTimestamp:' }
+ 'testString' : 'modifiersName:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'entryDN:' }
+ 'testString' : 'modifyTimestamp' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifiersName:' }
+ 'testString' : 'subschemaSubentry:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifyTimestamp' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'subschemaSubentry:' }
- </call>
-
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
- </call>
-
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, user searching targeted entry'
</message>
@@ -3512,31 +3372,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'creatorsName:' }
+ 'testString' : 'creatorsName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifiersName:' }
+ 'testString' : 'modifiersName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, user searching targeted entry'
</message>
@@ -3557,67 +3408,46 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'creatorsName:' }
+ 'testString' : 'creatorsName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'createTimestamp:' }
+ 'testString' : 'createTimestamp:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'entryDN:' }
+ 'testString' : 'entryDN:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifiersName:' }
+ 'testString' : 'modifiersName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifyTimestamp' }
+ 'testString' : 'modifyTimestamp' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'subschemaSubentry:' }
+ 'testString' : 'subschemaSubentry:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, admin modifying entry'
</message>
@@ -3720,22 +3550,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=acarter' }
+ 'testString' : 'dn: uid=acarter' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with comma, user searching non-targeted entry'
</message>
@@ -3756,22 +3580,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=acarter' }
+ 'testString' : 'dn: uid=acarter' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with comma, admin deleting aci'
</message>
@@ -3880,13 +3698,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, default targetattr, user searching non-targeted entry'
</message>
@@ -3907,13 +3722,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, default targetattr, admin deleting aci'
</message>
@@ -3999,13 +3811,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Postamble - existing branch, user searching entry that was non-targeted in past tests'
</message>
@@ -4026,13 +3835,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Resetting Search Global ACI'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 457ed24..e4b35bb 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -109,13 +109,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Preamble - existing branch, user searching entry that will be non-targeted in future tests'
</message>
@@ -209,31 +206,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals One Attribute, user searching non-targeted entry but with targeted attribute'
</message>
@@ -254,13 +242,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals One Attribute, admin deleting aci'
</message>
@@ -370,31 +355,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals One Attribute, user searching non-targeted entry but with targeted attribute'
</message>
@@ -415,13 +391,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals One Attribute, admin deleting aci'
</message>
@@ -531,49 +504,34 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'sn:' }
+ 'testString' : 'sn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid:' }
+ 'testString' : 'uid:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals Three Attributes, user searching non-targeted entry but with targeted attributes'
</message>
@@ -594,13 +552,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals Three Attributes, admin deleting aci'
</message>
@@ -711,49 +666,34 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'sn:' }
+ 'testString' : 'sn:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid:' }
+ 'testString' : 'uid:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals Three Attributes, user searching non-targeted entry but with targeted attributes'
</message>
@@ -774,13 +714,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals Three Attributes, admin deleting aci'
</message>
@@ -886,22 +823,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Bad Targetattr, user searching non-targeted entry but with targeted attribute'
</message>
@@ -922,13 +853,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Bad Targetattr, admin deleting aci'
</message>
@@ -1229,31 +1157,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr With Spaces, user searching non-targeted entry but with targeted attribute'
</message>
@@ -1274,13 +1193,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr With Spaces, admin deleting aci'
</message>
@@ -1387,13 +1303,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Targetattr Not Equals Wildcard, user searching non-targeted entry'
</message>
@@ -1414,13 +1327,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Targetattr Not Equals Wildcard, admin deleting aci'
</message>
@@ -1546,13 +1456,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Postamble - existing branch, user searching entry that will be non-targeted in future tests'
</message>
@@ -1573,13 +1480,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Postamble - Resetting Search Global ACI'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 2acba6e..659a169 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -109,13 +109,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Preamble - user searching entry that will be non-targeted in future tests'
</message>
@@ -210,40 +207,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, user searching non-targeted entry'
</message>
@@ -264,13 +249,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -291,13 +273,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, admin deleting aci'
</message>
@@ -409,40 +388,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, user searching non-targeted entry'
</message>
@@ -463,13 +430,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 2, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -490,13 +454,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 2, admin deleting aci'
</message>
@@ -605,40 +566,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 3, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -658,13 +607,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 3, admin deleting aci'
</message>
@@ -774,13 +720,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals One Statement, user searching non-targeted entry in ACI branch'
</message>
@@ -801,40 +744,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals One Statement, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -855,13 +786,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals One Statement, admin deleting aci'
</message>
@@ -972,40 +900,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, user searching non-targeted entry'
</message>
@@ -1026,13 +942,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1053,13 +966,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, admin deleting aci'
</message>
@@ -1170,13 +1080,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, user searching non-targeted entry'
</message>
@@ -1197,40 +1104,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1251,13 +1146,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, admin deleting aci'
</message>
@@ -1366,13 +1258,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1393,13 +1282,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, admin deleting aci'
</message>
@@ -1509,13 +1395,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1536,13 +1419,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, admin deleting aci'
</message>
@@ -1653,40 +1533,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, user searching non-targeted entry'
</message>
@@ -1707,13 +1575,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1734,13 +1599,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, admin deleting aci'
</message>
@@ -1851,13 +1713,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, user searching non-targeted entry'
</message>
@@ -1878,40 +1737,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1932,13 +1779,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, admin deleting aci'
</message>
@@ -2049,40 +1893,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, user searching non-targeted entry'
</message>
@@ -2103,13 +1935,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -2130,13 +1959,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, admin deleting aci'
</message>
@@ -2247,40 +2073,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, user searching non-targeted entry'
</message>
@@ -2301,13 +2115,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -2328,13 +2139,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, admin deleting aci'
</message>
@@ -2445,40 +2253,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, user searching non-targeted entry'
</message>
@@ -2499,13 +2295,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -2526,13 +2319,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, admin deleting aci'
</message>
@@ -2643,40 +2433,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'cn:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'telephonenumber:' }
+ 'testString' : 'telephonenumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, user searching non-targeted entry'
</message>
@@ -2697,13 +2475,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -2724,13 +2499,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, admin deleting aci'
</message>
@@ -2838,13 +2610,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Extra Spaces, admin deleting aci'
</message>
@@ -3195,13 +2964,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Postamble - user searching entry that was non-targeted'
</message>
@@ -3222,13 +2988,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Postamble - Resetting Search Global ACI'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/global_acis.xml b/opends/tests/functional-tests/testcases/aci/global_acis.xml
index 92772fc..d182e24 100755
--- a/opends/tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -98,22 +98,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'sn' }
+ 'testString' : 'sn' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'userpassword' }
+ 'testString' : 'userpassword' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
@@ -162,13 +156,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'creatorsName' }
+ 'testString' : 'creatorsName' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
@@ -233,58 +224,40 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'creatorsName:' }
+ 'testString' : 'creatorsName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'createTimestamp:' }
+ 'testString' : 'createTimestamp:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'entryDN:' }
+ 'testString' : 'entryDN:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifiersName:' }
+ 'testString' : 'modifiersName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'modifyTimestamp' }
+ 'testString' : 'modifyTimestamp' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'subschemaSubentry:' }
+ 'testString' : 'subschemaSubentry:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
@@ -334,13 +307,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'matchingRules:' }
+ 'testString' : 'matchingRules:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: cn=schema' }
@@ -390,58 +360,40 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'attributeTypes:' }
+ 'testString' : 'attributeTypes:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dITStructureRules:' }
+ 'testString' : 'dITStructureRules:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'ldapSyntaxes:' }
+ 'testString' : 'ldapSyntaxes:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'matchingRules:' }
+ 'testString' : 'matchingRules:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'nameForms:' }
+ 'testString' : 'nameForms:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'objectClasses:' }
+ 'testString' : 'objectClasses:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: cn=schema' }
@@ -491,13 +443,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'vendorName:' }
+ 'testString' : 'vendorName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: ' }
@@ -547,76 +496,52 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'namingContexts:' }
+ 'testString' : 'namingContexts:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'supportedAuthPasswordSchemes:' }
+ 'testString' : 'supportedAuthPasswordSchemes:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'supportedControl:' }
+ 'testString' : 'supportedControl:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'supportedExtension:' }
+ 'testString' : 'supportedExtension:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'supportedFeatures:' }
+ 'testString' : 'supportedFeatures:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'supportedSASLMechanisms:' }
+ 'testString' : 'supportedSASLMechanisms:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'vendorName:' }
+ 'testString' : 'vendorName:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'vendorVersion:' }
+ 'testString' : 'vendorVersion:' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: ' }
@@ -701,22 +626,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'sn' }
+ 'testString' : 'sn' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid' }
+ 'testString' : 'uid' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=ACI Tests' }
@@ -765,22 +684,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'sn' }
+ 'testString' : 'sn' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'uid' }
+ 'testString' : 'uid' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'checktestString'">
{ 'returnString' : returnString ,
'expectedString' : 'dn: uid=tmorris,ou=People,ou=aci branch,o=ACI Tests' }
--
Gitblit v1.10.0