Author: craigmcc
Date: Thu Jun 8 16:19:14 2006
New Revision: 412880
URL: http://svn.apache.org/viewvc?rev=412880&view=rev
Log:
Resolve SHALE-189 (HtmlUnit changes from 1.7 to 1.8).
Modified:
struts/shale/branches/mvn_reorg/shale-test/pom.xml
struts/shale/branches/mvn_reorg/shale-test/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
Modified: struts/shale/branches/mvn_reorg/shale-test/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-test/pom.xml?rev=412880&r1=412879&r2=412880&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-test/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-test/pom.xml Thu Jun 8 16:19:14 2006
@@ -40,7 +40,7 @@
<dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<optional>true</optional>
<exclusions>
<exclusion>
Modified:
struts/shale/branches/mvn_reorg/shale-test/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-test/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java?rev=412880&r1=412879&r2=412880&view=diff
==============================================================================
---
struts/shale/branches/mvn_reorg/shale-test/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
(original)
+++
struts/shale/branches/mvn_reorg/shale-test/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
Thu Jun 8 16:19:14 2006
@@ -35,8 +35,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpState;
@@ -69,12 +67,6 @@
/**
- * <p>The HTTP state information for this test case.</p>
- */
- protected HttpState httpState = null;
-
-
- /**
* <p>The most recently retrieved page from the server.</p>
*/
protected HtmlPage page = null;
@@ -109,7 +101,6 @@
// Initialize HtmlUnit constructs for this test case
webClient = new WebClient();
- httpState = webClient.getWebConnection().getStateForUrl(url("/"));
}
@@ -129,7 +120,6 @@
*/
public void tearDown() {
- httpState = null;
page = null;
url = null;
webClient = null;
@@ -186,7 +176,7 @@
*/
protected HtmlForm form(String id) throws Exception {
- Iterator forms = page.getAllForms().iterator();
+ Iterator forms = page.getForms().iterator();
while (forms.hasNext()) {
HtmlForm form = (HtmlForm) forms.next();
if (id.equals(form.getAttributeValue("id"))) {
