From fd2ac4bb2cc0c7f27aeb2b91d289f0c97b99a9ee Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 04 Jun 2007 17:16:37 +0000
Subject: [PATCH] Made some adjustments in the userattr inheritance ACI functional tests based on Issues 1600 and 1762.
---
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml | 88 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index f79f20e..b9896b2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -4346,6 +4346,24 @@
<tcstatus result="'fail'"/>
</if>
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
+ </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=Bind Type Tests,o=ACI Tests' }
+ </call>
+
+ <if expr="returnCode != '0'">
+ <tcstatus result="'fail'"/>
+ </if>
+
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, user searching in first child level'
</message>
@@ -4374,6 +4392,15 @@
<tcstatus result="'fail'"/>
</if>
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
+ </call>
+
+ <if expr="returnCode != '0'">
+ <tcstatus result="'fail'"/>
+ </if>
+
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, user searching in second child level'
</message>
@@ -4537,6 +4564,24 @@
<tcstatus result="'fail'"/>
</if>
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
+ </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=Bind Type Tests,o=ACI Tests' }
+ </call>
+
+ <if expr="returnCode != '0'">
+ <tcstatus result="'fail'"/>
+ </if>
+
<message>
'ACI: Bind Types: inheritance with bindtype, allow one child level, user searching in first child level'
</message>
@@ -4561,16 +4606,16 @@
'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
</call>
- <if expr="returnCode != '1'">
+ <if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
- <call function="'searchStringForSubstring'">
+ <call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
</call>
- <if expr="returnCode != '1'">
+ <if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
@@ -4736,6 +4781,24 @@
<tcstatus result="'fail'"/>
</if>
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString ,
+ 'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
+ </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=Bind Type Tests,o=ACI Tests' }
+ </call>
+
+ <if expr="returnCode != '1'">
+ <tcstatus result="'fail'"/>
+ </if>
+
<message>
'ACI: Bind Types: inheritance with bindtype, allow two child levels, user searching in first child level'
</message>
@@ -4760,16 +4823,16 @@
'testString' : 'dn: uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
</call>
- <if expr="returnCode != '1'">
+ <if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'cn:' }
+ 'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
</call>
- <if expr="returnCode != '1'">
+ <if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
@@ -4797,16 +4860,7 @@
'testString' : 'dn: uid=dmillertwo,uid=dmillerone,uid=dmiller,ou=People,ou=aci branch,o=Bind Type Tests,o=ACI Tests' }
</call>
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'cn:' }
- </call>
-
- <if expr="returnCode != '1'">
+ <if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
--
Gitblit v1.10.0