Author: ekoneil Date: Tue Dec 7 11:22:19 2004 New Revision: 110145 URL: http://svn.apache.org/viewcvs?view=rev&rev=110145 Log: Various build fixes to support running the NetUI tests against a Beehive installer.
BB: self DRT: NetUI pass Added: incubator/beehive/trunk/netui/test/ant/junitCore.xml (contents, props changed) Modified: incubator/beehive/trunk/netui/ant/netui.properties incubator/beehive/trunk/netui/test/ant/build.xml incubator/beehive/trunk/netui/test/ant/test.properties incubator/beehive/trunk/netui/test/ant/testRecorder.xml incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Modified: incubator/beehive/trunk/netui/ant/netui.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&rev=110145&p1=incubator/beehive/trunk/netui/ant/netui.properties&r1=110144&p2=incubator/beehive/trunk/netui/ant/netui.properties&r2=110145 ============================================================================== --- incubator/beehive/trunk/netui/ant/netui.properties (original) +++ incubator/beehive/trunk/netui/ant/netui.properties Tue Dec 7 11:22:19 2004 @@ -103,7 +103,7 @@ # --------------------------------------------------------------------------------- # -# NetUI build artifact JAR and resource names / paths +# NetUI build artifact JAR and resource names # # --------------------------------------------------------------------------------- @@ -134,7 +134,7 @@ # --------------------------------------------------------------------------------- # -# NetUI distribution JARs (the build creates these files) +# NetUI distribution JAR paths (the build creates these files) # # --------------------------------------------------------------------------------- Modified: incubator/beehive/trunk/netui/test/ant/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/build.xml?view=diff&rev=110145&p1=incubator/beehive/trunk/netui/test/ant/build.xml&r1=110144&p2=incubator/beehive/trunk/netui/test/ant/build.xml&r2=110145 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/build.xml (original) +++ incubator/beehive/trunk/netui/test/ant/build.xml Tue Dec 7 11:22:19 2004 @@ -14,19 +14,19 @@ <!-- ============================================= --> <!-- Build Targets --> <!-- ============================================= --> - <target name="build" depends="prepare" description="Build the QA modules"> - <antcall target="do.subant"> + <target name="test.build" depends="prepare" description="Build the QA modules"> + <antcall target="test.do.subant"> <param name="target.name" value="build"/> </antcall> </target> - <target name="clean" description="Clean the QA modules"> - <antcall target="do.subant"> + <target name="test.clean" description="Clean the QA modules"> + <antcall target="test.do.subant"> <param name="target.name" value="clean"/> </antcall> </target> - <target name="do.subant"> + <target name="test.do.subant"> <subant target="${target.name}"> <filelist dir="${test.src.dir}"> <file name="junitTests"/> @@ -36,29 +36,8 @@ </subant> </target> - <!-- ============================================= --> - <!-- Test Suite Targets --> - <!-- ============================================= --> - <path id="test.classpath"> - <pathelement path="${junit-tests.jar}"/> - <fileset dir="${webappTemplate.webinf.lib}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${junit.jar}"/> - <pathelement path="${servlet24.jar}"/> - <pathelement path="${jsp20.jar}"/> - <pathelement path="${testBeans.jar}"/> - <pathelement path="${fauxServlet.jar}"/> - </path> - - <!-- Internal target used to clean and build the QA modules --> - <target name="test.rebuild"> - <ant target="clean" inheritAll="false"/> - <ant target="build" inheritAll="false"/> - </target> - <!-- Run the NetUI DRTs --> - <target name="drt" depends="test.rebuild,junit.drt" description="Run the NetUI JUnit DRTs"/> + <target name="drt" depends="test.clean,test.build,junit.drt" description="Run the NetUI JUnit DRTs"/> <target name="junit.drt"> <property name="formatter.type" value="xml"/> @@ -76,69 +55,6 @@ <antcall target="run.tests"/> </target> - <target name="run.tests"> - <property name="show.output" value="false"/> - - <condition property="log4j.config" value="${log4jconfig.verbose.junit}"> - <not><isset property="log4j.quiet"/></not> - </condition> - <condition property="log4j.config" value="${log4jconfig.junit}"> - <and><isset property="log4j.quiet"/></and> - </condition> - - <echo>log4j.config: ${log4j.config}</echo> - <echo>testout.dir: ${testout.dir}</echo> - - <mkdir dir="${testout.dir}"/> - - <junit printsummary="${fail}" fork="${fail}" haltonfailure="${fail}" haltonerror="${fail}" showOutput="${show.output}"> - <jvmarg value="-ea"/> - <classpath refid="test.classpath"/> - <formatter type="${formatter.type}"/> - <sysproperty key="log4j.configuration" value="file:${log4j.config}"/> - <sysproperty key="netuidrt.logdir" path="${testout.dir}"/> - <test name="org.apache.beehive.netui.test.util.type.TypeUtilsTest" todir="${testout.dir}"/> - <test name="org.apache.beehive.netui.test.util.config.ConfigTest" todir="${testout.dir}"/> - <test name="org.apache.beehive.netui.test.util.config.ConfigTest" todir="${testout.dir}"/> - <test name="org.apache.beehive.netui.test.databinding.expression.IndexedNameTest" todir="${testout.dir}"/> - <test name="org.apache.beehive.netui.test.script.simpleaction.InternalExpressionUtilsTest" todir="${testout.dir}"/> - <batchtest fork="yes" todir="${testout.dir}"> - <fileset dir="${test.src.dir}/junitTests"> - <include name="org/apache/beehive/netui/test/script/el/**/*Test.java"/> - <exclude name="org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java"/> - </fileset> - </batchtest> - </junit> - - <antcall target="make.report"> - <param name="test.report.dir" location="${testout.dir}"/> - </antcall> - </target> - - <target name="run.test"> - <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/> - <java classpathref="test.classpath" classname="${test.name}"/> - </target> - - <!-- - Produce a JUnit test repoort from the XML results of a test run. - - Params: - test.report.dir == the directory in which the XML test run results exist - the HTML for the repots will be produced in ${test.report.dir}/html - --> - <target name="make.report"> - <echo>test.report.dir: ${test.report.dir}</echo> - - <mkdir dir="${test.report.dir}/html"/> - - <!-- build a report --> - <junitreport todir="${test.report.dir}/"> - <fileset dir="${test.report.dir}/"> - <include name="TEST-*.xml"/> - </fileset> - <report format="noframes" todir="${test.report.dir}/html"/> - </junitreport> - </target> + <import file="junitCore.xml"/> </project> Added: incubator/beehive/trunk/netui/test/ant/junitCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/junitCore.xml?view=auto&rev=110145 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/ant/junitCore.xml Tue Dec 7 11:22:19 2004 @@ -0,0 +1,78 @@ +<?xml version="1.0"?> + +<project name="Beehive/NetUI/JUnitTests" basedir="."> + + <!-- ============================================= --> + <!-- Test Suite Targets --> + <!-- ============================================= --> + <path id="test.classpath"> + <pathelement path="${junit-tests.jar}"/> + <fileset dir="${webappTemplate.webinf.lib}"> + <include name="*.jar"/> + </fileset> + <pathelement path="${junit.jar}"/> + <pathelement path="${servlet24.jar}"/> + <pathelement path="${jsp20.jar}"/> + </path> + + <target name="run.tests"> + <fail unless="formatter.type" message="Unspecified value for formatter.type"/> + <fail unless="testout.dir" message="Unspecified value for testout.dir"/> + <fail unless="fail" message="Unspecified value for fail"/> + + <property name="show.output" value="false"/> + + <condition property="log4j.config" value="${log4jconfig.verbose.junit}"> + <not><isset property="log4j.quiet"/></not> + </condition> + <condition property="log4j.config" value="${log4jconfig.junit}"> + <and><isset property="log4j.quiet"/></and> + </condition> + + <echo>log4j.config: ${log4j.config}</echo> + <echo>testout.dir: ${testout.dir}</echo> + + <mkdir dir="${testout.dir}"/> + + <junit printsummary="${fail}" fork="${fail}" haltonfailure="${fail}" haltonerror="${fail}" showOutput="${show.output}"> + <jvmarg value="-ea"/> + <classpath refid="test.classpath"/> + <formatter type="${formatter.type}"/> + <sysproperty key="log4j.configuration" value="file:${log4j.config}"/> + <sysproperty key="netuidrt.logdir" path="${testout.dir}"/> + <test name="org.apache.beehive.netui.test.util.type.TypeUtilsTest" todir="${testout.dir}"/> + <test name="org.apache.beehive.netui.test.util.config.ConfigTest" todir="${testout.dir}"/> + <test name="org.apache.beehive.netui.test.databinding.expression.IndexedNameTest" todir="${testout.dir}"/> + <test name="org.apache.beehive.netui.test.script.simpleaction.InternalExpressionUtilsTest" todir="${testout.dir}"/> + <batchtest fork="yes" todir="${testout.dir}"> + <fileset dir="${test.src.dir}/junitTests"> + <include name="org/apache/beehive/netui/test/script/el/**/*Test.java"/> + <exclude name="org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java"/> + </fileset> + </batchtest> + <batchtest fork="yes" todir="${testout.dir}"> + <fileset dir="${test.src.dir}/junitTests"> + <include name="org/apache/beehive/netui/test/datagrid/**Test.java"/> + </fileset> + </batchtest> + </junit> + + <echo>Generating a test report into: ${test.report.dir}/html</echo> + + <mkdir dir="${testout.dir}/html"/> + + <!-- build a report --> + <junitreport todir="${testout.dir}/"> + <fileset dir="${testout.dir}/"> + <include name="TEST-*.xml"/> + </fileset> + <report format="noframes" todir="${testout.dir}/html"/> + </junitreport> + </target> + + <target name="run.test"> + <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/> + <java classpathref="test.classpath" classname="${test.name}"/> + </target> + +</project> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/ant/test.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/test.properties?view=diff&rev=110145&p1=incubator/beehive/trunk/netui/test/ant/test.properties&r1=110144&p2=incubator/beehive/trunk/netui/test/ant/test.properties&r2=110145 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/test.properties (original) +++ incubator/beehive/trunk/netui/test/ant/test.properties Tue Dec 7 11:22:19 2004 @@ -26,11 +26,9 @@ # # --------------------------------------------------------------------------------- test-recorder.jar.name=testRecorder.jar -test.recorder.qa.jar.name=testRecorder-qa.jar junit-tests.jar.name=beehive-netui-junitTests.jar test-recorder.jar=${test.lib.dir}/${test-recorder.jar.name} -test.recorder.qa.jar=${test.lib.dir}/${test.recorder.qa.jar.name} junit-tests.jar=${test.lib.dir}/${junit-tests.jar.name} # --------------------------------------------------------------------------------- @@ -42,9 +40,6 @@ # in waiting for the server to start drt.testResults.dir=${build.dir}/drt.testResults bvt.testResults.dir=${build.dir}/bvt.testResults - -drtbvt.jraRecordingSeconds=150 -drtbvt.maxWait=300 log4jconfig.verbose.junit=${test.dir}/conf/junitLogCfgVerbose.xml log4jconfig.junit=${test.dir}/conf/junitLogCfg.xml 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=110145&p1=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r1=110144&p2=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r2=110145 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original) +++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Tue Dec 7 11:22:19 2004 @@ -24,7 +24,7 @@ <property name="_testRecorder.jar.name" value="${test-recorder.jar.name}"/> <property name="_httpClient.jar.name" value="${httpClient.jar.name}"/> <property name="_junit.jar.name" value="${junit.jar.name}"/> - <property name="_server.maxWait" value="${drtbvt.maxWait}"/> + <property name="_server.maxWait" value="300"/> <property name="_log4j.config.verbose" location="${log4jconfig.verbose.junit}"/> <property name="_log4j.config" location="${log4jconfig.junit}"/> 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?view=diff&rev=110145&p1=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r1=110144&p2=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r2=110145 ============================================================================== --- incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml (original) +++ incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Tue Dec 7 11:22:19 2004 @@ -11,7 +11,7 @@ <property name="module.dir" location="${test.src.dir}/${module.name}"/> <property name="module.classpath" location="${junit.jar};${test-recorder.jar};${xbean.jar};${httpClient.jar}"/> <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/> - <property name="module.jar.name" value="${test.recorder.qa.jar.name}"/> + <property name="module.jar.name" value="testRecorder-qa.jar"/> <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/> <target name="build"> @@ -40,7 +40,7 @@ <path id="tr.test.classpath"> <pathelement path="${junit.jar}"/> - <pathelement path="${test.recorder.qa.jar}"/> + <pathelement path="${module.jar}"/> <pathelement path="${test-recorder.jar}"/> <pathelement path="${commons-logging.jar}"/> <pathelement path="${log4j.jar}"/>
