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/05/01 01:22:08 UTC
svn commit: r165439 - in /incubator/beehive/trunk/netui/test: ant/
dist-test/ dist-test/ant/ src/junitTests/ src/testRecorderQA/
Author: ekoneil
Date: Sat Apr 30 16:22:07 2005
New Revision: 165439
URL: http://svn.apache.org/viewcvs?rev=165439&view=rev
Log:
Cleanup NetUI test distribution's use of <property> elements and remove two .properties files. These have generally been consolidated into netui-test-imports.xml.
BB: self
DRT: Beehive pass / dist test pass
Added:
incubator/beehive/trunk/netui/test/ant/netui-test-imports.xml
- copied unchanged from r165421, incubator/beehive/trunk/netui/test/ant/test-imports.xml
incubator/beehive/trunk/netui/test/dist-test/ant/build.xml
- copied, changed from r165421, incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-test-imports.xml
- copied, changed from r165421, incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
Removed:
incubator/beehive/trunk/netui/test/ant/test-imports.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties
Modified:
incubator/beehive/trunk/netui/test/ant/build.xml
incubator/beehive/trunk/netui/test/ant/junitCore.xml
incubator/beehive/trunk/netui/test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
incubator/beehive/trunk/netui/test/dist-test/build.xml
incubator/beehive/trunk/netui/test/src/junitTests/build.xml
incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
Modified: incubator/beehive/trunk/netui/test/ant/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/build.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/build.xml Sat Apr 30 16:22:07 2005
@@ -2,7 +2,7 @@
<project name="Beehive/NetUI/Test" default="drt" basedir=".">
- <import file="test-imports.xml"/>
+ <import file="netui-test-imports.xml"/>
<property name="drt.testResults.dir" location="${beehive.home}/netui/build/drt.testResults"/>
<property name="bvt.testResults.dir" location="${beehive.home}/netui/build/bvt.testResults"/>
Modified: incubator/beehive/trunk/netui/test/ant/junitCore.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/junitCore.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junitCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junitCore.xml Sat Apr 30 16:22:07 2005
@@ -2,7 +2,7 @@
<project name="Beehive/NetUI/JUnitTests" basedir=".">
- <import file="test-imports.xml"/>
+ <import file="netui-test-imports.xml"/>
<path id="test.classpath">
<path refid="junit-tests.dependency.path"/>
Modified: incubator/beehive/trunk/netui/test/ant/testRecorder.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorder.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Sat Apr 30 16:22:07 2005
@@ -3,7 +3,7 @@
<project name="Beehive/NetUI/TestRecorder" default="" basedir=".">
<import file="../../netui-imports.xml"/>
- <import file="test-imports.xml"/>
+ <import file="netui-test-imports.xml"/>
<property name="_testRecorder.base.dir" location="${build.dir}/testRecorder"/>
<property name="_test.config.dir" location="${test.dir}/conf"/>
Copied: incubator/beehive/trunk/netui/test/dist-test/ant/build.xml (from r165421, incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/build.xml?p2=incubator/beehive/trunk/netui/test/dist-test/ant/build.xml&p1=incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml&r1=165421&r2=165439&rev=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/build.xml Sat Apr 30 16:22:07 2005
@@ -7,7 +7,7 @@
<project name="Beehive/NetUI/distribution-test" default="usage" basedir=".">
<import file="../test-imports.xml"/>
- <import file="${test.home}/netui/ant/test-imports.xml"/>
+ <import file="ant/netui-test-imports.xml"/>
<!-- ================================================================ -->
<!-- -->
@@ -164,13 +164,11 @@
<!-- ================================================================ -->
<target name="junit.test" description="Run JUnit test suite">
-<!--
<ant dir="ant" antfile="junitCore.xml" target="run.tests" inheritAll="false">
<property name="testout.dir" location="${testResults.dir}"/>
<property name="formatter.type" value="xml"/>
<property name="fail" value="${fail}"/>
</ant>
--->
</target>
<!-- ================================================================ -->
Copied: incubator/beehive/trunk/netui/test/dist-test/ant/netui-test-imports.xml (from r165421, incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/netui-test-imports.xml?p2=incubator/beehive/trunk/netui/test/dist-test/ant/netui-test-imports.xml&p1=incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml&r1=165421&r2=165439&rev=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/netui-test-imports.xml Sat Apr 30 16:22:07 2005
@@ -6,9 +6,8 @@
<import file="../../test-imports.xml"/>
<property name="test.dir" location="${test.home}/netui"/>
-
- <property file="netui-test.properties"/>
-
+ <property name="log4jconfig.verbose.junit" location="${test.dir}/conf/junitLogCfgVerbose.xml"/>
+ <property name="log4jconfig.junit" location="${test.dir}/conf/junitLogCfg.xml"/>
<property name="netui.ant.dir" location="${test.dir}/ant"/>
<property name="jsf.dir" location="${test.dir}/jsf/myfaces-1.0.7"/>
<property name="struts11.dir" location="${test.dir}/struts/struts1.1"/>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml Sat Apr 30 16:22:07 2005
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
<project name="Beehive/NetUI/TestRecorder" default="" basedir=".">
+
<import file="../../test-imports.xml"/>
- <import file="test-imports.xml"/>
+ <import file="netui-test-imports.xml"/>
<property name="_testRecorder.base.dir" location="${build.dir}/testRecorder"/>
<property name="_test.config.dir" location="${test.dir}/conf"/>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Sat Apr 30 16:22:07 2005
@@ -8,10 +8,15 @@
<project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir=".">
<import file="../../test-imports.xml"/>
- <import file="test-imports.xml"/>
+ <import file="netui-test-imports.xml"/>
<property file="${test.home}/netui/ant/webapp.properties"/>
+
<property name="testRecorder.config.name" value="netui-server-drt-config"/>
+ <property name="webapp.waitfor.url" value="http://localhost:8080/${webapp.name}"/>
+
+ <property name="_testRecorder.base.dir" location="${build.dir}/testRecorder"/>
+ <property name="webapp.dir" location="${build.dir}/webapps/${webapp.name}"/>
<!-- ================================================================ -->
<!-- -->
Modified: incubator/beehive/trunk/netui/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/build.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/build.xml Sat Apr 30 16:22:07 2005
@@ -2,7 +2,7 @@
<project name="Beehive/NetUI/BuildTestDist" default="usage" basedir=".">
- <import file="../ant/test-imports.xml"/>
+ <import file="../ant/netui-test-imports.xml"/>
<!-- ========================================= -->
<!-- Targets for building the standalone test -->
@@ -11,6 +11,7 @@
<target name="build.tests" description="Build all netui tests">
<property name="test.dist.base.dir" value="${build.dir}/test-dist"/>
+
<!-- Build the Junit tests -->
<ant antfile="${test.dir}/ant/build.xml" target="test.build" inheritAll="false"/>
</target>
@@ -27,16 +28,13 @@
<mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui"/>
<mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui/struts"/>
- <copy file="${test.dir}/dist-test/ant/netui-build.xml" tofile="${test.dist.base.dir}/beehive-test-dist/netui/build.xml"/>
+ <copy file="${test.dir}/dist-test/ant/build.xml" tofile="${test.dist.base.dir}/beehive-test-dist/netui/build.xml"/>
<copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant">
- <fileset dir="${test.dir}/dist-test/ant" includes="webapp.properties,netui-test.properties,testRecorder.xml,test-imports.xml,testWebBuild.xml"/>
+ <fileset dir="${test.dir}/dist-test/ant" includes="**"/>
</copy>
- <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant">
- <fileset dir="${test.dir}/ant"
- includes="junitCore.xml"/>
- </copy>
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant" file="${test.dir}/ant/junitCore.xml"/>
<!-- Get test webs -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/netui/webapps/coreWeb">
Modified: incubator/beehive/trunk/netui/test/src/junitTests/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/build.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/build.xml (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/build.xml Sat Apr 30 16:22:07 2005
@@ -2,7 +2,7 @@
<project name="Beehive/NetUI/JUnitTests" default="build" basedir=".">
- <import file="../../ant/test-imports.xml"/>
+ <import file="../../ant/netui-test-imports.xml"/>
<property name="module.name" value="junitTests"/>
<property name="module.dir" location="${test.src.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml?rev=165439&r1=165438&r2=165439&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml (original)
+++ incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Sat Apr 30 16:22:07 2005
@@ -2,7 +2,7 @@
<project name="Beehive/NetUI/testRecorderQa" default="build" basedir=".">
- <import file="../../ant/test-imports.xml"/>
+ <import file="../../ant/netui-test-imports.xml"/>
<property name="module.name" value="testRecorderQA"/>
<property name="module.dir" location="${test.src.dir}/${module.name}"/>