From 565ef981a7f48a8564a28d02f7d8b2a5edea4fbe Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 01 Jun 2007 14:16:36 +0000
Subject: [PATCH] Finished cleanup on Issue 1620. See also revision 1982 from Development for fix for Issue 1620.
---
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
index 8b9f6ca..c2f99be 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -126,8 +126,8 @@
#@TestIssue 87
#@TestPurpose Test effective rights with read permission
#@TestPreamble Admin adds an aci.
- #@TestStep Client searches for effective rights in an entry in the targeted branch dn.
- #@TestStep Client searches for effective rights in an entry in the non-targeted branch dn.
+ #@TestStep Admin searches for effective rights in an entry in the targeted branch dn.
+ #@TestStep Admin searches for effective rights in an entry in the non-targeted branch dn.
#@TestStep Remove aci.
#@TestStep Client searches for effective rights in an entry with the previously targeted branch dn.
#@TestPostamble none
@@ -187,7 +187,7 @@
<if expr="returnCode != '1'">
<tcstatus result="'fail'"/>
</if>
-<!-- Uncomment when Issue 1620 is fixed
+
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
'testString' : 'attributeLevel;uid: search:0,read:1,compare:0,write:0,selfwrite_add:0,selfwrite_delete:0,proxy:0' }
@@ -205,7 +205,7 @@
<if expr="returnCode != '1'">
<tcstatus result="'fail'"/>
</if>
--->
+
<message>
'ACI: Effective Rights: Basic - read, user searching non-targeted entry'
</message>
@@ -213,8 +213,8 @@
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'ACIRules' ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=scarter,ou=People,ou=non-aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'attributes' : 'aclRights' ,
@@ -230,7 +230,7 @@
'testString' : 'uid=scarter,ou=People,ou=non-aci branch,o=ACI Tests,dc=example,dc=com' }
</call>
- <if expr="returnCode != '0'">
+ <if expr="returnCode != '1'">
<tcstatus result="'fail'"/>
</if>
@@ -1742,13 +1742,13 @@
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
- 'testString' : 'entryLevel: add:0,delete:0,read:1,write:1,proxy:0' }
+ 'testString' : 'entryLevel: add:0,delete:0,read:1,write:0,proxy:0' }
</call>
<if expr="returnCode != '1'">
<tcstatus result="'fail'"/>
</if>
-<!-- Uncomment when Issue 1620 is fixed
+
<call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
'testString' : 'attributeLevel;uid: search:1,read:1,compare:0,write:0,selfwrite_add:1,selfwrite_delete:1,proxy:0' }
@@ -1766,7 +1766,7 @@
<if expr="returnCode != '1'">
<tcstatus result="'fail'"/>
</if>
--->
+
<message>
'ACI: Effective Rights: Basic - selfwrite, user searching non-targeted entry'
</message>
--
Gitblit v1.10.0