From 589b83e1aabb3a43da2b16f1864ef36323e03682 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Thu, 31 Jan 2008 13:13:58 +0000
Subject: [PATCH] update header
---
opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml | 16
opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml | 51 ++--
opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml | 7
opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml | 295 +++++++++++++-------------
opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml | 126 +++++-----
opendj-sdk/opends/tests/functional-tests/testcases/tasks/restart_db.xml | 101 ++++----
opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml | 57 ++--
7 files changed, 329 insertions(+), 324 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
index 8c50a1d..a4f0486 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -35,25 +35,27 @@
</script>
<call function="'testSuite_Preamble'" />
+
<!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose control which tasks are allowed
+ #@TestSuiteName Allowed tasks
+ #@TestSuitePurpose Control which tasks are allowed
#@TestSuiteID export Tests
#@TestSuiteGroup export
#@TestGroup tasks
#@TestScript allowed-tasks.xml
#@TestHTMLLink http://opends.dev.java.net/
-->
+
<!--- Test Case information
- #@TestMarker Backend tasks Tests
- #@TestName Backend: tasks control
- #@TestPurpose control which tasks are allowed
+ #@TestMarker Allowed tasks
+ #@TestName Tasks control
+ #@TestPurpose Control which tasks are allowed
#@TestPreamble
- #@TestSteps change the list of allowed tasks
- #@TestSteps check we can only schedule allowed tasks
+ #@TestStep Change the list of allowed tasks
+ #@TestStep Check we can only schedule allowed tasks
#@TestPostamble
#@TestResult
-->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
index 3a68b82..241b82c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
@@ -24,176 +24,177 @@
! CDDL HEADER END
!
! Portions Copyright 2007-2008 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="backup_db"/>
<function name="backup_db" scope="local">
<block name="STAXCurrentFunction">
- <sequence>
- <script>
- CurrentTestPath['suite']=STAXCurrentFunction
- </script>
- <call function="'testSuite_Preamble'" />
-
-
- <!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose Verify that the backup functionality is working in mode task
- #@TestSuiteID backup Tests
- #@TestSuiteGroup backup
- #@TestGroup tasks
- #@TestScript backup.xml
- #@TestHTMLLink http://opends.dev.java.net/
+ <sequence>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentFunction
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+
+ <!--- Test Suite information
+ #@TestSuiteName Backup tasks
+ #@TestSuitePurpose Validate the backup functionality in mode task
+ #@TestSuiteID backup Tests
+ #@TestSuiteGroup backup
+ #@TestGroup tasks
+ #@TestScript backup_db.xml
+ #@TestHTMLLink http://opends.dev.java.net/
-->
- <!--- Test Case information
- #@TestMarker Backend backup Tests
- #@TestName Backend: backup
- #@TestID LDIF Default
- #@TestPurpose schedule a backup in task mode to be executed immedialy in asynchronous mode
+ <!--- Test Case information
+ #@TestMarker Backup tasks
+ #@TestName Backup task in asynchronous mode
+ #@TestPurpose Schedule a backup in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a backup in a task
- #@TestSteps specify the -t option with the value 0 to schedule for immediate execution
+ #@TestStep Execute a backup in mode task
+ #@TestStep Specify the -t 0
+ #@TestStep The task is scheduled for immediate execution
+ #@TestSteps The script returns immedialy after scheduling the task
#@TestPostamble
#@TestResult
-->
- <testcase name="getTestCaseName('schedule backup task for immediate execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
- 'startTask' : '0',
- 'backEnd' : 'userRoot'}
- </call>
-
- <message>'--- Check log files backup_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'backup_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
- <else>
- <call function="'testPassed'"/>
- </else>
- </if>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
- #@TestMarker Backend Backup
- #@TestName Backend: Backup
- #@TestPurpose schedule a Backup in task mode to be executed immedialy in synchronous mode
- #@TestPreamble
- #@TestSteps execute a Backup in a task
- #@TestSteps don't specify the -t option to schedule for immediate execution and wait the end of the task to return
- #@TestPostamble
- #@TestResult
- -->
+ <testcase name="getTestCaseName('schedule backup task for immediate execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
- <testcase name="getTestCaseName('schedule backup task for immediate execution in synchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir,
- 'backEnd' : 'userRoot'}
- </call>
-
- <message>'--- Check log files ---'</message>
- <call function="'listFolder'">
+
+ <call function="'backup'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
+ 'startTask' : '0',
+ 'backEnd' : 'userRoot'}
+ </call>
+
+ <message>'--- Check log files backup_asynchronous ---'</message>
+ <call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'backup_synchronous'
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'backup_asynchronous'
}
- </call>
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
+ </call>
+
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
<else>
- <call function="'testPassed'"/>
+ <call function="'testPassed'"/>
</else>
- </if>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
- #@TestMarker Backend Backup
- #@TestName Backend: Backup
- #@TestID LDIF Default
- #@TestPurpose schedule a Backup in task mode to be executed immedialy in asynchronous mode
+ </if>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
+ #@TestMarker Backup tasks
+ #@TestName Backup task in synchronous mode
+ #@TestPurpose Schedule a Backup in task mode to be executed immedialy in synchronous mode
#@TestPreamble
- #@TestSteps execute a Backup in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
+ #@TestStep Execute a backup in mode task
+ #@TestStep Don't specify the -t option
+ #@TestStep The task is scheduled for immediate execution and the script must wait the end of the task to return
#@TestPostamble
#@TestResult
-->
- <testcase name="getTestCaseName('schedule backup task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
+ <testcase name="getTestCaseName('schedule backup task for immediate execution in synchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
-
- <call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'startTask' : '20061212000000',
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir,
- 'backEnd' : 'userRoot'}
- </call>
-
-
- <message>'--- Check log files backup_schedule_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'backup_schedule_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
+ <call function="'backup'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir,
+ 'backEnd' : 'userRoot'}
+ </call>
+
+ <message>'--- Check log files ---'</message>
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'backup_synchronous'
+ }
+ </call>
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
<else>
- <call function="'testPassed'"/>
+ <call function="'testPassed'"/>
</else>
- </if>
-
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <call function="'testSuite_Postamble'" />
- </sequence>
- </block>
-</function>
+ </if>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
+ #@TestMarker Backup tasks
+ #@TestName Schedule a Backup task
+ #@TestPurpose Schedule a Backup in task mode
+ #@TestPreamble
+ #@TestStep Execute a Backup in task mode
+ #@TestStep specify the -t option with the value non null to schedule an execution
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="getTestCaseName('schedule backup task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+ <call function="'backup'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'startTask' : '20061212000000',
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir,
+ 'backEnd' : 'userRoot'}
+ </call>
+
+
+ <message>'--- Check log files backup_schedule_asynchronous ---'</message>
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'backup_schedule_asynchronous'
+ }
+ </call>
+
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
+ <else>
+ <call function="'testPassed'"/>
+ </else>
+ </if>
+
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <call function="'testSuite_Postamble'" />
+ </sequence>
+ </block>
+ </function>
</stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
index 7d4d68a..e737f13 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -36,24 +36,26 @@
<call function="'testSuite_Preamble'" />
<!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose Verify that the basic export functionality is working in mode task
- #@TestSuiteID export Tests
- #@TestSuiteGroup export
- #@TestGroup tasks
- #@TestScript export.xml
- #@TestHTMLLink http://opends.dev.java.net/
+ #@TestSuiteName Export tasks
+ #@TestSuitePurpose Validate the export functionality in mode task
+ #@TestSuiteID export Tests
+ #@TestSuiteGroup export
+ #@TestGroup tasks
+ #@TestScript export_ldif.xml
+ #@TestHTMLLink http://opends.dev.java.net/
-->
+
<!--- Test Case information
- #@TestMarker Backend export Tests
- #@TestName Backend: export: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a Basic export in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Export tasks
+ #@TestName Export task in asynchronous mode
+ #@TestPurpose Schedule a Export in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a export-ldif in a task
- #@TestSteps specify the -t option with the value 0 to schedule for immediate execution
+ #@TestStep Execute a export-ldif in a task
+ #@TestStep Specify the -t option with the value 0
+ #@TestStep The task is scheduled for immediate execution
+ #@TestStep The script returns immedialy after scheduling the task
#@TestPostamble
#@TestResult
-->
@@ -94,13 +96,13 @@
<!--- Test Case information
- #@TestMarker Backend export Tests
- #@TestName Backend: export: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a Basic export in task mode to be executed immedialy in synchronous mode
+ #@TestMarker Export tasks
+ #@TestName Export task in synchronous mode
+ #@TestPurpose Schedule a Export in task mode to be executed immedialy in synchronous mode
#@TestPreamble
- #@TestSteps execute a export-ldif in a task
- #@TestSteps don't specify the -t option to schedule for immediate execution and wait the end of the task to return
+ #@TestStep Execute a export-ldif in a task
+ #@TestStep Don't specify the -t option
+ #@TestStep The task is scheduled for immediate execution and the script must wait the end of the export
#@TestPostamble
#@TestResult
-->
@@ -141,13 +143,12 @@
<!--- Test Case information
- #@TestMarker Backend export Tests
- #@TestName Backend: export: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a Basic export in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Export tasks
+ #@TestName Schedule a Export task
+ #@TestPurpose Schedule a Export in task mode
#@TestPreamble
- #@TestSteps execute a export-ldif in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
+ #@TestStep Execute a export-ldif in a task
+ #@TestStep Specify the -t option with the value non null to schedule an execution
#@TestPostamble
#@TestResult
-->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
index 7f2d2d4..51f9cac 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -37,24 +37,24 @@
<!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose Verify that the basic import functionality is working in mode task
- #@TestSuiteID Import Tests
- #@TestSuiteGroup Import
- #@TestGroup tasks
- #@TestScript import.xml
+ #@TestSuiteName Import Tasks
+ #@TestSuitePurpose Validate the Import functionality in mode task
+ #@TestSuiteID Import Tests
+ #@TestSuiteGroup Import
+ #@TestGroup tasks
+ #@TestScript import_ldif.xml
#@TestHTMLLink http://opends.dev.java.net/
-->
<!--- Test Case information
- #@TestMarker Backend Import Tests
- #@TestName Backend: Import: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a Basic import in task mode to be executed immedialy in synchronous mode
+ #@TestMarker Import Tasks
+ #@TestName Import task in synchronous mode
+ #@TestPurpose Schedule a import in task mode to be executed immedialy in synchronous mode
#@TestPreamble
- #@TestSteps execute a import-ldif in a task
- #@TestSteps don't specify the -t option to schedule for immediate execution and wait the end of the task to return
+ #@TestStep Execute a import-ldif in a task
+ #@TestStep Don't specify the -t option
+ #@TestStep The task is scheduled for immediate execution and the script must wait the end of the import
#@TestPostamble
#@TestResult
-->
@@ -64,14 +64,14 @@
<call function="'testCase_Preamble'"/>
<call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
+ { 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
- 'dsAppend' : ' ',
- 'dsBackEnd' : 'userRoot'}
+ 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsAppend' : ' ',
+ 'dsBackEnd' : 'userRoot'}
</call>
<!-- Check data are imported -->
@@ -85,16 +85,16 @@
<!-- Delete entries -->
<call function="'DeleteEntry'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
</call>
<call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
</call>
@@ -104,16 +104,17 @@
<!--- Test Case information
- #@TestMarker Backend Import Tests
- #@TestName Backend: Import: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a Basic import in task mode to be executed immedialy in asynchronous mode
+
+ #@TestMarker Import Tasks
+ #@TestName Import task in asynchronous mode
+ #@TestPurpose Schedule a import in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a import-ldif in a task
- #@TestSteps specify the -t option with the value 0 to schedule for immediate execution
- #@TestPostamble
- #@TestResult
- -->
+ #@TestStep Execute a import-ldif in a task
+ #@TestStep specify the -t option with the value 0
+ #@TestStep The task is scheduled for immediate execution
+ @TestStep The script returns immedialy after scheduling the task
+ #@TestPostamble
+ -->
<testcase name="getTestCaseName('schedule import-ldif task for immediate execution in asynchronous mode')">
<sequence>
@@ -145,18 +146,18 @@
<!-- Delete entries -->
<call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
</call>
<call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
+ 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
</call>
<call function="'testCase_Postamble'"/>
@@ -164,33 +165,32 @@
</testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tests
- #@TestName Backend: Import: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose schedule a import-ldif in task mode to be executed in asynchronous mode
+ <!--- Test Case information
+
+ #@TestMarker Import Tasks
+ #@TestName Schedule a Import task
+ #@TestPurpose Schedule a import in task mode
#@TestPreamble
- #@TestSteps execute a import-ldif in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
- #@TestPostamble
- #@TestResult
- -->
+ #@TestStep Execute a import-ldif in a task
+ @TestStep specify the -t option with the value non null to schedule an execution
+ #@TestPostamble
+ -->
+
<testcase name="getTestCaseName('schedule import-ldif task for scheduled execution in asynchronous mode')">
<sequence>
<call function="'testCase_Preamble'"/>
<call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
+ { 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
- 'dsAppend' : ' ',
- 'startTask' : '20061212000000',
- 'dsBackEnd' : 'userRoot'}
+ 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsAppend' : ' ',
+ 'startTask' : '20061212000000',
+ 'dsBackEnd' : 'userRoot'}
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
@@ -207,18 +207,18 @@
<!-- Delete entries -->
<call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
</call>
<call function="'DeleteEntry'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restart_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restart_db.xml
index b4b3ff1..e775bb7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restart_db.xml
@@ -28,42 +28,41 @@
<stax>
<defaultcall function="restart_db"/>
<function name="restart_db" scope="local">
- <block name="STAXCurrentFunction">
+ <block name="STAXCurrentFunction">
<sequence>
<script>
CurrentTestPath['suite']=STAXCurrentFunction
</script>
<call function="'testSuite_Preamble'" />
-
-
+
+
<!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose Verify that the restart functionality is working in mode task
- #@TestSuiteID restart Tests
- #@TestSuiteGroup restart
- #@TestGroup tasks
- #@TestScript restart.xml
- #@TestHTMLLink http://opends.dev.java.net/
+ #@TestSuiteName Restart tasks
+ #@TestSuitePurpose Validate the stop and restart functionality in mode task
+ #@TestSuiteID restart Tests
+ #@TestSuiteGroup restart
+ #@TestGroup tasks
+ #@TestScript restart_db.xml
+ #@TestHTMLLink http://opends.dev.java.net/
-->
-
-
+
<!--- Test Case information
- #@TestMarker Backend restart Tests
- #@TestName Backend: restart
- #@TestPurpose schedule a restart in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Restart tasks
+ #@TestName Restart task in asynchronous mode
+ #@TestPurpose Schedule a restart in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a restart in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
+ #@TestStep Execute a restart in task
+ #@TestStep Specify the -t option with the value non null to schedule an execution
#@TestPostamble
#@TestResult
-->
-
+
<testcase name="getTestCaseName('schedule restart task for scheduled execution in asynchronous mode')">
<sequence>
- <call function="'testCase_Preamble'"/>
-
-
+ <call function="'testCase_Preamble'"/>
+
+
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsHost' : DIRECTORY_INSTANCE_HOST,
@@ -73,44 +72,44 @@
'dsRestart' : ' ',
'dsStopTime' : '20061212000000' }
</call>
-
+
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'sleepForMilliSeconds' : 10000 }
</call>
-
+
<call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
- 'dsFilter' : 'objectclass=*' ,
- 'dsScope' : 'base',
- 'expectedRC' : 0 }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
- </testcase>
-
-
+ </testcase>
+
+
<!--- Test Case information
- #@TestMarker Backend stop Tests
- #@TestName Backend: stop
- #@TestPurpose schedule a stop in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Restart tasks
+ #@TestName Stop task in asynchronous mode
+ #@TestPurpose Schedule a stop in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a stop in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
+ #@TestStep Execute a stop in task mode
+ #@TestStep Specify the -t option with the value non null to schedule an execution
#@TestPostamble
#@TestResult
-->
-
+
<testcase name="getTestCaseName('schedule stop server task for scheduled execution in asynchronous mode')">
<sequence>
- <call function="'testCase_Preamble'"/>
-
-
+ <call function="'testCase_Preamble'"/>
+
+
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsHost' : DIRECTORY_INSTANCE_HOST,
@@ -119,7 +118,7 @@
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
'dsStopTime' : '20061212000000' }
</call>
-
+
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -130,18 +129,18 @@
'dsScope' : 'base',
'expectedRC' : 91 }
</call>
-
+
<!--- Start DS -->
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
- </call>
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
- </testcase>
-
-
+ </testcase>
+
+
<call function="'testSuite_Postamble'" />
</sequence>
- </block>
+ </block>
</function>
</stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
index f04d027..7ee78a7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
@@ -35,26 +35,24 @@
</script>
<call function="'testSuite_Preamble'" />
-
- <!--- Test Suite information
- #@TestSuiteName Tasks
- #@TestSuitePurpose Verify that the restore functionality is working in mode task
- #@TestSuiteID restore Tests
- #@TestSuiteGroup restore
- #@TestGroup tasks
- #@TestScript restore.xml
- #@TestHTMLLink http://opends.dev.java.net/
- -->
+ <!--- Test Suite information
+ #@TestSuiteName Restore tasks
+ #@TestSuitePurpose Validate the restore functionality in mode task
+ #@TestSuiteID restore Tests
+ #@TestSuiteGroup restore
+ #@TestGroup tasks
+ #@TestScript restore_db.xml
+ #@TestHTMLLink http://opends.dev.java.net/
+ -->
<!--- Test Case information
- #@TestMarker Backend restore Tests
- #@TestName Backend: restore
- #@TestID LDIF Default
- #@TestPurpose schedule a restore in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Restore tasks
+ #@TestName Restore task in asynchronous mode
+ #@TestPurpose schedule a restore in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
- #@TestSteps execute a restore in a task
- #@TestSteps specify the -t option with the value 0 to schedule for immediate execution
+ #@TestStep Execute a restore in a task
+ #@TestStep Specify the -t option with the value 0 to schedule for immediate execution
#@TestPostamble
#@TestResult
-->
@@ -63,8 +61,6 @@
<sequence>
<call function="'testCase_Preamble'"/>
-
-
<call function="'restore'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -82,12 +78,13 @@
<!--- Test Case information
- #@TestMarker Backend restore
- #@TestName Backend: restore
- #@TestPurpose schedule a restore in task mode to be executed immedialy in synchronous mode
+ #@TestMarker Restore tasks
+ #@TestName Restore task in synchronous mode
+ #@TestPurpose Schedule a restore in task mode to be executed immedialy in synchronous mode
#@TestPreamble
- #@TestSteps execute a restore in a task
- #@TestSteps don't specify the -t option to schedule for immediate execution and wait the end of the task to return
+ #@TestStep Execute a restore in a task
+ #@TestStep Don't specify the -t option
+ #@TestStep The task is scheduled for immediate execution and the script must wait the end of the restore
#@TestPostamble
#@TestResult
-->
@@ -113,15 +110,13 @@
<!--- Test Case information
- #@TestMarker Backend restore
- #@TestName Backend: restore
- #@TestID LDIF Default
- #@TestPurpose schedule a restore in task mode to be executed immedialy in asynchronous mode
+ #@TestMarker Restore tasks
+ #@TestName Schedule a Restore task
+ #@TestPurpose Schedule a restore in task mode
#@TestPreamble
- #@TestSteps execute a restore in a task
- #@TestSteps specify the -t option with the value non null to schedule an execution
- #@TestPostamble
- #@TestResult
+ #@TestStep Execute a restore in a task
+ #@TestStep Specify the -t option with the value non null to schedule an execution
+ #@TestPostamble
-->
<testcase name="getTestCaseName('schedule restore task for scheduled execution in asynchronous mode')">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
index becfbe3..bf471aa 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
@@ -25,6 +25,13 @@
!
! Portions Copyright 2007-2008 Sun Microsystems, Inc.
! -->
+
+<!--
+ Place group-specific test information here.
+ #@TestGroupName Tasks
+ #@TestGroupPurpose Check the Directory server manages correctly the tasks
+-->
+
<stax>
<defaultcall function="main_tasks"/>
<function name="main_tasks">
--
Gitblit v1.10.0