Author: jsong
Date: Wed Mar 9 16:31:48 2005
New Revision: 156718
URL: http://svn.apache.org/viewcvs?view=rev&rev=156718
Log:
A bug was introduced when I updated Milton to support dynamically setting
properties used for generation. As a result, the tests were not running (and
therefore not failing). Once I got them running again I discovered another bug
which caused generated jpf tests to fail. Both bugs are resolved with this fix.
Contributed by Zach Smith ([EMAIL PROTECTED])
Modified:
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/infra/milton/milton.jar
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/JpfClient.java
incubator/beehive/trunk/controls/test/webapps/build.xml
Modified: incubator/beehive/trunk/controls/test/common/path.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/common/path.properties?view=diff&r1=156717&r2=156718
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties (original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Wed Mar 9
16:31:48 2005
@@ -17,7 +17,8 @@
controls.test.webapp.name=controlsWeb
controls.webapp.dir.name=webapps
-build.dir=${controls.test.root}/build
+build.dir.name=build
+build.dir=${controls.test.root}/${build.dir.name}
build.classes=${build.dir}/classes
build.beans=${build.dir}/classes/beans
build.tests=${build.dir}/classes/tests
@@ -60,7 +61,7 @@
mantis.milton.srcgen.dir=${build.dir}
mantis.milton.bingen.dir=${build.dir}
mantis.milton.log.dir=${build.dir}/mantis.milton.logs
-mantis.milton.control.test.accessers=${mantis.milton.srcgen.dir}/${milton.accesser.src.gendir}
+mantis.milton.control.test.accessers=${build.dir.name}/${milton.accesser.src.gendir}
mantis.tch.srcgen.dir=${build.dir}/mantis.tch.cases
mantis.tch.bingen.dir=${build.dir}/mantis.tch.bingen
Modified: incubator/beehive/trunk/controls/test/infra/milton/milton.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/infra/milton/milton.jar?view=diff&r1=156717&r2=156718
==============================================================================
Binary files - no diff available.
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java?view=diff&r1=156717&r2=156718
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
Wed Mar 9 16:31:48 2005
@@ -32,6 +32,20 @@
assertReport(new WebConversation(), p_url, p_link);
}
+ /**
+ * @param p_url Url to connect to
+ * @param p_link Link on the Url to "Click"
+ * @param p_userName User name for Authentication
+ * @param p_password Password for Authentication
+ **/
+ public void assertReport(String p_url, String p_link, String p_userName,
String p_password)
+ throws Exception
+ {
+ WebConversation wc = new WebConversation();
+ wc.setAuthorization(p_userName, p_password);
+ assertReport(wc, p_url, p_link);
+ }
+
public void assertReport(WebConversation p_wc, String p_url)
throws Exception
{
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/JpfClient.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/JpfClient.java?view=diff&r1=156717&r2=156718
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/JpfClient.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/JpfClient.java
Wed Mar 9 16:31:48 2005
@@ -40,7 +40,7 @@
this._jpfPackage = pkg.length >= 1 ? pkg[pkg.length-1] :
"noPackage";
//TODO: make some of these values into externally overridable
properties
this._jpfPackage = "milton.pageflows." + this._jpfPackage + "."
+ p_mts.getName();
- this._jpfActionPath = super._webappDir + super._webappName +
"/" + this._jpfPackage.replace(".", "/");
+ this._jpfActionPath = super._webappName + "/" +
this._jpfPackage.replace(".", "/");
this._jpfLocation = super._webappDir + super._webappName +
"/WEB-INF/src/" + this._jpfPackage.replace(".", "/") +
"/Controller.jpf";
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/build.xml?view=diff&r1=156717&r2=156718
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Wed Mar 9 16:31:48
2005
@@ -95,7 +95,7 @@
<!-- ================================================================ -->
<target name="build" description="Build webapp" depends="-init">
<echo message="-----------------------------------------------------"/>
- <echo message="| Beehive Controls ${webapp.name} build starting
|"/>
+ <echo message="| Beehive Controls ${controls.test.webapp.name}
build starting |"/>
<echo message="-----------------------------------------------------"/>
<!-- webapps are copied into a staging directory where additional
build steps
@@ -112,7 +112,7 @@
<antcall target="-build.webapp"/>
<echo message="----------------------------------------------"/>
- <echo message="| Controls ${webapp.name} build ending |"/>
+ <echo message="| Controls ${controls.test.webapp.name} build
ending |"/>
<echo message="----------------------------------------------"/>
</target>
