From 1c210742db7c92f03cbff717cec4d434344c6871 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 20 Aug 2007 21:21:30 +0000
Subject: [PATCH] Refactored four more aci test suites to account for the new parameter, expectedResult, in the searchStringForSubstring function.
---
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 21
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml | 93 +---
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 696 +++++++++++---------------------------
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml | 231 +++---------
4 files changed, 299 insertions(+), 742 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 5ac5df6..31539df 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -160,13 +160,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals all, user comparing attribute in non-targeted branch'
</message>
@@ -284,13 +281,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a dn, user comparing attribute in non-targeted branch'
</message>
@@ -549,13 +543,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a branch dn, user comparing attribute in targeted branch'
</message>
@@ -575,14 +566,11 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'ACI: Compare: Compare Attr - userdn not equals a branch dn, user comparing attribute in non-targeted branch'
</message>
@@ -699,13 +687,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals two dns, user comparing attribute in targeted branch'
</message>
@@ -725,13 +710,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals two dns, user comparing attribute in non-targeted branch'
</message>
@@ -1084,13 +1066,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattr with one attribute, user comparing prohibited attribute in targeted branch'
</message>
@@ -1223,13 +1202,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetfilter with one statement, user comparing prohibited attribute in targeted branch'
</message>
@@ -1362,13 +1338,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, user comparing prohibited attribute in targeted branch'
</message>
@@ -1388,13 +1361,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'false' }
+ 'testString' : 'false' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, user comparing attribute in non-targeted branch'
</message>
@@ -1512,13 +1482,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false, user comparing prohibited attribute in targeted branch'
</message>
@@ -1538,13 +1505,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'false' }
+ 'testString' : 'false' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false, user comparing attribute in non-targeted branch'
</message>
@@ -1754,13 +1718,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'true' }
+ 'testString' : 'true' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'true'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 2, overall allow, admin deleting aci'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index 2dd1c49..8c971df 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -111,13 +111,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=gfarmer,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=gfarmer,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Preamble - user searching entry that will be non-targeted in future tests'
</message>
@@ -1644,13 +1641,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=gfarmer,ou=People,ou=aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=gfarmer,ou=People,ou=aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Postamble - user searching entry that will be non-targeted in future tests'
</message>
@@ -1671,13 +1665,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=gfarmer,ou=People,ou=non-aci branch,o=ACI Tests' }
+ 'testString' : 'dn: uid=gfarmer,ou=People,ou=non-aci branch,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Resetting Search Global ACI'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
index 05aea15..6dc5ff7 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -178,40 +178,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <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: Targetscope: base, user searching in first child level'
</message>
@@ -233,22 +221,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: base, user searching in second child level'
</message>
@@ -270,13 +252,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: base, admin deleting aci'
</message>
@@ -386,40 +365,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <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: Targetscope: onelevel, user searching in first child level'
</message>
@@ -441,31 +408,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <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: Targetscope: onelevel, user searching in second child level'
</message>
@@ -487,13 +445,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: onelevel, admin deleting aci'
</message>
@@ -603,40 +558,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subtree, user searching in first child level'
</message>
@@ -658,31 +601,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subtree, user searching in second child level'
</message>
@@ -704,22 +638,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subtree, admin deleting aci'
</message>
@@ -829,40 +757,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subordinate, user searching in first child level'
</message>
@@ -884,31 +800,22 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subordinate, user searching in second child level'
</message>
@@ -930,22 +837,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Targetscope Tests,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: Targetscope: subordinate, admin deleting aci'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index 90e91ed..8d315fd 100644
--- a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -128,13 +128,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Preamble - user searching entry that will be non-targeted in future tests'
</message>
@@ -230,40 +227,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-one entry, user searching second entry'
</message>
@@ -284,13 +269,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -311,13 +293,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, one true, admin deleting aci'
</message>
@@ -428,40 +407,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching second entry'
</message>
@@ -482,40 +449,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 1, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -536,13 +491,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, one true, admin deleting aci'
</message>
@@ -653,40 +605,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 2, user searching second entry'
</message>
@@ -707,40 +647,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 2, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -761,13 +689,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, one true, admin deleting aci'
</message>
@@ -878,40 +803,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 3, user searching second entry'
</message>
@@ -932,40 +845,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ '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>
-
<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' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, one true, user searching second entry outside of the scope of the aci'
</message>
@@ -986,13 +887,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, one true, admin deleting aci'
</message>
@@ -1102,13 +1000,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny, user searching second entry'
</message>
@@ -1129,13 +1024,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1156,13 +1048,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny, admin deleting aci'
</message>
@@ -1272,13 +1161,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny, user searching second entry'
</message>
@@ -1299,13 +1185,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1326,13 +1209,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny, one true, admin deleting aci'
</message>
@@ -1442,13 +1322,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny, user searching second entry'
</message>
@@ -1469,13 +1346,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1496,13 +1370,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny, one true, admin deleting aci'
</message>
@@ -1613,40 +1484,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny, user searching second entry'
</message>
@@ -1667,13 +1526,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny, user searching second entry outside of the scope of the aci'
</message>
@@ -1694,13 +1550,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny, admin deleting aci'
</message>
@@ -1811,40 +1664,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching second entry'
</message>
@@ -1865,40 +1706,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters, one aci-two entries 1, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -1919,13 +1748,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, one true, admin deleting aci'
</message>
@@ -2036,40 +1862,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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' : '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: Multiple ACIs: Different targetfilters and targeattr, deny one attr, user searching second entry'
</message>
@@ -2090,40 +1904,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,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' : '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: Multiple ACIs: Different targetfilters and targeattr, deny one attr, one true, user searching non-targeted entry outside of the scope of the aci'
</message>
@@ -2144,13 +1946,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targeattr, deny one attr, one true, admin deleting aci'
</message>
@@ -2261,40 +2060,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters and targetattr with not equals, user searching second entry'
</message>
@@ -2315,34 +2102,26 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ '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>
-
<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' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
<if expr="returnCode != '0'">
@@ -2369,13 +2148,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '1' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr with not equals, admin deleting aci'
</message>
@@ -2486,22 +2262,16 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with missing read, user searching second entry'
</message>
@@ -2522,40 +2292,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ '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>
-
<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' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read missing read, user searching second entry outside of the scope of the aci'
</message>
@@ -2576,13 +2334,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read missing read, admin deleting aci'
</message>
@@ -2693,40 +2448,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,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: Multiple ACIs: Different targetfilters and targetattr, separate search-read, user searching second entry'
</message>
@@ -2747,40 +2490,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ '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>
-
<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' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read, user searching second entry outside of the scope of the aci'
</message>
@@ -2801,13 +2532,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read, admin deleting aci'
</message>
@@ -2918,13 +2646,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search, user searching second entry'
</message>
@@ -2945,40 +2670,28 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=scarter,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ '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>
-
<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' : 'roomnumber:' }
+ 'testString' : 'roomnumber:' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search, user searching second entry outside of the scope of the aci'
</message>
@@ -2999,13 +2712,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search, admin deleting aci'
</message>
@@ -4255,13 +3965,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Postamble - user searching entry that was non-targeted'
</message>
@@ -4282,13 +3989,10 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' }
+ 'testString' : 'dn: uid=dmiller,ou=People,ou=non-aci branch,o=Search Tests,o=ACI Tests' ,
+ 'expectedResult' : '0' }
</call>
- <if expr="returnCode != '0'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Postamble - delete branch, o=Search Tests'
</message>
--
Gitblit v1.10.0