Hi,
I have a set of fixes for the test recorder and webapp build files that removes unused properties associated with the test recorder. The diffs are attached.
Thanks, Patrick.
Index: netui/test/webapps/testRecorder-test/build.xml
===================================================================
--- netui/test/webapps/testRecorder-test/build.xml (revision 54023)
+++ netui/test/webapps/testRecorder-test/build.xml (working copy)
@@ -57,13 +57,11 @@
<!-- ================================================================ -->
<target name="playback" description="Playback a specified list of test
recorder tests">
<ant antfile="${test.dir}/ant/testRecorder.xml" target="playback"
inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
</ant>
</target>
<target name="test.running" description="Playback the 'test' category to a
running server">
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="test"/>
<property name="playback.webapps" value="testRecorder"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
@@ -74,7 +72,6 @@
<ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false"
target="server.test">
<property name="app.build.file"
location="${app.dir}/testRecorder-test/build.xml"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="test"/>
<property name="playback.webapps" value="testRecorder"/>
<property name="drt.mode" value="true"/>
Index: netui/test/webapps/jsf/build.xml
===================================================================
--- netui/test/webapps/jsf/build.xml (revision 54023)
+++ netui/test/webapps/jsf/build.xml (working copy)
@@ -72,13 +72,11 @@
<!-- ================================================================ -->
<target name="playback" description="Playback a specified list of test
recorder tests">
<ant antfile="${test.dir}/ant/testRecorder.xml" target="playback"
inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
</ant>
</target>
<target name="drt.running" description="Playback the 'drt' category to a
running server">
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="drt"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
@@ -88,7 +86,6 @@
<target name="drt" description="Run the drt suite with full server start /
stop support.">
<ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false"
target="server.test">
<property name="app.build.file"
location="${app.dir}/jsf/build.xml"/>
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="drt"/>
<property name="drt.mode" value="true"/>
<property name="playback.webapps" value="${webapp.name}"/>
Index: netui/test/webapps/drt/build.xml
===================================================================
--- netui/test/webapps/drt/build.xml (revision 54023)
+++ netui/test/webapps/drt/build.xml (working copy)
@@ -101,14 +101,12 @@
<!-- ================================================================ -->
<target name="playback" description="Playback a specified list of test
recorder tests">
<ant antfile="${test.dir}/ant/testRecorder.xml" target="playback"
inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="playback.webapps" value="${webapp.name}"/>
</ant>
</target>
<target name="drt.running" description="Playback the 'drt' category to a
running server">
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="drt"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
@@ -117,7 +115,6 @@
<target name="bvt.running" description="Playback the 'bvt' category to a
running server">
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="bvt"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
@@ -128,7 +125,6 @@
<ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml"
inheritAll="false" target="server.test">
<property name="app.build.file"
location="${app.dir}/drt/build.xml"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="drt"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="drt.mode" value="true"/>
@@ -139,7 +135,6 @@
<ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false"
target="server.test">
<property name="app.build.file"
location="${app.dir}/drt/build.xml"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="bvt"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="drt.mode" value="true"/>
@@ -148,7 +143,6 @@
<target name="suite.running" description="Playback a test recorder test
suite against a running server">
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
- <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="${suite.name}"/>
<property name="waitfor.url" value="${webapp.waitfor.url}"/>
<property name="playback.webapps" value="${webapp.name}"/>
Index: netui/test/ant/testRecorderCore.xml
===================================================================
--- netui/test/ant/testRecorderCore.xml (revision 54023)
+++ netui/test/ant/testRecorderCore.xml (working copy)
@@ -93,22 +93,13 @@
In DRT mode, the server does not stop on failure.
app.build.file == the build file to use for cleaning and deploying
the
application and starting and stopping the server.
- testRecorder.config.name ==
- playback.target ==
+ playback.target ==
-->
<target name="server.test" description="Runs Test Recorder regression
tests">
<ant target="clean" antfile="${app.build.file}"/>
<ant target="build" antfile="${app.build.file}"/>
- <echo>testRecorder.config.name: ${testRecorder.config.name}</echo>
- <property name="_config.jar"
value="${_testRecorder.config.dir}/${testRecorder.config.name}.jar"/>
-
- <echo>config.jar: ${_config.jar}</echo>
-
- <available property="config.jar.available" file="${_config.jar}"/>
- <fail unless="config.jar.available" message="Can't find a test
recorder config JAR at ${_config.jar} to copy"/>
-
<echo>Start a NetUI test server</echo>
<parallel>
@@ -233,20 +224,14 @@
</or>
</condition>
- <echo>config.jar: ${_config.jar}</echo>
<echo>log4j.config: ${_log4j.config}</echo>
<echo>playback list: ${_list}</echo>
<echo>playback categories: ${_categories}</echo>
<echo>playback webapps: ${playback.webapps}</echo>
- <echo>playback config jar: ${_config.jar}</echo>
+ <echo>delete results: ${_results.delete}</echo>
- <path id="_this.test.recorder.classpath">
- <path refid="test.recorder.classpath"/>
- <pathelement path="${_config.jar}"/>
- </path>
-
<junit dir="${netui.ant.dir}" fork="true"
errorproperty="playback.drt.error" failureproperty="playback.drt.failure"
showoutput="true">
- <classpath refid="_this.test.recorder.classpath"/>
+ <classpath refid="test.recorder.classpath"/>
<sysproperty key="test.recorder.run.webapps"
value="${playback.webapps}"/>
<formatter type="${formatter.type}"
usefile="${formatter.usefile}"/>
@@ -293,19 +278,9 @@
</target>
<!--
- testRecorder.config.name:
-->
<target name="playback" description="Plays back a list of pre-recorded
tests, set the 'playback.list' property to specify a list of tests.">
- <fail unless="testRecorder.config.name" message="No test recorder
config name (property: 'testRecorder.config.name') specified"/>
- <echo>testRecorder.config.name: ${testRecorder.config.name}</echo>
-
- <property name="_config.jar"
location="${_testRecorder.config.dir}/${testRecorder.config.name}.jar"/>
- <echo>_config.jar: ${_config.jar}</echo>
-
- <available property="config.jar.available" file="${_config.jar}"/>
- <fail unless="config.jar.available" message="Can't find a test
recorder config JAR at ${_config.jar} to copy"/>
-
<antcall target="playback.tests">
<param name="formatter.type" value="plain"/>
<param name="formatter.usefile" value="false"/>
@@ -381,7 +356,6 @@
<fileset dir="${webapp.dir}/testRecorder">
<include name="*.jsp"/>
<include name="*.inc"/>
- <include name="testResults/*.*"/>
</fileset>
</delete>
</target>
@@ -469,18 +443,12 @@
suite of tests to execute.
suite.name:
- testRecorder.config.name:
waitfor.url:
playback.webapps:
-->
<target name="suite.callback" description="Run a Test Recorder test suite">
<fail unless="suite.name" message="No test suite name specified, set
the -Dsuite.name=<name> property"/>
- <!-- set the path to the config.jar file read by the test recorder -->
- <condition property="_config.jar"
value="${_testRecorder.config.dir}/${testRecorder.config.name}.jar">
- <not><isset property="${_config.jar}"/></not>
- </condition>
-
<!-- ensure that the application is running where it is supposed to be
given the provided "waitfor.url" -->
<waitfor maxwait="5" maxwaitunit="second"
timeoutproperty="unavailable">
<http url="${waitfor.url}"/>
