From f6f3245e89f4ea7758f592fa044dde87d1fd51b8 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 17 Sep 2008 11:19:50 +0000
Subject: [PATCH] Fix setup test spec generation.
---
opends/tests/staf-tests/functional-tests/testcases/setup/import.xml | 2 +-
opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml | 4 ++--
opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml | 8 ++++----
opends/tests/staf-tests/functional-tests/testcases/setup/security.xml | 6 +++---
opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
index 328666b..5347549 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
@@ -109,8 +109,8 @@
#@TestPreamble
#@TestStep Setup OpenDS instance 1 using specific DM options
Setup OpenDS instance 2 using specific DM options
- Setup replication between 1&2 on suffix o=o1
- Backup instances 1&2
+ Setup replication between 1 and 2 on suffix o=o1
+ Backup instances 1 and 2
Uninstall instance 1 with specific options
Uninstall instance 2 with specific options
#@TestPostamble
@@ -248,7 +248,7 @@
- <!-- 3. Configure replication between I1 & I2 on o=o1. Global Admin
+ <!-- 3. Configure replication between I1 and I2 on o=o1. Global Admin
is setup -->
<message>'Configure replication between I1 - I2 on o=o1'</message>
<script>
@@ -374,7 +374,7 @@
</call>
- <!-- 4. Backup I1 & I2 and copy LDIF files in I1 & I2 -->
+ <!-- 4. Backup I1 and I2 and copy LDIF files in I1 and I2 -->
<message>'Backup I1 and I2 - copy LDIF files in I1 and I2'</message>
<script>
c = '%s/%s/backup%s' % (DM_I1_ROOT, fileFolder, fileExt)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index 315ea27..41fa8fb 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -258,7 +258,7 @@
#@TestStep Unzip OpenDS distribution
Setup OpenDS with a LDIF file to import, and
files for rejected and skipped entries
- Check skipped & rejected entries
+ Check skipped and rejected entries
Stop OpenDS
Uninstall OpenDS
#@TestPostamble
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
index 998cdde..86b8a9e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
@@ -69,8 +69,8 @@
#@TestName Setup-Uninstall: Misc:
misc
#@TestID misc
- #@TestPurpose Launch buggy setup & uninstall commands and check
- that they are rejected
+ #@TestPurpose Launch buggy setup and uninstall commands and
+ check that they are rejected
#@TestPreamble
#@TestStep Unzip OpenDS ZIP delivery
Setup OpenDS with unexisting option
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
index f5c8a14..4ab01f5 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
@@ -217,7 +217,7 @@
#@TestPurpose Setup OpenDS, disabling the LDAP port check
#@TestPreamble
#@TestStep Unzip OpenDS ZIP distribution
- Setup OpenDS with 'skipPortCheck' & 'doNotStart'
+ Setup OpenDS with 'skipPortCheck' and 'doNotStart'
options
Uninstall OpenDS
#@TestPostamble
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
index f87643f..8108a80 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
@@ -119,13 +119,13 @@
#@TestPreamble
#@TestStep Setup I1, with SSL
Setup I2, with StartTLS
- Create o=o1 on I1 & I2, and import data on I1
+ Create o=o1 on I1 and I2, and import data on I1
Setup replication I1 - I2
Check SSL works OK on I1 and I2
Check StartTLS not-OK on I1
Check StartTLS OK on I2
- Export server certs I1 & I2
- Create new JKS keystore and import I1 & I2 certs
+ Export server certs I1 and I2
+ Create new JKS keystore and import I1 and I2 certs
Uninstall I1, using new keystore
Uninstall I2
#@TestPostamble
--
Gitblit v1.10.0