svn commit: r344937 - in /beehive/trunk/netui/test: ant/testRecorderCore.xml webapps/drt/build.xml

[ek...@apache.org]

Author: ekoneil
Date: Tue Nov 15 22:47:15 2005
New Revision: 344937

URL: http://svn.apache.org/viewcvs?rev=344937&view=rev
Log:
Implement the ability to override the default TR callback Ant file; the default was (is) build.xml but can be overridden by passing something like:

  <property name="app.build.file" value="fooBuild.xml"/>

Note, the "value" part above is important as it will be used as-is instead of expanded into a fully qualified path as the "location" attribute would be.

BB: self
Test: NetUI DRT and BVT both pass


Modified:
    beehive/trunk/netui/test/ant/testRecorderCore.xml
    beehive/trunk/netui/test/webapps/drt/build.xml

Modified: beehive/trunk/netui/test/ant/testRecorderCore.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/ant/testRecorderCore.xml?rev=344937&r1=344936&r2=344937&view=diff
==============================================================================
--- beehive/trunk/netui/test/ant/testRecorderCore.xml (original)
+++ beehive/trunk/netui/test/ant/testRecorderCore.xml Tue Nov 15 22:47:15 2005
@@ -115,10 +115,18 @@
      -->
     <target name="server.test" description="Runs Test Recorder regression tests">
         <echo>Start a NetUI test recorder tests</echo>
-        <echo>Run callbacks to application build file ${app.build.dir}/build.xml</echo>
+
+        <condition property="_app.build.file" value="${app.build.file}">
+            <isset property="app.build.file"/>
+        </condition>
+        <condition property="_app.build.file" value="build.xml">
+            <not><isset property="app.build.file"/></not>
+        </condition>
+
+        <echo>Run callbacks to application build file ${app.build.dir}/${_app.build.file}</echo>
 
         <parallel>
-            <ant dir="${app.build.dir}" antfile="build.xml" target="start" inheritAll="false"/>
+            <ant dir="${app.build.dir}" antfile="${_app.build.file}" target="start" inheritAll="false"/>
             <sequential>
                 <echo>Wait ${_server.maxWait} seconds for server to start at URL: ${waitfor.url}</echo>
 
@@ -130,7 +138,7 @@
                      callback to the application build file to give the application an opportunity to 
                      ensure that it has been deployed before starting to run tests against it 
                   -->
-                <ant dir="${app.build.dir}" antfile="build.xml" target="ensure.deployed" inheritAll="false"/>
+                <ant dir="${app.build.dir}" antfile="${_app.build.file}" target="ensure.deployed" inheritAll="false"/>
 
                 <echo>Start Playback with playback target: ${playback.target}</echo>
 
@@ -138,7 +146,7 @@
                 <antcall target="_override.callback"/>
 
                 <echo>stopping server...</echo>
-                <ant dir="${app.build.dir}" antfile="build.xml" target="stop" inheritAll="false"/>
+                <ant dir="${app.build.dir}" antfile="${_app.build.file}" target="stop" inheritAll="false"/>
                 <echo>...server stopped</echo>
             </sequential>
         </parallel>
@@ -161,8 +169,8 @@
         app.build.file == 
       -->
     <target name="stop.server" if="cc.mode">
-        <echo>Stop the server with the 'stop' target in this build file: ${app.build.file}</echo>
-        <ant dir="${app.build.dir}" antfile="build.xml" target="stop"/>
+        <echo>Stop the server with the 'stop' target in this build file: ${_app.build.file}</echo>
+        <ant dir="${app.build.dir}" antfile="${_app.build.file}" target="stop"/>
     </target>
 
     <!--
@@ -427,9 +435,10 @@
         playback.target:
       -->
     <target name="_override.callback" if="playback.target">
-        <echo>app.build.file: ${app.build.file}</echo>
+        <echo>app.build.dir: ${app.build.dir}</echo>
+        <echo>app.build.file: ${_app.build.file}</echo>
         <echo>playback.target: ${playback.target}</echo>
-        <ant dir="${app.build.dir}" antfile="build.xml" target="${playback.target}"/>
+        <ant dir="${app.build.dir}" antfile="${_app.build.file}" target="${playback.target}"/>
     </target>
 
     <!-- 

Modified: beehive/trunk/netui/test/webapps/drt/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.xml?rev=344937&r1=344936&r2=344937&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/build.xml Tue Nov 15 22:47:15 2005
@@ -191,6 +191,7 @@
         <antcall target="build"/>
         <ant dir="${testrecorder.dir}" antfile="testRecorder.xml" inheritAll="false" target="server.test">
             <property name="app.build.dir" location="${basedir}"/>
+            <property name="app.build.file" value="build.xml"/>
             <property name="waitfor.url" value="${server.root.url}"/>
             <property name="suite.name" value="drt"/>
             <property name="playback.webapps" value="${webapp.name}"/>