From 28a5a3f4e5f92634e6a6271192a96528db95ce7a Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Wed, 16 May 2012 11:50:32 +0000
Subject: [PATCH] dsconfig properties functional tests should support --advanced
---
opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml | 6 ++++--
opends/tests/staf-tests/shared/functions/dsconfig.xml | 10 ++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
index 32138c3..bcc8fb5 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
@@ -30,7 +30,7 @@
<function name="dsconfig_get_001" scope="local">
<function-prolog>
- This function modifies a property value using dsconfig
+ This function gets a property value using dsconfig
</function-prolog>
<function-map-args>
<function-arg-def name="componentList"
@@ -78,6 +78,7 @@
'objectType' : '%s' % dsconfig_component1 ,
'objectName' : '%s' % dsconfig_component2 ,
'optionsString' : '--backend-name %s' % DIRECTORY_INSTANCE_BE ,
+ 'advanced' : 'true' ,
'expectedRC' : 0
}
</call>
@@ -90,6 +91,7 @@
'subcommand' : '%s' % dsconfig_subcommand ,
'objectType' : '%s' % dsconfig_component1 ,
'objectName' : '%s' % dsconfig_component2 ,
+ 'advanced' : 'true' ,
'expectedRC' : 0
}
</call>
@@ -137,7 +139,7 @@
<function name="dsconfig_get_002" scope="local">
<function-prolog>
- This function modifies a property value using dsconfig
+ This function gets a property value using dsconfig
</function-prolog>
<function-map-args>
<function-arg-def name="componentList"
diff --git a/opends/tests/staf-tests/shared/functions/dsconfig.xml b/opends/tests/staf-tests/shared/functions/dsconfig.xml
index 686972c..d97d773 100755
--- a/opends/tests/staf-tests/shared/functions/dsconfig.xml
+++ b/opends/tests/staf-tests/shared/functions/dsconfig.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS
! -->
<stax>
@@ -466,6 +467,13 @@
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
+
+ <function-arg-def name="advanced" type="optional">
+ <function-arg-description>
+ Boolean containing whether to use the advanced option or not
+ </function-arg-description>
+ <function-arg-property name="type" value="boolean" />
+ </function-arg-def>
<function-arg-def name="expectedRC" type="optional" default="0">
<function-arg-description>
@@ -505,6 +513,8 @@
STAFCmdParamsList.append('--%s "%s" ' % (objectType,objectName))
if optionsString:
STAFCmdParamsList.append(' %s' % optionsString)
+ if advanced:
+ STAFCmdParamsList.append(' --advanced')
</script>
<call function="'_dsconfigCommonArgs'" />
<script>
--
Gitblit v1.10.0