You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/10/20 10:54:00 UTC
svn commit: r326869 - in /cocoon/branches/BRANCH_2_1_X: build.properties
tools/targets/test-build.xml
Author: bdelacretaz
Date: Thu Oct 20 01:53:45 2005
New Revision: 326869
URL: http://svn.apache.org/viewcvs?rev=326869&view=rev
Log:
minor tweaks to htmlunit tests
Modified:
cocoon/branches/BRANCH_2_1_X/build.properties
cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/build.properties?rev=326869&r1=326868&r2=326869&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/build.properties Thu Oct 20 01:53:45 2005
@@ -62,10 +62,13 @@
# ---- htmlUnit ----------------------------------------------------------------
+# htmlunit can be downloaded from http://htmlunit.sourceforge.net/
# Tests currently require htmlunit 1.7, please change this
# comment and the default value below if moving to another version
+
htmlunit.home = /default-from-build.properties/htmlunit-1.7
htmlunit.test.baseurl=http://localhost:8888/
+
# for serious leak testing increase iteration count to 10000
htmlunit.test.Bug26186InternalRequestMemoryLeak.iterations=1
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml?rev=326869&r1=326868&r2=326869&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml Thu Oct 20 01:53:45 2005
@@ -33,21 +33,27 @@
description="Runs JUnit tests"/>
<target name="htmlunit-tests"
- depends="core-htmlunit-tests, block-htmlunit-tests, htmlunit-tests-report, check-htmlunit-present"
+ depends="core-htmlunit-tests, block-htmlunit-tests, htmlunit-notes, htmlunit-tests-report, check-htmlunit-present"
description="Runs HtmlUnit tests"/>
<target name="check-htmlunit-present" unless="htmlunit.present">
- <echo>To use htmlunit, please install it (see http://htmlunit.sourceforge.net/) and set htmlunit.home (currently ${htmlunit.home}) in your local.build.properties</echo>
- <echo>----------------------</echo>
- <echo>*** Htmlunit notes ***</echo>
+ <echo>**** HTMLUNIT NOT FOUND!!! ****************************************************************************************</echo>
+ <echo>To use htmlunit, please install it (see http://htmlunit.sourceforge.net/), </echo>
+ <echo>and set htmlunit.home (currently ${htmlunit.home}) in your local.build.properties</echo>
+ <echo>*******************************************************************************************************************</echo>
+ <fail>htmlunit not present, cannot run tests</fail>
+ </target>
+
+ <target name="htmlunit-notes">
+ <echo>*** Htmlunit tests notes ***</echo>
<echo>a) To run these tests, an instance of Cocoon must be</echo>
- <echo> running at ${htmlunit.test.baseurl}</echo>
+ <echo> running at ${htmlunit.test.baseurl} (start it as usual, from another window)</echo>
<echo>b) JDK 1.4.x is required to run these tests, but running them</echo>
<echo> under 1.4.x to test Cocoon running under 1.3.x should be ok.</echo>
- <echo>c) htmlunit options can be set in local.build.properties, and some</echo>
- <echo> tests only run if enabled there.</echo>
+ <echo>c) Settings in build.properties can allow a subset of tests to run,</echo>
+ <echo> see the htmlunit section there.</echo>
</target>
-
+
<target name="junit-tests-prepare">
<delete dir="${build.test.output}"/>
<delete dir="${build.test.report}"/>