From b177583e592f00ab556bcd85f7eae301d51558b0 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 06 Apr 2007 19:17:44 +0000
Subject: [PATCH] Added some functional tests for Deletes that have many ACIs in the tree.
---
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif | 27 ++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif | 51 +++++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif | 27 ++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif | 44 ++++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif | 27 ++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif | 51 +++++
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif | 27 ++
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml | 275 ++++++++++++++++++++++++++-
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif | 41 ++++
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml | 16
10 files changed, 565 insertions(+), 21 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
index 34e0940..713635f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
@@ -434,6 +434,28 @@
title: sweeper
carlicense: ABC 123
+dn: uid=cfish, ou=People, ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+cn: Cat Fish
+sn: Fish
+givenname: Cat
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+ou: Product Development
+ou: People
+l: Santa Clara
+uid: cfish
+mail: cfish@example.com
+telephonenumber: +1 408 555 6067
+facsimiletelephonenumber: +1 408 555 0111
+roomnumber: 2511
+userpassword: oranges
+title: engineer
+title: architect
+title: sweeper
+carlicense: ABC 123
+
dn: ou=non-aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
objectclass: top
objectclass: organizationalunit
@@ -904,3 +926,25 @@
title: sweeper
carlicense: ABC 123
+dn: uid=cfish, ou=People, ou=non-aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+cn: Cat Fish
+sn: Fish
+givenname: Cat
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+ou: Product Development
+ou: People
+l: Santa Clara
+uid: cfish
+mail: cfish@example.com
+telephonenumber: +1 408 555 6067
+facsimiletelephonenumber: +1 408 555 0111
+roomnumber: 2511
+userpassword: oranges
+title: engineer
+title: architect
+title: sweeper
+carlicense: ABC 123
+
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
new file mode 100644
index 0000000..f83cf17
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
@@ -0,0 +1,51 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (targetattr="*")(targetfilter="(title=sweeper)")(version 3.0; acl "add_multi_aci4"; allow (delete) userdn="ldap:///all";)
+
+dn: o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (targetattr="*")(targetfilter="(title=sweeper)")(version 3.0; acl "add_multi_aci4"; deny (add,write) userdn="ldap:///all";)
+
+dn: dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com")(targetattr="*")(targetfilter="(title=sweeper)")(version 3.0; acl "add_multi_aci4"; deny (search,write) userdn="ldap:///all";)
+
+dn: o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com")(targetattr="*")(targattrfilters="add=l:(l=Paris),del=l:(|(l=San*)(l=Aus*)(l=Gren*))")(version 3.0; acl "add_multi_aci4"; deny (search,read) userdn="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com";)
+
+dn: dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///o=ACI Tests, dc=example,dc=com")(targetattr="*")(version 3.0; acl "add_multi_aci4"; deny (selfwrite) userdn="ldap:///all";)
+
+
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
new file mode 100644
index 0000000..e1bb628
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
@@ -0,0 +1,51 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (targetattr="*")(targetfilter="(title=sweeper)")(version 3.0; acl "add_multi_aci5"; allow (delete) userdn="ldap:///all";)
+
+dn: o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (targetattr="*")(version 3.0; acl "add_multi_aci5"; deny (delete) userdn="ldap:///uid=buser, ou=People, o=ACI Tests, dc=example,dc=com";)
+
+dn: dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com")(targetattr="*")(targetfilter="(title=sweeper)")(version 3.0; acl "add_multi_aci5"; deny (search,write) userdn="ldap:///all";)
+
+dn: o=ACI Tests, dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com")(targetattr="*")(targattrfilters="add=l:(l=Paris),del=l:(|(l=San*)(l=Aus*)(l=Gren*))")(version 3.0; acl "add_multi_aci5"; deny (search,read) userdn="ldap:///ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com";)
+
+dn: dc=example,dc=com
+changetype: modify
+add: aci
+aci: (target="ldap:///o=ACI Tests, dc=example,dc=com")(targetattr="*")(version 3.0; acl "add_multi_aci5"; deny (selfwrite) userdn="ldap:///all";)
+
+
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
new file mode 100644
index 0000000..c40738c
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
@@ -0,0 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: uid=tmorris, ou=People, ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: delete
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
new file mode 100644
index 0000000..c7517b7
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
@@ -0,0 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: uid=tmorris, ou=People, ou=non-aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: delete
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
new file mode 100644
index 0000000..44b090b
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
@@ -0,0 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: uid=cfish, ou=People, ou=aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: delete
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
new file mode 100644
index 0000000..8430cb9
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
@@ -0,0 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: uid=cfish, ou=People, ou=non-aci branch, o=Delete Tests, o=ACI Tests, dc=example,dc=com
+changetype: delete
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
new file mode 100644
index 0000000..13514b6
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
@@ -0,0 +1,41 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: ou=aci branch, o=Delete Tests,o=ACI Tests, dc=example,dc=com
+changetype: modify
+delete: aci
+
+dn: o=Delete Tests,o=ACI Tests, dc=example,dc=com
+changetype: modify
+delete: aci
+
+dn: o=ACI Tests, dc=example,dc=com
+changetype: modify
+delete: aci
+
+dn: dc=example,dc=com
+changetype: modify
+delete: aci
+
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index 215d36b..89b73ae 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -1406,7 +1406,7 @@
#@TestName Add Entry - Multi ACIs 1, overall deny
#@TestIssue 439
#@TestPurpose Add an entry against two ACIs with with overall deny
- #@TestPreamble Admin adds an aci to the dn of one existing branch.
+ #@TestPreamble Admin adds two acis.
#@TestStep Client adds an entry in the targeted branch.
#@TestStep Client adds an entry in the non-targeted branch.
#@TestStep Remove aci.
@@ -1521,7 +1521,7 @@
#@TestName Add Entry - Multi ACIs 2, overall allow
#@TestIssue 439
#@TestPurpose Add an entry against two ACIs with an overall allow
- #@TestPreamble Admin adds an aci to the dn of one existing branch.
+ #@TestPreamble Admin adds two acis.
#@TestStep Client adds an entry in the targeted branch.
#@TestStep Client adds an entry in the non-targeted branch.
#@TestStep Remove aci.
@@ -1637,7 +1637,7 @@
#@TestName Add Entry - Multi ACIs 3, mixed allow and deny
#@TestIssue 439
#@TestPurpose Add an entry against multiple ACIs where the allow or deny depends on specific userds
- #@TestPreamble Admin adds an aci to the dn of one existing branch.
+ #@TestPreamble Admin adds two acis.
#@TestStep Client adds an entry in the targeted branch.
#@TestStep Client adds an entry in the targeted branch by a prohibited user.
#@TestStep Client adds an entry in the non-targeted branch.
@@ -1767,10 +1767,10 @@
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
#@TestMarker ACI Add Entry Tests
- #@TestName Add Entry - Multi ACIs 4, overall allow
+ #@TestName Add Entry - Multi ACIs 4, overall allow with many ACIs
#@TestIssue 439
- #@TestPurpose Add an entry against two ACIs with an overall allow
- #@TestPreamble Admin adds an aci to the dn of one existing branch.
+ #@TestPurpose Add an entry against many ACIs with an overall allow
+ #@TestPreamble Admin adds many acis.
#@TestStep Client adds an entry in the targeted branch.
#@TestStep Client adds an entry in the non-targeted branch.
#@TestStep Remove aci.
@@ -1885,8 +1885,8 @@
#@TestMarker ACI Add Entry Tests
#@TestName Add Entry - Multi ACIs 5, mixed allow and deny with many ACIs
#@TestIssue 439
- #@TestPurpose Add an entry against multiple ACIs where the allow or deny depends on specific userds
- #@TestPreamble Admin adds an aci to the dn of one existing branch.
+ #@TestPurpose Add an entry against many ACIs where the allow or deny depends on specific userds
+ #@TestPreamble Admin adds many acis.
#@TestStep Client adds an entry in the targeted branch.
#@TestStep Client adds an entry in the targeted branch by a prohibited user.
#@TestStep Client adds an entry in the non-targeted branch.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index e0b6f84..46d26c1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -1208,7 +1208,7 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5.ldif' % STAGED_DATA_DIR }
</call>
- <if expr="RC != 0">
+ <if expr="RC != 50">
<tcstatus result="'fail'"/>
</if>
@@ -1400,7 +1400,7 @@
#@TestPostamble none
#@TestResult Success if OpenDS returns 0
for ACI add and delete operations,
- 0 for step 1, and
+ 0 for steps 1 and 2, and
50 for all other steps.
-->
<!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
@@ -1442,7 +1442,7 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2.ldif' % STAGED_DATA_DIR }
</call>
- <if expr="RC != 50">
+ <if expr="RC != 0">
<tcstatus result="'fail'"/>
</if>
@@ -1741,9 +1741,9 @@
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
#@TestMarker ACI Delete Entry Tests
- #@TestName Delete Entry - Multi ACIs 1
+ #@TestName Delete Entry - Multi ACIs 1, overall deny
#@TestIssue 442
- #@TestPurpose Test delete with 2 ACIs
+ #@TestPurpose Test delete with 2 ACIs, overall deny
#@TestPreamble Admin adds two acis.
#@TestStep Client deletes an entry with the targeted branch.
#@TestStep Client deletes an entry that is not with the targeted branch.
@@ -1756,7 +1756,7 @@
-->
<!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
<!-- cross reference to DS6 docs -->
- <testcase name="'ACI: Delete: Delete Entry - multi ACIs 1'">
+ <testcase name="'ACI: Delete: Delete Entry - multi ACIs 1, overall deny'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -1856,9 +1856,9 @@
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
#@TestMarker ACI Delete Entry Tests
- #@TestName Delete Entry - Multi ACIs 2
+ #@TestName Delete Entry - Multi ACIs 2, overall allow
#@TestIssue 442
- #@TestPurpose Test delete with 2 ACIs
+ #@TestPurpose Test delete with 2 ACIs, overall allow
#@TestPreamble Admin adds two acis.
#@TestStep Client deletes an entry with the targeted branch.
#@TestStep Client deletes an entry that is not with the targeted branch.
@@ -1872,7 +1872,7 @@
-->
<!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
<!-- cross reference to DS6 docs -->
- <testcase name="'ACI: Delete: Delete Entry - multi ACIs 2'">
+ <testcase name="'ACI: Delete: Delete Entry - multi ACIs 2, overall allow'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -1972,9 +1972,9 @@
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
#@TestMarker ACI Delete Entry Tests
- #@TestName Delete Entry - Multi ACIs 3
+ #@TestName Delete Entry - Multi ACIs 3, mixed allow and deny
#@TestIssue 442
- #@TestPurpose Test delete with 2 ACIs
+ #@TestPurpose Test delete with 2 ACIs, mixed allow and deny
#@TestPreamble Admin adds two acis.
#@TestStep Client deletes an entry with the targeted branch by a prohibited userdn.
#@TestStep Client deletes an entry with the targeted branch.
@@ -1989,7 +1989,7 @@
-->
<!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
<!-- cross reference to DS6 docs -->
- <testcase name="'ACI: Delete: Delete Entry - multi ACIs 3'">
+ <testcase name="'ACI: Delete: Delete Entry - multi ACIs 3, mixed allow and deny'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -2023,7 +2023,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 50">
@@ -2101,6 +2101,255 @@
</sequence>
</testcase>
+ <!---
+ Place test-specific test information here.
+ The tag, TestMarker, must be the same as the tag, TestSuiteName.
+ #@TestMarker ACI Delete Entry Tests
+ #@TestName Delete Entry - Multi ACIs 4, overall allow with many ACIs
+ #@TestIssue 442
+ #@TestPurpose Test delete with many ACIs, overall allow with many ACIs
+ #@TestPreamble Admin adds two acis.
+ #@TestStep Client deletes an entry with the targeted branch.
+ #@TestStep Client deletes an entry that is not with the targeted branch.
+ #@TestStep Remove aci.
+ #@TestStep Client deletes an entry with the previously targeted branch.
+ #@TestPostamble none
+ #@TestResult Success if OpenDS returns 0
+ for ACI add and delete operations,
+ 0 for step 1, and
+ 50 for all other steps.
+ -->
+ <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
+ <!-- cross reference to DS6 docs -->
+ <testcase name="'ACI: Delete: Delete Entry - multi ACIs 4, overall allow with many ACIs'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis4.ldif' % LOCAL_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 4, preamble adding aci,\n %s' % curr_aci
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry from targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry from non-targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4a.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 50">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 4, admin deleting aci'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry in previously targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 50 }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <!---
+ Place test-specific test information here.
+ The tag, TestMarker, must be the same as the tag, TestSuiteName.
+ #@TestMarker ACI Delete Entry Tests
+ #@TestName Delete Entry - Multi ACIs 5, mixed allow and deny with many ACIs
+ #@TestIssue 442
+ #@TestPurpose Test delete with many ACIs, mixed allow and deny with many ACIs
+ #@TestPreamble Admin adds many acis, mixed allow and deny with many ACIs.
+ #@TestStep Client deletes an entry with the targeted branch by a prohibited userdn.
+ #@TestStep Client deletes an entry with the targeted branch.
+ #@TestStep Client deletes an entry that is not with the targeted branch.
+ #@TestStep Remove aci.
+ #@TestStep Client deletes an entry with the previously targeted branch.
+ #@TestPostamble none
+ #@TestResult Success if OpenDS returns 0
+ for ACI add and delete operations,
+ 0 for step 2, and
+ 50 for all other steps.
+ -->
+ <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
+ <!-- cross reference to DS6 docs -->
+ <testcase name="'ACI: Delete: Delete Entry - multi ACIs 5, mixed allow and deny with many ACIs'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis5.ldif' % LOCAL_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, preamble adding aci,\n %s' % curr_aci
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from targeted branch by a prohibited userdn'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 50">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from non-targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5a.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 50">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, admin deleting aci'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry in previously targeted branch'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ACIRules' ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 50 }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
<!---
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
--
Gitblit v1.10.0