From a5fb3361f788ba43b88e23c80b3b7aee20418431 Mon Sep 17 00:00:00 2001
From: maudj <maudj@localhost>
Date: Thu, 27 Mar 2008 13:21:31 +0000
Subject: [PATCH] remove space and change list code - maudj
---
opends/tests/functional-tests/testcases/security/security.xml | 87 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/security.xml b/opends/tests/functional-tests/testcases/security/security.xml
index 262afa0..32a0505 100755
--- a/opends/tests/functional-tests/testcases/security/security.xml
+++ b/opends/tests/functional-tests/testcases/security/security.xml
@@ -26,67 +26,56 @@
! Copyright 2006-2008 Sun Microsystems, Inc.
! -->
<stax>
+
<defaultcall function="main_security"/>
+
<function name="main_security">
- <block name="'security'">
- <sequence>
- <script>
+
+ <sequence>
+
+ <block name="'security'">
+
+ <sequence>
+
+ <!--- Test Group information
+ #@TestGroupName Security tests
+ #@TestGroupPurpose Test the security.
+ -->
+ <script>
CurrentTestPath['group']='security'
</script>
<call function="'testGroup_Preamble'"/>
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/client_auth/client_auth.xml' % (TESTS_DIR)"/>
- <call function="'client_auth'" />
+ <script>
+ testList = []
+ testList.append(['client_auth','client_auth'])
+ testList.append(['jks','security_jks'])
+ testList.append(['pkcs12','security_pkcs12'])
+ testList.append(['startTLS','security_startTLS'])
+ testList.append(['sasl','security_sasl'])
+ testList.append(['pwd_policy','security_pwd_policy'])
+ testList.append(['pwd_policy_root','security_pwd_policy_root'])
+ testList.append(['auth_pwd_syntax','security_auth_pwd_syntax'])
+ testList.append(['pwd_validator','security_pwd_validator'])
+ testList.append(['pwd_storage','security_pwd_storage'])
+ testList.append(['bind_no_pwd','security_bind_no_pwd'])
+ testList.append(['account_activation','security_account_activation'])
+ </script>
+ <iterate var="_test" in="testList">
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/%s/%s.xml' %
+ (TESTS_DIR,_test[0],_test[1])"/>
+ <call function="'%s' % _test[1]" />
+ </sequence>
+ </iterate>
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/jks/security_jks.xml' % (TESTS_DIR)"/>
- <call function="'security_jks'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/pkcs12/security_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'security_pkcs12'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/startTLS/security_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'security_startTLS'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/sasl/security_sasl.xml' % (TESTS_DIR)"/>
- <call function="'security_sasl'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/pwd_policy/security_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_policy'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/pwd_policy_root/security_pwd_policy_root.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_policy_root'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
- <call function="'security_auth_pwd_syntax'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/pwd_validator/security_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_validator'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/pwd_storage/security_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_storage'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/bind_no_pwd/security_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'security_bind_no_pwd'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/account_activation/security_account_activation.xml' % (TESTS_DIR)"/>
- <call function="'security_account_activation'" />
<call function="'testGroup_Postamble'"/>
</sequence>
</block>
+ </sequence>
</function>
</stax>
--
Gitblit v1.10.0