From f1525316829c9189821c8c88cebfe4e688912e4f Mon Sep 17 00:00:00 2001
From: madiot <madiot@localhost>
Date: Wed, 19 Mar 2008 17:59:31 +0000
Subject: [PATCH] implement DSML functional testing for the DSML gateway. - create a tests suite's external dependency directory as "opends/tests/ext". This holds for now externally built bits used for test suites. - dsmlService : in house built STAF service extension to perform DSML result comparaison. - download tomcat webcontainer from ant similarily to other STAF bits - added plumbing to enable the STAF's DSML service and enable the STAF's HTTP service in : - functional-tests.cfg - staf-installer.xml - add create a "dsml" testcase suite - dsml_setup.xml - create instance of directory server - installs a Tomcat webcontainer - deploys DSML gateway - dsml_test.xml - use the HTTP service to post DSML SOAP requests (TESTxyz.dat) - save results as file (TESTxyz.run) and compare the results from reference results (TESTxyz.res) via the dsmlService - dsml_cleanup.xml - stop directory and tomcat server - remove directory and tomcat server - related issue tacker : https://opends.dev.java.net/issues/show_bug.cgi?id=2485 remain to do : ----------------- - SSL - configure Tomcat to support HTTPS requests to the DSML gateway. - include the dsmlService.jar source inside the code repository's refactored build env and remove the locally built dsmlService.jar from opends/tests/ext - verify potential extra work to be done for windows platform
---
opends/tests/shared/functions/topology.xml | 106 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 40 deletions(-)
diff --git a/opends/tests/shared/functions/topology.xml b/opends/tests/shared/functions/topology.xml
index 5c14571..4f60510 100755
--- a/opends/tests/shared/functions/topology.xml
+++ b/opends/tests/shared/functions/topology.xml
@@ -85,45 +85,45 @@
</sequence>
</if>
</sequence>
- <else>
- <!-- MULTIPLE instance deployment: read parameters from
- topologyDescFile -->
- <sequence>
- <message>
- 'MULTIPLE instance deployment: read parameters from %s' \
- % topologyDescFile
- </message>
-
- <!-- Parse the topology description file and set
- _topologyServerList -->
- <call function="'readTopology'">
- { 'file' : topologyDescFile }
- </call>
-
- <message>
- 'Number of server instances required by the deployment: %s' \
- % len(_topologyServerList)
- </message>
-
- <iterate var="server" in="_topologyServerList">
- <sequence>
- <!-- Create the instance-->
- <call function="'createInstance'">
- { 'dsHost' : server.getHostname(),
- 'dsDir' : server.getDir(),
- 'dsPort' : server.getPort(),
- 'dsSslPort' : server.getSslPort(),
- 'dsJmxPort' : server.getJmxPort(),
- 'dsBindDN' : server.getRootDn(),
- 'dsBindPwd' : server.getRootPwd(),
- 'dsBaseDN' : server.getBaseDn()
- }
- </call>
-
- </sequence>
- </iterate>
- </sequence>
- </else>
+ <else>
+ <!-- MULTIPLE instance deployment: read parameters from
+ topologyDescFile -->
+ <sequence>
+ <message>
+ 'MULTIPLE instance deployment: read parameters from %s' \
+ % topologyDescFile
+ </message>
+
+ <!-- Parse the topology description file and set
+ _topologyServerList -->
+ <call function="'readTopology'">
+ { 'file' : topologyDescFile }
+ </call>
+
+ <message>
+ 'Number of server instances required by the deployment: %s' \
+ % len(_topologyServerList)
+ </message>
+
+ <iterate var="server" in="_topologyServerList">
+ <sequence>
+ <!-- Create the instance-->
+ <call function="'createInstance'">
+ { 'dsHost' : server.getHostname(),
+ 'dsDir' : server.getDir(),
+ 'dsPort' : server.getPort(),
+ 'dsSslPort' : server.getSslPort(),
+ 'dsJmxPort' : server.getJmxPort(),
+ 'dsBindDN' : server.getRootDn(),
+ 'dsBindPwd' : server.getRootPwd(),
+ 'dsBaseDN' : server.getBaseDn()
+ }
+ </call>
+
+ </sequence>
+ </iterate>
+ </sequence>
+ </else>
</if>
</sequence>
</function>
@@ -145,6 +145,14 @@
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
+ <function-arg-def name="fileExtensions"
+ type="optional"
+ default="[]">
+ <function-arg-description>
+ Specifies a list of file extension to add to testdata.zip
+ </function-arg-description>
+ <function-arg-property name="type" value="list"/>
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- ON LOCAL HOST: get data ready to copy to remote host -->
@@ -178,6 +186,24 @@
}
</call>
+ <if expr="len(fileExtensions) > 0">
+ <iterate var="ft" in="fileExtensions">
+ <sequence>
+ <!-- add file extension test data files -->
+ <message>
+ 'Copy %s data files locally to %s.' % (ft,localTestsGroupDir)
+ </message>
+ <call function="'CopyFolderByExtension'">
+ { 'location' : STAXServiceMachine,
+ 'srcfolder' : testsGroupDir,
+ 'destfolder' : localTestsGroupDir,
+ 'extension' : '%s' % ft
+ }
+ </call>
+ </sequence>
+ </iterate>
+ </if>
+
<!-- LDIF (.ldif) files for quickinstall -->
<script>
quickStartGroupDir='%s/%s/quickstart' % (TESTS_DIR,relativeDataDir)
@@ -906,7 +932,7 @@
</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>
Expected return code value. Default value is 0.
--
Gitblit v1.10.0