Author: ajaquith
Date: Wed Mar 19 19:12:23 2008
New Revision: 639115
URL: http://svn.apache.org/viewvc?rev=639115&view=rev
Log:
Fixed failing Selenium web unit tests so that they run correctly, with two
exceptions. See tests/etc/selenium/readme.txt; this file includes a few notes
on how to write Selenium tests so that they will run automatically via the Ant
"webtests" target.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=639115&r1=639114&r2=639115&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Mar 19 19:12:23 2008
@@ -1,3 +1,12 @@
+2007-03-19 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.6.2-rc-4
+
+ * Fixed failing Selenium web unit tests so that they run correctly,
+ with two exceptions. See tests/etc/selenium/readme.txt; this file
+ includes a few notes on how to write Selenium tests so that they
+ will run automatically via the Ant "webtests" target.
+
2008-03-18 Juan Pablo Santos <[EMAIL PROTECTED]>
* 2.6.2-rc-3
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=639115&r1=639114&r2=639115&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Mar 19 19:12:23 2008
@@ -676,7 +676,7 @@
<ant dir="${basedir}" antfile="tests/etc/webtests.xml"
target="webtests-init" inheritRefs="true" />
- <!-- Build the custom auth WAR -->
+ <!-- Build and test the custom auth WAR -->
<copy file="etc/jspwiki.properties"
toFile="${tests.build}/jspwiki.properties.custom" flatten="true" />
<propertyfile file="${tests.build}/jspwiki.properties.custom">
@@ -687,8 +687,10 @@
<webtest-setup context="test-custom"
webxml="${tests.build}/web.xml.custom"
props="${tests.build}/jspwiki.properties.custom" />
+ <webtest-selenium context="test-custom" />
+ <webtest-teardown context="test-custom" />
- <!-- Build the custom auth WAR (absolute URLs) -->
+ <!-- Build and test the custom auth WAR (absolute URLs) -->
<copy file="${tests.build}/jspwiki.properties.custom"
toFile="${tests.build}/jspwiki.properties.custom-absolute"
flatten="true" />
<propertyfile file="${tests.build}/jspwiki.properties.custom-absolute">
@@ -698,11 +700,15 @@
<webtest-setup context="test-custom-absolute"
webxml="${tests.build}/web.xml.custom"
props="${tests.build}/jspwiki.properties.custom-absolute" />
+ <webtest-selenium context="test-custom-absolute" />
+ <webtest-teardown context="test-custom-absolute" />
- <!-- Build the container auth WAR -->
+ <!-- Build and test the container auth WAR -->
<webtest-setup context="test-container"
webxml="${tests.build}/web.xml.container"
props="${tests.build}/jspwiki.properties.custom" />
+ <webtest-selenium context="test-container" />
+ <webtest-teardown context="test-container" />
<!-- Build the custom auth WAR (JDBC database) -->
<copy file="etc/jspwiki.properties"
@@ -715,8 +721,10 @@
<webtest-setup context="test-custom-jdbc"
webxml="${tests.build}/web.xml.custom"
props="${tests.build}/jspwiki.properties.custom-jdbc" />
+ <webtest-selenium context="test-container-jdbc" />
+ <webtest-teardown context="test-container-jdbc" />
- <!-- Build the container auth WAR (shared JDBC database) and test it -->
+ <!-- Build and test the container auth WAR (shared JDBC database) and test
it -->
<copy file="etc/jspwiki.properties"
toFile="${tests.build}/jspwiki.properties.container-jdbc"
flatten="true" />
<propertyfile file="${tests.build}/jspwiki.properties.container-jdbc">
@@ -728,20 +736,8 @@
<webtest-setup context="test-container-jdbc"
webxml="${tests.build}/web.xml.container"
props="${tests.build}/jspwiki.properties.container-jdbc" />
-
- <!-- Run the tests -->
- <webtest-selenium context="test-custom" />
- <webtest-selenium context="test-custom-absolute" />
- <webtest-selenium context="test-custom-jdbc" />
- <webtest-selenium context="test-container" />
- <webtest-selenium context="test-container-jdbc" />
-
- <!-- Tear down the test contexts -->
- <webtest-teardown context="test-custom" />
- <webtest-teardown context="test-custom-absolute" />
+ <webtest-selenium context="test-custom-jdbc" />
<webtest-teardown context="test-custom-jdbc" />
- <webtest-teardown context="test-container" />
- <webtest-teardown context="test-container-jdbc" />
<echo>The web unit tests have finished. You can find the test reports in
${webtests.reports}.
