From 74c0934d18134a7c92b9ffda3f1fa5951839a769 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 23 Oct 2007 09:14:07 +0000
Subject: [PATCH] new test suite for status tool
---
opendj-sdk/opends/tests/functional-tests/testcases/clu/commands.xml | 8 +
opendj-sdk/opends/tests/functional-tests/testcases/clu/cluStatus.xml | 142 +++++++++++++++++++++++++++++++++++
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 31 ++++---
3 files changed, 167 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index e9c6833..b3b16d4 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -3088,19 +3088,19 @@
</function-arg-description>
<function-arg-property name="type" value="filepath"/>
</function-arg-def>
- <function-arg-def name="dsBindDN" type="optional">
+ <function-arg-def name="dsBindDN" type="optional" default="''">
<function-arg-description>
Bind DN
</function-arg-description>
<function-arg-property name="type" value="DN"/>
</function-arg-def>
- <function-arg-def name="dsBindPwd" type="optional">
+ <function-arg-def name="dsBindPwd" type="optional" default="''">
<function-arg-description>
Bind password
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="dsHelp" type="optional">
+ <function-arg-def name="dsHelp" type="optional" default="''">
<function-arg-description>
Help option
</function-arg-description>
@@ -3144,10 +3144,17 @@
}
</call>
+ <script>
+ CmdRC=RC
+ CmdResult=STAXResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ { 'returncode' : CmdRC ,
+ 'result' : CmdResult }
</call>
+
+ <return>CmdResult</return>
</sequence>
@@ -3177,43 +3184,43 @@
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="rawData" type="optional">
+ <function-arg-def name="rawData" type="optional" default="''">
<function-arg-description>
The raw data to be base64 encoded
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="rawDataFile" type="optional">
+ <function-arg-def name="rawDataFile" type="optional" default="''">
<function-arg-description>
The path to a file containing the raw data to be base64 encoded
</function-arg-description>
<function-arg-property name="type" value="filename"/>
</function-arg-def>
- <function-arg-def name="toEncodedFile" type="optional">
+ <function-arg-def name="toEncodedFile" type="optional" default="''">
<function-arg-description>
The path to a file to which the base64-encoded data should be written
</function-arg-description>
<function-arg-property name="type" value="filename"/>
</function-arg-def>
- <function-arg-def name="encodedData" type="optional">
+ <function-arg-def name="encodedData" type="optional" default="''">
<function-arg-description>
The base64-encoded data to be decoded
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="encodedDataFile" type="optional">
+ <function-arg-def name="encodedDataFile" type="optional" default="''">
<function-arg-description>
The path to a file containing the base64-encoded data to be decoded
</function-arg-description>
<function-arg-property name="type" value="filename"/>
</function-arg-def>
- <function-arg-def name="toRawFile" type="optional">
+ <function-arg-def name="toRawFile" type="optional" default="''">
<function-arg-description>
The path to a file to which the raw base64-decoded data should be written
</function-arg-description>
<function-arg-property name="type" value="filename"/>
</function-arg-def>
- <function-arg-def name="toolHelp" type="optional">
+ <function-arg-def name="toolHelp" type="optional" default="''">
<function-arg-description>
Help option
</function-arg-description>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluStatus.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluStatus.xml
new file mode 100644
index 0000000..9ad9152
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluStatus.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE stax SYSTEM "../../shared/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, exclude this CDDL HEADER in each
+ ! file and exclude 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="main_cluStatus"/>
+
+ <function name="main_cluStatus">
+
+ <sequence>
+
+ <block name="'cluStatus'">
+
+ <sequence>
+
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='clu'
+ CurrentTestPath['suite']=STAXCurrentBlock
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Test Suite information
+ #@TestSuiteName Clu: Status
+ #@TestSuitePurpose Check the status command with common options
+ #@TestSuiteID Clu Status Command
+ #@TestSuiteGroup cluStatus
+ #@TestGroup clu
+ #@TestScript cluStatus.xml
+ #@TestHTMLLink http://opends.dev.java.net/
+ -->
+
+
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/clu/clu_setup.xml' % (TESTS_DIR)"/>
+ <call function="'clu_setup'">
+ { 'startDS' : True,
+ 'loadBackend' : False }
+ </call>
+
+ <!--- Test Case information
+ #@TestMarker Clu Status Tests
+ #@TestName Clu: Status: Authenticated
+ #@TestID Default
+ #@TestPurpose Verify that the status command can be executed.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult Success if status returns 0
+ -->
+
+ <testcase name="getTestCaseName('Authenticated')">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <message>
+ 'Clu: Status: Authenticated'
+ </message>
+
+ <call function="'StatusWithScript'">
+ {
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ }
+ </call>
+
+ <!-- STAXResult is not always a list-->
+ <script>
+ try:
+ RC,Result=STAXResult[0]
+ except AttributeError,details:
+ Result='AttributeError: can not parse STAXResult %s' % details
+ RC='1'
+ </script>
+
+ <if expr="RC != 0">
+ <sequence>
+ <message>'Status returns unsuccessfully (RC=%s)' % RC</message>
+ <tcstatus result="'fail'"></tcstatus>
+ </sequence>
+ <else>
+ <sequence>
+ <message>'Status returns successfully (RC=%s)' % RC</message>
+ <tcstatus result="'pass'"></tcstatus>
+ </sequence>
+ </else>
+ </if>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/clu/clu_cleanup.xml' % (TESTS_DIR)"/>
+
+ <call function="'clu_cleanup'">
+ {
+ 'stopDS' : True
+ }
+ </call>
+
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
+
+ </block>
+
+ </sequence>
+
+ </function>
+
+</stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/commands.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/commands.xml
index aa42911..305cc54 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/commands.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/commands.xml
@@ -42,12 +42,12 @@
</script>
<call function="'testGroup_Preamble'"/>
-
+
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/clu/cluSearch.xml' % (TESTS_DIR)"/>
<call function="'main_cluSearch'" />
- <!-- <import machine="STAF_LOCAL_HOSTNAME"
+ <!-- <import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/clu/cluModify.xml' % (TESTS_DIR)"/>
<call function="'main_cluModify'" /> -->
@@ -63,6 +63,10 @@
file="'%s/testcases/clu/cluBase64.xml' % (TESTS_DIR)"/>
<call function="'main_cluBase64'" />
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/clu/cluStatus.xml' % (TESTS_DIR)"/>
+ <call function="'main_cluStatus'" />
+
<call function="'testGroup_Postamble'"/>
</sequence>
--
Gitblit v1.10.0