You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/19 22:00:21 UTC
svn commit: r290252 - in /beehive/trunk: controls/test/dist-test/
controls/test/dist-test/common/ controls/test/dist-test/files/
controls/test/dist-test/files/common/
controls/test/dist-test/files/webapps/ controls/test/webapps/
netui/src/testRecorder/...
Author: ekoneil
Date: Mon Sep 19 13:00:15 2005
New Revision: 290252
URL: http://svn.apache.org/viewcvs?rev=290252&view=rev
Log:
More controls test infrastructure cleanup.
Rearranging the dist-test/common directory so it's called dist-test/files and contains the Ant files exactly as they would be laid down in the dist-test. This just makes it easier to debug.
BB: self
DRT: Controls / dist-test pass
Added:
beehive/trunk/controls/test/dist-test/files/
- copied from r289648, beehive/trunk/controls/test/dist-test/common/
beehive/trunk/controls/test/dist-test/files/build.xml
- copied unchanged from r290151, beehive/trunk/controls/test/dist-test/common/run-test-build.xml
beehive/trunk/controls/test/dist-test/files/common/
beehive/trunk/controls/test/dist-test/files/common/controls-test-imports.xml
- copied unchanged from r290006, beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
beehive/trunk/controls/test/dist-test/files/common/path.properties
- copied unchanged from r290151, beehive/trunk/controls/test/dist-test/common/path.properties
beehive/trunk/controls/test/dist-test/files/webapps/
beehive/trunk/controls/test/dist-test/files/webapps/build.xml
- copied unchanged from r290151, beehive/trunk/controls/test/dist-test/common/controls-test-web.xml
Removed:
beehive/trunk/controls/test/dist-test/common/
beehive/trunk/controls/test/dist-test/files/controls-test-imports.xml
beehive/trunk/controls/test/dist-test/files/controls-test-web.xml
beehive/trunk/controls/test/dist-test/files/path.properties
beehive/trunk/controls/test/dist-test/files/run-test-build.xml
beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/ant/
Modified:
beehive/trunk/controls/test/dist-test/build.xml
beehive/trunk/controls/test/webapps/build.xml
beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java
Modified: beehive/trunk/controls/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/build.xml?rev=290252&r1=290251&r2=290252&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/build.xml (original)
+++ beehive/trunk/controls/test/dist-test/build.xml Mon Sep 19 13:00:15 2005
@@ -1,183 +1,85 @@
<?xml version="1.0"?>
-<project name="Beehive/Controls/BuildTestDist" default="useage" basedir=".">
+<project name="Beehive/Controls/TestDistBuild" default="usage" basedir=".">
<property environment="os"/>
-
- <property file="common/path.properties"/>
-
- <target name="usage">
- <echo message=""/>
- <echo message=""/>
- <echo message="Build Controls Test Distribution"/>
- <echo message="================================================================"/>
- <echo message="| Usage |"/>
- <echo message="================================================================"/>
- <echo message=" "/>
- <echo message="build.test - build/jar controls, drivers and junits classes. "/>
- <echo message="assemble.tests - put all the parts needed by the test together. "/>
- <echo message=""/>
- <echo message=""/>
- </target>
-
- <!-- ========================================= -->
- <!-- Targets for building the standalone test -->
- <!-- package for testing Beehive distribution. -->
- <!-- ========================================= -->
<target name="build.tests" description="Build all controls tests">
- <ant dir="../" antfile="build.xml" target="build" inheritAll="false"/>
+ <ant dir=".." antfile="build.xml" target="build" inheritAll="false"/>
</target>
- <target name="assemble.tests"
- description="Assemble all components for controls test distribution"
- depends="dirs">
+ <target name="assemble.tests" description="Assemble all components for controls test distribution">
<!-- Copy external jars required by controls tests to beehive-test-dist/controls/external -->
- <!-- beehive-antext jars -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/beehive-antext">
- <include name="*.jar" />
- </fileset>
+ <fileset dir="../../../external/httpunit" includes="*.jar"/>
+ <fileset dir="../../../external/jakarta" includes="*.jar"/>
+ <fileset dir="../../../external/junit" includes="*.jar"/>
+ <fileset dir="../../../external/servlet" includes="*.jar"/>
+ <fileset dir="../../../external/velocity" includes="*.jar"/>
+ <fileset dir="../../../external/beehive-antext" includes="*.jar"/>
+ <fileset file="../../../external/xmlbeans/apache-xbean.jar"/>
+ <fileset file="../../../installed/jsr173/jsr173_1.0_api.jar"/>
</copy>
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external/axis">
- <fileset dir="../../../wsm/external">
- <include name="*.jar" />
- </fileset>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external" file="../../../external/xmlbeans/apache-xbean.jar"/>
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external" file="../../../installed/jsr173/jsr173_1.0_api.jar"/>
-
- <!-- httpunit jars -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/httpunit">
- <include name="*.jar" />
- </fileset>
- </copy>
-
- <!-- jakarta.jar -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/jakarta">
- <include name="*.jar" />
- </fileset>
- </copy>
-
- <!-- junit jars -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/junit">
- <include name="*.jar" />
- </fileset>
+ <fileset dir="../../../wsm/external" includes="*.jar"/>
</copy>
- <!-- servlet jars -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/servlet">
- <include name="*.jar" />
- </fileset>
+ <!-- Copy internal tools from controls/test/infra to beehive-test-dist/controls/test/infra-->
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra">
+ <fileset dir="../infra" />
</copy>
- <!-- velocity jars -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/velocity">
- <include name="*.jar" />
- </fileset>
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test">
+ <fileset dir="files"/>
</copy>
- <!-- Copy internal tools from controls/test/infra to beehive-test-dist/controls/test/infra-->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra">
- <fileset dir="../infra" />
- </copy>
-
- <!-- Copy test jars -->
- <copy file="../build/controlstestbeans.jar"
- tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestbeans.jar"/>
- <copy file="../build/controlstestdrivers.jar"
- tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestdrivers.jar"/>
- <copy file="../build/controlstestjunits.jar"
- tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestjunits.jar"/>
-
- <!-- Copy test suites -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/cases">
- <fileset dir="../build/mantis.tch.cases" />
- </copy>
-
- <!-- Copy the web application to beehive-test-dist/controls/test/webapps-->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb">
- <fileset dir="../webapps/controlsWeb">
- <include name="**"/>
- <exclude name="**/*.jws"/>
- </fileset>
- </copy>
-
- <!-- Inject milton into controlsWeb-->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb/WEB-INF" overwrite="true">
- <fileset dir="../webapps/common/milton">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb" verbose="true" overwrite="true">
- <fileset dir="../webapps/common/milton">
- <include name="resources/**"/>
- </fileset>
- </copy>
-
- <!--Copy mantis generated tests-->
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb/WEB-INF/src/milton" verbose="true" overwrite="true">
- <fileset dir="../build/webapps/controlsWeb/WEB-INF/src/milton">
+ <!-- Copy test jars -->
+ <copy file="../build/controlstestbeans.jar"
+ tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestbeans.jar"/>
+ <copy file="../build/controlstestdrivers.jar"
+ tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestdrivers.jar"/>
+ <copy file="../build/controlstestjunits.jar"
+ tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/jars/controlstestjunits.jar"/>
+
+ <!-- Copy test suites -->
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/cases">
+ <fileset dir="../build/mantis.tch.cases" />
+ </copy>
+
+ <!-- Copy the web application to beehive-test-dist/controls/test/webapps-->
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb">
+ <fileset dir="../webapps/controlsWeb">
+ <include name="**"/>
<exclude name="**/*.jws"/>
</fileset>
- </copy>
-
- <!--Copy build script over/-->
- <copy file="common/run-test-build.xml" tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/build.xml"/>
- <copy file="common/path.properties" tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/common/path.properties"/>
- <copy file="common/controls-test-imports.xml" tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/common/controls-test-imports.xml"/>
- <copy file="common/controls-test-web.xml" tofile="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/build.xml"/>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Target to run all drt/bvt tests -->
- <!-- Not sure if we need this in controls test -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="run.tests" description="Run all tests">
- <available property="build.present" file="${build.dir}"/>
- <antcall target="clean"/>
- <antcall target="prepare.build"/>
-
- <antcall target="controls.tests"/>
- </target>
+ </copy>
- <target name="controls.tests" description="Run netui tests">
- <ant dir=".." antfile="build.xml" target="checkin.tests" inheritAll="false" />
- <ant dir=".." antfile="build.xml" target="detailed.tests" inheritAll="false" />
- </target>
+ <!-- Inject milton into controlsWeb-->
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb/WEB-INF" overwrite="true">
+ <fileset dir="../webapps/common/milton" includes="src/**"/>
+ </copy>
- <target name="clean" if="build.present" description="Clean webapp">
- <delete dir="${build.dir}"/>
- </target>
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb" verbose="true" overwrite="true">
+ <fileset dir="../webapps/common/milton" includes="resources/**"/>
+ </copy>
- <target name="prepare.build" if="build.present" description="Prepare test build area">
- <mkdir dir="build"/>
- <mkdir dir="build/webapps"/>
- <mkdir dir="build/testResults"/>
+ <!--Copy mantis generated tests-->
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps/controlsWeb/WEB-INF/src/milton" verbose="true" overwrite="true">
+ <fileset dir="../build/webapps/controlsWeb/WEB-INF/src/milton" includes="**/*.jws"/>
+ </copy>
</target>
- <target name="dirs">
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/external"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/common"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/jars"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/cases"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps"/>
+ <target name="usage">
+ <echo message="Build Controls Test Distribution"/>
+ <echo message="================================================================"/>
+ <echo message="| Usage |"/>
+ <echo message="================================================================"/>
+ <echo message=" "/>
+ <echo message="build.test - build/jar controls, drivers and junits classes. "/>
+ <echo message="assemble.tests - put all the parts needed by the test together. "/>
</target>
</project>
Modified: beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=290252&r1=290251&r2=290252&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Mon Sep 19 13:00:15 2005
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
+
<!--
- Copyright 2004 The Apache Software Foundation.
+ Copyright 2004 The Apache Software Foundation.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- $Header:$
- -->
+ $Header:$
+-->
<!--
===========================================================================
@@ -31,35 +32,35 @@
<import file="../../../beehive-imports.xml"/>
<property file="../common/path.properties"/>
-
+
<property name="server.root.url" value="http://localhost:8080"/>
<property name="webapp.waitfor.url" value="${server.root.url}/${controls.test.webapp.name}"/>
- <target name="usage">
- <echo message="" />
- <echo message="" />
- <echo message="web app build scripts for controls testing" />
- <echo message="================================================================" />
- <echo message="| Usage |" />
- <echo message="================================================================" />
- <echo message="" />
- <echo message="-------------------------------------------------------------------" />
- <echo message="| Standard Targets |" />
- <echo message="-------------------------------------------------------------------" />
- <echo message="build - inject latest netui artifacts and build controlsWeb, " />
- <echo message=" build controlsWeb includes compiling controls in the " />
- <echo message=" web app. " />
- <echo message="start - start app server"/>
- <echo message="stop - stop app server"/>
- <echo message="deploy - deploys a built webapp to a started app" />
- <echo message="" />
- <echo message="" />
- </target>
+ <target name="usage">
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="web app build scripts for controls testing"/>
+ <echo message="================================================================"/>
+ <echo message="| Usage |"/>
+ <echo message="================================================================"/>
+ <echo message=""/>
+ <echo message="-------------------------------------------------------------------"/>
+ <echo message="| Standard Targets |"/>
+ <echo message="-------------------------------------------------------------------"/>
+ <echo message="build - inject latest netui artifacts and build controlsWeb, "/>
+ <echo message=" build controlsWeb includes compiling controls in the "/>
+ <echo message=" web app. "/>
+ <echo message="start - start app server"/>
+ <echo message="stop - stop app server"/>
+ <echo message="deploy - deploys a built webapp to a started app"/>
+ <echo message=""/>
+ <echo message=""/>
+ </target>
<target name="-init">
<property name="webapp.build.dir" location="${build.dir}/${controls.webapp.dir.name}"/>
<property name="webapp.dir" location="${webapp.build.dir}/${controls.test.webapp.name}"/>
-
+
<available file="${webapp.dir}" property="webapp.dir.present"/>
<mkdir dir="${webapp.build.dir}"/>
@@ -67,41 +68,41 @@
<property file="${controls.test.webapp.root}/${controls.test.webapp.name}/app.properties"/>
<condition property="do.inject.netui">
- <istrue value="${app.inject.netui}"/>
+ <istrue value="${app.inject.netui}"/>
</condition>
<condition property="do.inject.wsm">
- <istrue value="${app.inject.wsm}"/>
- </condition>
+ <istrue value="${app.inject.wsm}"/>
+ </condition>
<condition property="do.inject.milton">
- <istrue value="${app.inject.milton}"/>
+ <istrue value="${app.inject.milton}"/>
</condition>
<condition property="do.inject.test.controls">
- <isset property="app.inject.test.controls"/>
+ <isset property="app.inject.test.controls"/>
</condition>
<condition property="do.inject.test.controls.src">
- <equals arg1="${app.inject.test.controls}" arg2="src"/>
+ <equals arg1="${app.inject.test.controls}" arg2="src"/>
</condition>
<condition property="do.inject.test.controls.jar">
- <equals arg1="${app.inject.test.controls}" arg2="jar"/>
+ <equals arg1="${app.inject.test.controls}" arg2="jar"/>
</condition>
<condition property="do.inject.test.drivers">
- <isset property="app.inject.test.drivers"/>
+ <isset property="app.inject.test.drivers"/>
</condition>
<condition property="do.inject.test.drivers.src">
- <equals arg1="${app.inject.test.drivers}" arg2="src"/>
+ <equals arg1="${app.inject.test.drivers}" arg2="src"/>
</condition>
<condition property="do.inject.test.drivers.jar">
- <equals arg1="${app.inject.test.drivers}" arg2="jar"/>
+ <equals arg1="${app.inject.test.drivers}" arg2="jar"/>
</condition>
<condition property="do.inject.test.systemcontrol.jars">
- <istrue value="${app.inject.systemcontrol.jars}"/>
+ <istrue value="${app.inject.systemcontrol.jars}"/>
</condition>
</target>
<!-- webapps are copied into a staging directory where additional build steps can be performed -->
<target name="stage.webapp" depends="-init">
<copy todir="${webapp.dir}" overwrite="true">
- <fileset dir="${controls.test.webapp.root}/${controls.test.webapp.name}"/>
+ <fileset dir="${controls.test.webapp.root}/${controls.test.webapp.name}"/>
</copy>
</target>
@@ -111,12 +112,11 @@
<!-- -->
<!-- ================================================================ -->
<target name="build" description="Build webapp" depends="-init">
- <echo message="-----------------------------------------------------"/>
+ <echo message="----------------------------------------------------------------------"/>
<echo message="| Beehive Controls ${controls.test.webapp.name} build starting |"/>
- <echo message="-----------------------------------------------------"/>
+ <echo message="----------------------------------------------------------------------"/>
- <!-- webapps are copied into a staging directory where additional build steps
- can be performed -->
+ <!-- webapps are copied into a staging directory where additional build steps can be performed -->
<antcall target="stage.webapp"/>
<antcall target="-inject.netui"/>
<antcall target="-inject.wsm"/>
@@ -150,7 +150,7 @@
<echo message="Injecting ${milton.jar} to ${controls.test.webapp.name}"/>
<mkdir dir="${webapp.dir}/WEB-INF/lib"/>
- <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib"
+ <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib"
overwrite="true" verbose="true"/>
<copy todir="${webapp.dir}/WEB-INF" verbose="true" overwrite="true">
@@ -183,8 +183,8 @@
<target name="-inject.test.controls.jar" if="do.inject.test.controls.jar">
<echo message="Injecting Controls Jar"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${controlstestbeans.jar}" verbose="true"
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${controlstestbeans.jar}" verbose="true"
overwrite="true"/>
</target>
@@ -192,7 +192,7 @@
<antcall target="-inject.test.drivers.src"/>
<antcall target="-inject.test.drivers.jar"/>
</target>
-
+
<target name="-inject.test.drivers.src" if="do.inject.test.drivers.src">
<echo message="Injecting Drivers Source"/>
<copy todir="${webapp.dir}/WEB-INF/src" overwrite="true" verbose="true">
@@ -205,8 +205,8 @@
<target name="-inject.test.drivers.jar" if="do.inject.test.drivers.jar">
<echo message="Injecting Drivers Jar"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${controlstestdrivers.jar}"
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${controlstestdrivers.jar}"
verbose="true" overwrite="true"/>
</target>
@@ -269,7 +269,8 @@
<start-server shmem="false" javaOptions="-ea:org.apache.beehive.netui..."/>
</target>
- <target name="start.with.shmem.asserts" description="Start server with asserts enabled for org.apache.beehive.netui">
+ <target name="start.with.shmem.asserts"
+ description="Start server with asserts enabled for org.apache.beehive.netui">
<start-server shmem="true" javaOptions="-ea:org.apache.beehive.netui..."/>
</target>
@@ -278,7 +279,8 @@
</target>
<target name="ensure.deployed" description="Deploy webapp for the test recorder">
- <echo>Ensuring that the webapp ${controls.test.webapp.name} is deployed on a running server at the url ${webapp.waitfor.url}</echo>
+ <echo>Ensuring that the webapp ${controls.test.webapp.name} is deployed on a running server at the url
+ ${webapp.waitfor.url}</echo>
<waitfor maxwait="5" maxwaitunit="second" timeoutproperty="unavailable">
<http url="${webapp.waitfor.url}"/>
Modified: beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java?rev=290252&r1=290251&r2=290252&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java (original)
+++ beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java Mon Sep 19 13:00:15 2005
@@ -125,7 +125,7 @@
aptArgs.add("-classpath");
if (LOGGER.isDebugEnabled())
- LOGGER.debug("Classpath: " + classpath.toString());
+ LOGGER.debug("Classpath: " + classpath);
aptArgs.add(classpath);