You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by js...@apache.org on 2004/10/28 05:36:38 UTC
svn commit: rev 55770 - in incubator/beehive/trunk/controls/test: infra/milton tools/milton/src/org/apache/beehive/test/tools/milton/junit
Author: jsong
Date: Wed Oct 27 20:36:37 2004
New Revision: 55770
Modified:
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
Log:
Update milton.jar and HtmlReportTestCase.java for the fix of JIRA BEEHIVE-31.
Modified: incubator/beehive/trunk/controls/test/infra/milton/milton.jar
==============================================================================
Binary files. No diff available.
Modified: 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/junit/HtmlReportTestCase.java (original)
+++ incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java Wed Oct 27 20:36:37 2004
@@ -15,7 +15,7 @@
import org.apache.beehive.test.tools.milton.common.Report;
-public class HtmlReportTestCase extends TestCase
+public abstract class HtmlReportTestCase extends TestCase
{
private static final String HTTP_PREFIX = "http://";
private static final String HTTPS_PREFIX = "https://";
@@ -51,10 +51,10 @@
if (null == p_urlPrefix)
throw new IllegalArgumentException("Cannot set null URI PRefix");
- if (! p_urlPrefix.startsWith(HTTP_PREFIX) ||
+ if (! p_urlPrefix.startsWith(HTTP_PREFIX) ||
! p_urlPrefix.startsWith(HTTPS_PREFIX)) {
throw new IllegalArgumentException("URL Prefix must have a valid " +
- "protocol: " + HTTP_PREFIX +
+ "protocol: " + HTTP_PREFIX +
" or " + HTTPS_PREFIX + ": " +
p_urlPrefix);
}
@@ -74,7 +74,7 @@
assertReport(new WebConversation(), p_url, p_link);
}
- public void assertReport(WebConversation p_wc, String p_url)
+ public void assertReport(WebConversation p_wc, String p_url)
throws Exception
{
assertReport(p_wc, p_url, (String)null);
@@ -82,12 +82,12 @@
public void assertReport(WebConversation p_wc, String p_url, String p_link)
throws Exception
- {
+ {
String url = null;
WebResponse wr = null;
if (null == p_wc || null == p_url)
- throw new IllegalArgumentException("WebConversation and URL " +
+ throw new IllegalArgumentException("WebConversation and URL " +
"cannot be null");
// find out if user has passed an entire url complete with protocol
@@ -100,7 +100,7 @@
else
url = getUrlPrefix() + "/" + p_url;
}
-
+
try {
wr = p_wc.getResponse(url);
}
@@ -121,7 +121,7 @@
else {
assertReport(wr);
}
- }
+ }
public void assertReport(WebRequest p_wr)
throws Exception
@@ -153,7 +153,7 @@
WebTable wt = p_wr.getTableWithID(Report.RESULT_TABLE_ID);
if (null == wt)
- throw new AbortTestException("Table not found: \n" +
+ throw new AbortTestException("Table not found: \n" +
p_wr.getText());
TableCell statusCell = wt.getTableCellWithID(Report.STATUS_ID);
@@ -168,7 +168,7 @@
if (null != exceptionCell)
exception = exceptionCell.asText().trim();
-
+
// Print Messages && Exceptions
if (null != message && ! message.equals(""))
System.out.println("Message: " + message);
@@ -212,7 +212,7 @@
p_link, ioe);
}
catch(org.xml.sax.SAXException saxe) {
- throw new AbortTestException("Error clicking link: " +
+ throw new AbortTestException("Error clicking link: " +
p_link, saxe);
}