external-software/github_OpenIdentityPlatform_OpenDJ.git

parent: 1ed2743f | patch | commit | show whitespace

Adding functional tests for an exhaustive combination of targetattr and tar...

mkeyes

17.18.2007 e9754921b3266a1aaafa852e5495eb9a42768439

Adding functional tests for an exhaustive combination of targetattr and targattfilters possible outcomes with the ACI support for the modify operation, Issue 444.

49 files added

1 files modified

	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif	260 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif	30 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif	27 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif	29 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif	28 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif	28 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml	532 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml	279 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml	279 ●●●●● patch \| view \| raw \| blame \| history

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif

New file
@@ -0,0 +1,260 @@
# 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: o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
o: ACI Tests
objectclass: top
objectclass: organization

dn: ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
objectclass: top
objectclass: organizationalunit
ou: aci branch

dn: ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
objectclass: top
objectclass: organizationalunit
ou: People

dn: uid=duser1, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User1
sn: User1
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Accounting
ou: People
l: Sunnyvale
uid: duser1
mail: duser1@example.com
telephonenumber: +1 408 555 4798
facsimiletelephonenumber: +1 408 555 9751
roomnumber: 4612
userpassword: sprain
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser2, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User2
sn: User2
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Accounting
ou: People
l: Sunnyvale
uid: duser2
mail: duser2@example.com
telephonenumber: +1 408 555 9187
facsimiletelephonenumber: +1 408 555 8473
roomnumber: 4117
userpassword: irrefutable
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser3, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User3
sn: User3
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Human Resources
ou: People
l: Sunnyvale
uid: duser3
mail: duser3@example.com
telephonenumber: +1 408 555 5625
facsimiletelephonenumber: +1 408 555 3372
roomnumber: 2871
userpassword: bribery
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser4, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User4
sn: User4
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Product Testing
ou: People
l: Sunnyvale
uid: duser4
mail: duser4@example.com
telephonenumber: +1 408 555 8585
facsimiletelephonenumber: +1 408 555 7472
roomnumber: 3472
userpassword: inflict
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser5, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User5
sn: User5
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Accounting
ou: People
l: Sunnyvale
uid: duser5
mail: duser5@example.com
telephonenumber: +1 408 555 9423
facsimiletelephonenumber: +1 408 555 0111
roomnumber: 4135
userpassword: gosling
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser6, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User6
sn: User6
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Accounting
ou: People
l: Sunnyvale
uid: duser6
mail: duser6@example.com
telephonenumber: +1 408 555 6201
facsimiletelephonenumber: +1 408 555 8473
roomnumber: 1269
userpassword: ruling
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser7, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User7
sn: User7
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Product Development
ou: People
l: Sunnyvale
uid: duser7
mail: duser7@example.com
telephonenumber: +1 408 555 9069
facsimiletelephonenumber: +1 408 555 1992
roomnumber: 4178
userpassword: forsook
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser8, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User8
sn: User8
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Human Resources
ou: People
l: Sunnyvale
uid: duser8
mail: duser8@example.com
telephonenumber: +1 408 555 1296
facsimiletelephonenumber: +1 408 555 1992
roomnumber: 0194
userpassword: apples
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser9, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User9
sn: User9
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Product Testing
ou: People
l: Sunnyvale
uid: duser9
mail: duser9@example.com
telephonenumber: +1 408 555 1122
facsimiletelephonenumber: +1 408 555 8721
roomnumber: 2942
userpassword: destroy
title: engineer
title: architect
title: sweeper
carlicense: ABC 123

dn: uid=duser0, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
cn: Dir User0
sn: User0
givenname: Dir
objectclass: top
objectclass: person
objectclass: organizationalPerson
objectclass: inetOrgPerson
ou: Human Resources
ou: People
l: Sunnyvale
uid: duser0
mail: duser0@example.com
telephonenumber: +1 408 555 1596
facsimiletelephonenumber: +1 408 555 9751
roomnumber: 1124
userpassword: squatted
title: engineer
title: architect
title: sweeper
carlicense: ABC 123


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(l=Sunny*),del=l:(l=Sunny*)")(version 3.0; acl "add_aci1"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(l=Sunny*),del=l:(l=Sunny*)")(version 3.0; acl "add_aci11"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci12"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(!(l=Anything*)),del=l:(!(l=Anything*))")(version 3.0; acl "add_aci13"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(l=Anything*),del=l:(l=Anything*)")(version 3.0; acl "add_aci4"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(l=Sunny*)")(version 3.0; acl "add_aci5"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="l")(targattrfilters="add=l:(l=Sunny*),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci6"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci2"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(l=Sunny*),del=l:(l=Sunny*)")(version 3.0; acl "add_aci11"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci12"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(!(l=Anything*)),del=l:(!(l=Anything*))")(version 3.0; acl "add_aci13"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(l=Anything*),del=l:(l=Anything*)")(version 3.0; acl "add_aci4"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(l=Sunny*)")(version 3.0; acl "add_aci5"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="carlicense")(targattrfilters="add=l:(l=Sunny*),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci6"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(!(l=Anything*)),del=l:(!(l=Anything*))")(version 3.0; acl "add_aci2"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(l=Anything*),del=l:(l=Anything*)")(version 3.0; acl "add_aci4"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(!(l=Sunny*)),del=l:(l=Sunny*)")(version 3.0; acl "add_aci5"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif

New file
@@ -0,0 +1,30 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(targattrfilters="add=l:(l=Sunny*),del=l:(!(l=Sunny*))")(version 3.0; acl "add_aci6"; allow (all) userdn="ldap:///all";)


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif

New file
@@ -0,0 +1,29 @@
# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
delete: aci


 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif

New file
@@ -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=duser0, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: delete

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser1, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
replace: l
l: Sunnyfield

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser2, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
replace: l
l: Austin

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser3, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
replace: carlicense
carlicense: XYZ 789

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser4, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: l
l: Sunnyfield

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser5, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: l
l: Austin

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser6, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
add: carlicense
carlicense: XYZ 789

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif

New file
@@ -0,0 +1,29 @@
# 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=duser7, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
delete: l
l: Sunnyvale

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif

New file
@@ -0,0 +1,28 @@
# 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=duser8, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
delete: l

 opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif

New file
@@ -0,0 +1,28 @@
# 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=duser9, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
changetype: modify
delete: carlicense

 opends/tests/functional-tests/testcases/aci/aci.xml

@@ -97,6 +97,10 @@
          <call function="'aci_modify_entry'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
          <call function="'aci_teardown'" />
  

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml

New file
@@ -0,0 +1,532 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests"/>

  <function name="aci_modify_filter_tests">

    <sequence>

      <block name="'aci-modify-filter-tests'">
      
        <sequence>
  
          <script>
            CurrentTestPath['group']='security'
          </script>
        
          <call function="'testGroup_Preamble'"/>
     
          <!---
                Place suite-specific test information here.
                #@TestSuiteName             ACI Modify Filter Tests
                #@TestSuitePurpose          Test the ACI Support for combinations of targetattr and targattrfilters for modify operations.  
                #@TestSuiteGroup            ACI Modify Filter Tests
                #@TestScript                aci_modify_filter_test.xml
          -->
    
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 1 - targetattr equals wildcard, targattrfilters equal add and del
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci1.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci1'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 2 - targetattr equals wildcard, targattrfilters equal add and del both with not equal [filter]
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci2.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci2'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 3 - targetattr equals wildcard, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci3.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci3'" />

          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 4 - targetattr equals wildcard, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci4.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci4'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 5 - targetattr equals wildcard, targattrfilters equal add and del, add with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci5.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci5'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 6 - targetattr equals wildcard, targattrfilters equal add and del, del with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci6.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci6'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 11 - targetattr equals l, targattrfilters equal add and del
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci11.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci11'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 12 - targetattr equals l, targattrfilters equal add and del both with not equal [filter]
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci12.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci12'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 13 - targetattr equals l, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci13.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci13'" />

          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 14 - targetattr equals l, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci14.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci14'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 15 - targetattr equals l, targattrfilters equal add and del, add with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci15.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci15'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 16 - targetattr equals l, targattrfilters equal add and del, del with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci16.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci16'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 21 - targetattr equals carlicense, targattrfilters equal add and del
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci21.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci21'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 22 - targetattr equals carlicense, targattrfilters equal add and del both with not equal [filter]
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci22.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci22'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 23 - targetattr equals carlicense, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci23.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci23'" />

          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 24 - targetattr equals carlicense, targattrfilters equal add and del, both with not equal [filter] and no match
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci24.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci24'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 25 - targetattr equals carlicense, targattrfilters equal add and del, add with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci25.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci25'" />
  
          <!---
                Place test-specific test information here.
                The tag, TestMarker, must be the same as the tag, TestSuiteName.
                #@TestMarker                ACI Modify Filter Tests
                #@TestName                  ACI 26 - targetattr equals carlicense, targattrfilters equal add and del, del with not equal [filter] 
                #@TestIssue                 444
                #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
                #@TestPreamble              Directory Manager adds ACI and adds entries to test
                #@TestStep                  For entry 0, delete entire entry
                #@TestStep                  For entry 1, replace attribute l with Sunnyfield
                #@TestStep                  For entry 2, replace attribute l with Austin
                #@TestStep                  For entry 3, replace attribute carlicense with new value
                #@TestStep                  For entry 4, add attribute l with Sunnyfield
                #@TestStep                  For entry 5, add attribute l with Austin
                #@TestStep                  For entry 6, add attribute carlicense with new value
                #@TestStep                  For entry 7, delete attribute l with Sunnyvale
                #@TestStep                  For entry 8, delete attribute l
                #@TestStep                  For entry 9, delete attribute carlicense
                #@TestPostamble             Directory Manager removes ACI and removes entries that were tested
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci26.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci26'" />
  
          <call function="'testGroup_Postamble'"/>
        
        </sequence>
      
      </block>
      
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci1"/>

  <function name="aci_modify_filter_tests_aci1">

    <sequence>

      <block name="'aci-modify-filter-tests-aci1'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 1'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 1 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci1.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 1 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 1 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci11"/>

  <function name="aci_modify_filter_tests_aci11">

    <sequence>

      <block name="'aci-modify-filter-tests-aci11'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 11'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 11 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci11.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 11 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 11 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci12"/>

  <function name="aci_modify_filter_tests_aci12">

    <sequence>

      <block name="'aci-modify-filter-tests-aci12'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 12'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 12 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci12.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 12 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 12 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci13"/>

  <function name="aci_modify_filter_tests_aci13">

    <sequence>

      <block name="'aci-modify-filter-tests-aci13'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 13'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 13 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci13.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 13 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 13 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci14"/>

  <function name="aci_modify_filter_tests_aci14">

    <sequence>

      <block name="'aci-modify-filter-tests-aci14'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 14'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 14 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci14.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 14 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 14 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci15"/>

  <function name="aci_modify_filter_tests_aci15">

    <sequence>

      <block name="'aci-modify-filter-tests-aci15'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 15'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 15 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci15.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 15 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 15 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci16"/>

  <function name="aci_modify_filter_tests_aci16">

    <sequence>

      <block name="'aci-modify-filter-tests-aci16'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 16'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 16 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci16.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 16 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 16 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci2"/>

  <function name="aci_modify_filter_tests_aci2">

    <sequence>

      <block name="'aci-modify-filter-tests-aci2'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 2'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 2 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci2.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 2 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 2 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci21"/>

  <function name="aci_modify_filter_tests_aci21">

    <sequence>

      <block name="'aci-modify-filter-tests-aci21'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 21'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 21 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci21.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 21 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 21 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci22"/>

  <function name="aci_modify_filter_tests_aci22">

    <sequence>

      <block name="'aci-modify-filter-tests-aci22'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 22'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 22 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci22.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 22 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 22 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci23"/>

  <function name="aci_modify_filter_tests_aci23">

    <sequence>

      <block name="'aci-modify-filter-tests-aci23'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 23'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 23 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci23.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 23 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 23 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci24"/>

  <function name="aci_modify_filter_tests_aci24">

    <sequence>

      <block name="'aci-modify-filter-tests-aci24'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 24'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 24 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci24.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 24 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 24 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci25"/>

  <function name="aci_modify_filter_tests_aci25">

    <sequence>

      <block name="'aci-modify-filter-tests-aci25'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 25'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 25 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci25.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 25 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 25 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci26"/>

  <function name="aci_modify_filter_tests_aci26">

    <sequence>

      <block name="'aci-modify-filter-tests-aci26'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 26'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 26 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci26.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 26 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 26 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci3"/>

  <function name="aci_modify_filter_tests_aci3">

    <sequence>

      <block name="'aci-modify-filter-tests-aci3'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 3'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 3 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci3.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 3 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 3 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci4"/>

  <function name="aci_modify_filter_tests_aci4">

    <sequence>

      <block name="'aci-modify-filter-tests-aci4'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 4'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 4 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci4.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 4 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci5"/>

  <function name="aci_modify_filter_tests_aci5">

    <sequence>

      <block name="'aci-modify-filter-tests-aci5'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 5'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 5 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci5.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 5 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

 opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml

New file
@@ -0,0 +1,279 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!--
 ! 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.
 ! -->
<stax>

  <defaultcall function="aci_modify_filter_tests_aci6"/>

  <function name="aci_modify_filter_tests_aci6">

    <sequence>

      <block name="'aci-modify-filter-tests-aci6'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="'ACI: Modify Filter: ACI 6'">
              <sequence>
                <call function="'testCase_Preamble'"/>
                <message>
                   'ACI: Modify Filter: ACI 6 - Preamble, Adding Entries For Modify Filter Tests'
                </message>
    
                <call function="'addEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <script>
                    curr_aci_ldif_file = 'add_aci6.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                </script>
        
                <message>
                   'ACI: Modify Filter: ACI 6 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 0'
                </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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 1'
                </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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 2'
                </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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 3'
                </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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 4'
                </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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 5'
                </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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 6'
                </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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 7'
                </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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 8'
                </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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - Mod 9'
                </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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'ACI: Modify Filter: ACI 6 - postamble, removing aci and entries'
                </message>
    
                <call function="'DeleteEntry'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
                    'extraParams'      : '-x'}
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
   
      </block>
       
    </sequence>
      
  </function>

</stax>

New file
			@@ -0,0 +1,260 @@
			# 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: o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			o: ACI Tests
			objectclass: top
			objectclass: organization

			dn: ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			objectclass: top
			objectclass: organizationalunit
			ou: aci branch

			dn: ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			objectclass: top
			objectclass: organizationalunit
			ou: People

			dn: uid=duser1, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User1
			sn: User1
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Accounting
			ou: People
			l: Sunnyvale
			uid: duser1
			mail: duser1@example.com
			telephonenumber: +1 408 555 4798
			facsimiletelephonenumber: +1 408 555 9751
			roomnumber: 4612
			userpassword: sprain
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser2, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User2
			sn: User2
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Accounting
			ou: People
			l: Sunnyvale
			uid: duser2
			mail: duser2@example.com
			telephonenumber: +1 408 555 9187
			facsimiletelephonenumber: +1 408 555 8473
			roomnumber: 4117
			userpassword: irrefutable
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser3, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User3
			sn: User3
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Human Resources
			ou: People
			l: Sunnyvale
			uid: duser3
			mail: duser3@example.com
			telephonenumber: +1 408 555 5625
			facsimiletelephonenumber: +1 408 555 3372
			roomnumber: 2871
			userpassword: bribery
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser4, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User4
			sn: User4
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Product Testing
			ou: People
			l: Sunnyvale
			uid: duser4
			mail: duser4@example.com
			telephonenumber: +1 408 555 8585
			facsimiletelephonenumber: +1 408 555 7472
			roomnumber: 3472
			userpassword: inflict
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser5, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User5
			sn: User5
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Accounting
			ou: People
			l: Sunnyvale
			uid: duser5
			mail: duser5@example.com
			telephonenumber: +1 408 555 9423
			facsimiletelephonenumber: +1 408 555 0111
			roomnumber: 4135
			userpassword: gosling
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser6, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User6
			sn: User6
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Accounting
			ou: People
			l: Sunnyvale
			uid: duser6
			mail: duser6@example.com
			telephonenumber: +1 408 555 6201
			facsimiletelephonenumber: +1 408 555 8473
			roomnumber: 1269
			userpassword: ruling
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser7, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User7
			sn: User7
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Product Development
			ou: People
			l: Sunnyvale
			uid: duser7
			mail: duser7@example.com
			telephonenumber: +1 408 555 9069
			facsimiletelephonenumber: +1 408 555 1992
			roomnumber: 4178
			userpassword: forsook
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser8, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User8
			sn: User8
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Human Resources
			ou: People
			l: Sunnyvale
			uid: duser8
			mail: duser8@example.com
			telephonenumber: +1 408 555 1296
			facsimiletelephonenumber: +1 408 555 1992
			roomnumber: 0194
			userpassword: apples
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser9, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User9
			sn: User9
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Product Testing
			ou: People
			l: Sunnyvale
			uid: duser9
			mail: duser9@example.com
			telephonenumber: +1 408 555 1122
			facsimiletelephonenumber: +1 408 555 8721
			roomnumber: 2942
			userpassword: destroy
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

			dn: uid=duser0, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			cn: Dir User0
			sn: User0
			givenname: Dir
			objectclass: top
			objectclass: person
			objectclass: organizationalPerson
			objectclass: inetOrgPerson
			ou: Human Resources
			ou: People
			l: Sunnyvale
			uid: duser0
			mail: duser0@example.com
			telephonenumber: +1 408 555 1596
			facsimiletelephonenumber: +1 408 555 9751
			roomnumber: 1124
			userpassword: squatted
			title: engineer
			title: architect
			title: sweeper
			carlicense: ABC 123

New file
			@@ -0,0 +1,30 @@
			# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			changetype: modify
			add: aci
			aci: (targetattr="")(targattrfilters="add=l:(l=Sunny),del=l:(l=Sunny*)")(version 3.0; acl "add_aci1"; allow (all) userdn="ldap:///all";)

New file
			@@ -0,0 +1,29 @@
			# 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=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			changetype: modify
			delete: aci

New file
			@@ -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=duser0, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			changetype: delete

New file
			@@ -0,0 +1,28 @@
			# 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=duser8, ou=People, ou=aci branch, o=Modify Filter Tests, o=ACI Tests, dc=example,dc=com
			changetype: modify
			delete: l

			@@ -97,6 +97,10 @@
			<call function="'aci_modify_entry'" />

			<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
			file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
			<call function="'aci_modify_filter_tests'" />

			<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
			file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
			<call function="'aci_teardown'" />

New file
			@@ -0,0 +1,279 @@
			<?xml version="1.0" encoding="UTF-8" standalone="no"?>
			<!DOCTYPE stax SYSTEM "stax.dtd">
			<!--
			! 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.
			! -->
			<stax>

			<defaultcall function="aci_modify_filter_tests_aci1"/>

			<function name="aci_modify_filter_tests_aci1">

			<sequence>

			<block name="'aci-modify-filter-tests-aci1'">

			<sequence>

			<script>
			CurrentTestPath['suite']=STAXCurrentBlock
			</script>

			<call function="'testSuite_Preamble'"/>

			<testcase name="'ACI: Modify Filter: ACI 1'">
			<sequence>
			<call function="'testCase_Preamble'"/>
			<message>
			'ACI: Modify Filter: ACI 1 - Preamble, Adding Entries For Modify Filter Tests'
			</message>

			<call function="'addEntry'">
			{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<script>
			curr_aci_ldif_file = 'add_aci1.ldif'
			curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
			</script>

			<message>
			'ACI: Modify Filter: ACI 1 - 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/aci/aci_modify_filter_tests/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 0'
			</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_modify_filter_tests/mod0.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 1'
			</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_modify_filter_tests/mod1.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 2'
			</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_modify_filter_tests/mod2.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 50">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 3'
			</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_modify_filter_tests/mod3.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 4'
			</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_modify_filter_tests/mod4.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 5'
			</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_modify_filter_tests/mod5.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 50">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 6'
			</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_modify_filter_tests/mod6.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 7'
			</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_modify_filter_tests/mod7.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 8'
			</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_modify_filter_tests/mod8.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - Mod 9'
			</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_modify_filter_tests/mod9.ldif' % STAGED_DATA_DIR }
			</call>

			<if expr="RC != 0">
			<tcstatus result="'fail'"/>
			</if>

			<message>
			'ACI: Modify Filter: ACI 1 - postamble, removing aci and entries'
			</message>

			<call function="'DeleteEntry'">
			{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
			'extraParams' : '-x'}
			</call>

			<call function="'checktestRC'">
			{ 'returncode' : RC ,
			'result' : STAXResult }
			</call>

			<call function="'testCase_Postamble'"/>

			</sequence>
			</testcase>

			<call function="'testSuite_Postamble'"/>

			</sequence>

			</block>

			</sequence>

			</function>

			</stax>