Author: ekoneil Date: Thu Dec 2 12:38:24 2004 New Revision: 109538 URL: http://svn.apache.org/viewcvs?view=rev&rev=109538 Log: Test recorder Ant runtime fixes.
BB: self DRT: NetUI pass Modified: incubator/beehive/trunk/netui/test/ant/buildWebapp.xml incubator/beehive/trunk/netui/test/ant/testRecorder.xml incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Modified: incubator/beehive/trunk/netui/test/ant/buildWebapp.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/buildWebapp.xml?view=diff&rev=109538&p1=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r1=109537&p2=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r2=109538 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/buildWebapp.xml (original) +++ incubator/beehive/trunk/netui/test/ant/buildWebapp.xml Thu Dec 2 12:38:24 2004 @@ -4,8 +4,8 @@ <property environment="os"/> <property file="${os.BEEHIVE_HOME}/beehive.properties"/> - <property file="test.properties"/> <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/> + <property file="test.properties"/> <!-- ================================================================ --> <!-- --> @@ -31,6 +31,10 @@ <!-- ================================================================ --> <!-- params (location webapp.dir, value testRecorder.config.name) --> <target name="deploy.testrecorder" if="include.testrecorder" description="Deploy the test recorder to a webapp"> + + <available property="testrecorder.available" file="${test-recorder.jar}"/> + <antcall target="build.testrecorder"/> + <echo>Deploying the test recorder to webapp at root: ${webapp.dir}</echo> <ant antfile="${test.dir}/ant/testRecorder.xml" target="build.config.jar" inheritAll="false"> @@ -54,6 +58,10 @@ <ant antfile="${test.dir}/ant/testRecorder.xml" target="undeploy" inheritAll="false"> <property name="webapp.dir" location="${webapp.dir}"/> </ant> + </target> + + <target name="build.testrecorder" unless="testrecorder.available"> + <ant dir="${test.dir}/src/testRecorder" antfile="build.xml" target="build" inheritAll="false"/> </target> </project> Modified: incubator/beehive/trunk/netui/test/ant/testRecorder.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorder.xml?view=diff&rev=109538&p1=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r1=109537&p2=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r2=109538 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original) +++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Thu Dec 2 12:38:24 2004 @@ -7,7 +7,6 @@ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/> <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/> - <property name="_junitReport.ant" location="${test.dir}/ant/junitReport.xml"/> <property name="_testRecorder.base.dir" location="${build.dir}/testRecorder"/> <property name="_testRecorder.resource.dir" location="${test.src.dir}/testRecorder/jsp"/> @@ -32,5 +31,15 @@ <property name="testRecorder.build.dir" location="${test.dir}/src/testRecorder"/> <import file="testRecorderCore.xml"/> + + <target name="generate.report"> + <!-- build a report --> + <junitreport todir="${report.dir}/"> + <fileset dir="${report.dir}/"> + <include name="TEST-*.xml"/> + </fileset> + <report format="noframes" todir="${report.dir}/html"/> + </junitreport> + </target> </project> Modified: incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml?view=diff&rev=109538&p1=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r1=109537&p2=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r2=109538 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml (original) +++ incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Thu Dec 2 12:38:24 2004 @@ -256,13 +256,9 @@ <mkdir dir="${_report.dir}/html"/> - <!-- build a report --> - <junitreport todir="${_report.dir}/"> - <fileset dir="${_report.dir}/"> - <include name="TEST-*.xml"/> - </fileset> - <report format="noframes" todir="${_report.dir}/html"/> - </junitreport> + <antcall target="generate.report"> + <param name="report.dir" location="${_report.dir}"/> + </antcall> <delete> <fileset dir="${_report.dir}"> @@ -313,7 +309,7 @@ webapp.dir: the webapp into which to deploy the testRecorder testRecorder.config.name: the name to use when building the test recorder configuration JAR --> - <target name="deployTestRecorder" depends="build" description="Deploy the Test Recorder artifacts to the specified web app"> + <target name="deployTestRecorder" description="Deploy the Test Recorder artifacts to the specified web app"> <echo>webapp.dir: ${webapp.dir}</echo> <echo>testRecorder.config.name: ${testRecorder.config.name}</echo> @@ -356,16 +352,6 @@ <include name="*.inc"/> </fileset> </delete> - </target> - - <!-- Build the test recorder --> - <target name="build" description="build the Test Recorder module"> - <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="build" inheritAll="false"/> - </target> - - <!-- Clean the test recorder --> - <target name="clean" description="clean the Test Recorder module"> - <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="clean" inheritAll="false"/> </target> <!--
