From 18080d9b897b7fd0f311c4c9f3428536398ea03a Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Tue, 19 Apr 2011 09:39:15 +0000
Subject: [PATCH] update product.name to OpenDJ in functional tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml | 15 ++++++++-------
opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml | 12 ++++++++++--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml | 16 ++++++++--------
opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml | 5 +++--
opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml | 3 ++-
7 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index 81d1a44..5119e0b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -75,8 +75,8 @@
}
</call>
- <!-- The war file can be included in the OpenDS archive -->
- <if expr="not PRODUCTNAME.startswith('OpenDS')">
+ <!-- The war file can be included in the OpenDJ archive -->
+ <if expr="not PRODUCTNAME.startswith('OpenDJ')">
<sequence>
<call function="'unZipFile'">
{
@@ -101,9 +101,9 @@
</else>
</if>
- <!-- The war file can be included in the OpenDS archive -->
+ <!-- The war file can be included in the OpenDJ archive -->
<script>
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
DSML_WARPATH = '%s/dsml/%s/addons/DSML.war' % (local.temp,OPENDSNAME)
</script>
<call function="'unZipFile'">
@@ -442,9 +442,9 @@
'setup: deploy DSML gateway webapp as described in config.py'
</message>
- <!-- The war file can be included in the OpenDS archive -->
+ <!-- The war file can be included in the OpenDJ archive -->
<script>
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
DSML_WARPATH = '%s/dsml/%s/addons/DSML.war' % (local.temp,OPENDSNAME)
</script>
@@ -521,9 +521,9 @@
}
</call>
- <!-- The war file can be included in the OpenDS archive -->
+ <!-- The war file can be included in the OpenDJ archive -->
<script>
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
DSML_WARPATH = '%s/dsml/%s/addons/DSML.war' % (local.temp,OPENDSNAME)
</script>
<call function="'runSTAFCommand'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index 128ad38..0895736 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<stax>
@@ -139,7 +140,7 @@
</call>
<call function="'runSTAFCommand'">
- { 'name' : 'Extract OpenDS ZIP file',
+ { 'name' : 'Extract OpenDJ ZIP file',
'location' : STAF_REMOTE_HOSTNAME,
'service' : 'ZIP',
'request' : 'UNZIP',
@@ -151,7 +152,7 @@
<call function="'checktestRC'">
{ 'returncode' : RC,
'expected' : 0,
- 'result' : 'FAIL to unzip OpenDS ZIP file',
+ 'result' : 'FAIL to unzip OpenDJ ZIP file',
}
</call>
@@ -274,12 +275,12 @@
import LDAP entries and manage rejected and
skipped entries
#@TestPreamble
- #@TestStep Unzip OpenDS distribution
- Setup OpenDS with a LDIF file to import, and
+ #@TestStep Unzip OpenDJ distribution
+ Setup OpenDJ with a LDIF file to import, and
files for rejected and skipped entries
Check skipped and rejected entries
- Stop OpenDS
- Uninstall OpenDS
+ Stop OpenDJ
+ Uninstall OpenDJ
#@TestPostamble
#@TestResult PASS if all steps ran without errors
-->
@@ -499,7 +500,7 @@
</call>
<script>
- if PRODUCTNAME.startswith('OpenDS'):
+ if PRODUCTNAME.startswith('OpenDJ'):
if is_windows_platform(STAF_REMOTE_HOSTNAME):
expectedNb = 2
else:
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
index 0c71238..575bd8d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<stax>
@@ -104,7 +105,7 @@
}
</call>
<!-- 'opendmkPath' exists so we can continue -->
- <if expr="RC != 48 or not PRODUCTNAME.startswith('OpenDS')">
+ <if expr="RC != 48 or not PRODUCTNAME.startswith('OpenDJ')">
<sequence>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
index 4d885e2..c2eb2e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
@@ -116,7 +116,7 @@
test.plan.stress.default=import_ldif,ldap_operation,replication
verbose.mode=false
-product.name=OpenDS Directory Server
+product.name=OpenDJ
logs.uri=file://
tests.os.string=${os.name}
tests.jvm.string=${java.version}(${sun.arch.data.model} bits)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
index bb2a211..f614f29 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<stax>
<function name="createTopology">
@@ -452,8 +453,15 @@
'attribute' : 'TYPE'
}
</call>
+
+ <if expr="RC == 48">
+ <message>
+ 'OpenDMK jar %s not found.' % SNMP_OPENDMK_JARFILE
+ </message>
+ </if>
+
<!-- 'SNMP_OPENDMK_JARFILE' exists so we can continue with SNMP -->
- <if expr="RC != 48 or not PRODUCTNAME.startswith('OpenDS')">
+ <if expr="RC != 48 or not PRODUCTNAME.startswith('OpenDJ')">
<sequence>
<!--- Check if snmp java files are already compiled -->
<call function="'listFolderByExtension'" >
@@ -492,7 +500,7 @@
<!-- The jdmkrt.jar can be included in the OpenDS archive -->
<script>
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
SNMP_OPENDMK_JARFILE='%s/%s/addons/jdmkrt.jar' % (local.temp,OPENDSNAME)
</script>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
index fbff947..2fc743e 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2006-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 AS
! -->
<stax>
@@ -184,7 +185,7 @@
ServerPackage='%s/%s' % (ZIPPATH,ZIPNAME)
# The jdmkrt.jar can be included in the OpenDS archive
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
ServerSNMPJarFile='addons/jdmkrt.jar'
else:
ServerSNMPJarFile='%s' % SNMP_OPENDMK_JARFILE
@@ -250,7 +251,7 @@
<!-- Build the DSML Gateway Dictionary -->
<script>
# The war file can be included in the OpenDS archive
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
DSMLName='DSML.war'
DSMLPackage='addons/DSML.war'
else:
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
index 2661049..2e76c49 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2006-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 Forgerock AS
! -->
<stax>
<defaultcall function="main" />
@@ -50,7 +51,7 @@
my_info['os label']=TEST_OS_STRING
my_info['server package']='%s/%s' % (ZIPPATH,ZIPNAME)
# The jdmkrt.jar can be included in the OpenDS archive
- if not PRODUCTNAME.startswith('OpenDS'):
+ if not PRODUCTNAME.startswith('OpenDJ'):
my_info['snmp jarfile']='addons%s' % SNMP_OPENDMK_JARFILE
else:
my_info['snmp jarfile']=SNMP_OPENDMK_JARFILE
--
Gitblit v1.10.0