From e0a98f79ebd989542caf2190452ef591c8166477 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Fri, 02 Mar 2007 21:48:14 +0000
Subject: [PATCH] Fix for Issue 1310.
---
opends/tests/functional-tests/testcases/aci/aci.xml | 4 +
opends/tests/functional-tests/testcases/aci/aci_teardown.xml | 116 ++++++++++++++++++++++++++++++++++++++
opends/tests/functional-tests/shared/data/aci/aci_disable.ldif | 6 ++
3 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif b/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif
new file mode 100644
index 0000000..f542d33
--- /dev/null
+++ b/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif
@@ -0,0 +1,6 @@
+dn: cn=Access Control Handler,cn=config
+changetype: modify
+replace: ds-cfg-acl-handler-enabled
+ds-cfg-acl-handler-enabled: false
+
+
diff --git a/opends/tests/functional-tests/testcases/aci/aci.xml b/opends/tests/functional-tests/testcases/aci/aci.xml
index f95627c..565e757 100755
--- a/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -82,6 +82,10 @@
file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
<call function="'aci_target'" />
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
+ <call function="'aci_teardown'" />
+
<!--- Stop DS -->
<sequence>
<message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
new file mode 100755
index 0000000..eda75b4
--- /dev/null
+++ b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
@@ -0,0 +1,116 @@
+<?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_teardown"/>
+
+ <function name="aci_teardown">
+
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='aci-setup'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!---
+ Place group-specific test information here.
+ #@TestGroupName ACI
+ #@TestGroupPurpose To test the ACI functionality.
+
+ Place suite-specific test information here.
+ #@TestSuiteName ACI Teardown Tests
+ #@TestSuitePurpose Unconfigure OpenDS after testing ACI functionality.
+ #@TestSuiteGroup ACI Teardown Tests
+ #@TestScript aci_teardown.xml
+ -->
+
+ <!--- Test Case : Remove Entries for ACI Tests -->
+ <!---
+ Place test-specific test information here.
+ The tag, TestMarker, must be the same as the tag, TestSuiteName.
+ #@TestMarker ACI Teardown Tests
+ #@TestName ACI Teardown Test
+ #@TestIssue none
+ #@TestPurpose Remove entries that were needed for the ACI tests.
+ #@TestPreamble none
+ #@TestStep Disable ACI with ldapmodify.
+ #@TestStep Remove entries.
+ #@TestPostamble none
+ #@TestResult Success if OpenDS returns 0 for all operations
+ -->
+ <testcase name="'ACI: ACI Teardown: Remove Initial Entries'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'ACI: ACI Teardown: Disabling 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_disable.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: ACI Teardown: Removing Initial Entries'
+ </message>
+
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : '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>
+
+ </function>
+
+</stax>
--
Gitblit v1.10.0