Updated to HtmlUnit 2.3

henryju · henryju · commit ba8b1220dfe1 · 2008-10-06T13:30:06.000Z
diff --git a/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java b/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
@@ -83,9 +83,7 @@
 import net.sourceforge.jwebunit.util.TestContext;
 
 import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.httpclient.NameValuePair;
-
 import org.apache.regexp.RE;
 import org.apache.regexp.RESyntaxException;
 import org.slf4j.Logger;
@@ -217,14 +215,13 @@ public void setScriptingEnabled(boolean value) {
 
     public List<javax.servlet.http.Cookie> getCookies() {
         List<javax.servlet.http.Cookie> result = new LinkedList<javax.servlet.http.Cookie>();
-        final HttpState stateForUrl = wc.getWebConnection().getState();
-        Cookie[] cookies = stateForUrl.getCookies();
-        for (int i = 0; i < cookies.length; i++) {
+        Set<Cookie> cookies = wc.getCookieManager().getCookies();
+        for (Cookie cookie : cookies) {
             javax.servlet.http.Cookie c = new javax.servlet.http.Cookie(
-                    cookies[i].getName(), cookies[i].getValue());
-            c.setComment(cookies[i].getComment());
-            c.setDomain(cookies[i].getDomain());
-            Date expire = cookies[i].getExpiryDate();
+                    cookie.getName(), cookie.getValue());
+            c.setComment(cookie.getComment());
+            c.setDomain(cookie.getDomain());
+            Date expire = cookie.getExpiryDate();
             if (expire == null) {
                 c.setMaxAge(-1);
             } else {
@@ -234,9 +231,9 @@ public List<javax.servlet.http.Cookie> getCookies() {
                         (expire.getTime() - now.getTime()) / 1000);
                 c.setMaxAge(second.intValue());
             }
-            c.setPath(cookies[i].getPath());
-            c.setSecure(cookies[i].getSecure());
-            c.setVersion(cookies[i].getVersion());
+            c.setPath(cookie.getPath());
+            c.setSecure(cookie.getSecure());
+            c.setVersion(cookie.getVersion());
             result.add(c);
         }
         return result;
@@ -839,7 +836,7 @@ public String handlePrompt(Page page, String msg) {
         // Deal with cookies
         for (javax.servlet.http.Cookie c : getTestContext().getCookies()) {
             // If Path==null, cookie is not send to the server.
-            wc.getWebConnection().getState().addCookie(
+            wc.getCookieManager().addCookie(
                     new Cookie(c.getDomain() != null ? c.getDomain() : "", c
                             .getName(), c.getValue(), c.getPath() != null ? c
                             .getPath() : "", c.getMaxAge(), c.getSecure()));
diff --git a/pom.xml b/pom.xml
@@ -282,7 +282,7 @@
 			<dependency>
 				<groupId>net.sourceforge.htmlunit</groupId>
 				<artifactId>htmlunit</artifactId>
-				<version>2.2</version>
+				<version>2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.openqa.selenium.client-drivers</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -9,15 +9,15 @@
     <body>
         <release version="2.0" date="UNKNOW">
             <action type="update" dev="henryju">
-                Updated to HtmlUnit 2.2.
+                Updated to HtmlUnit 2.3.
             </action>
             <action type="fix" dev="joshlane" issue="2007985,2009776" due-to="Josh Lane">
                 selectOptionByValue failed with Selenium Plugin.
                 selectOption always failed, cannot find element.
                 Other improvements to Selenium plugin.
             </action>
             <action type="update" dev="henryju" issue="1950248" due-to="Agnes Ro">
-                Update to HtmlUnit 2.1 and Java 1.5.
+                Updated to HtmlUnit 2.1 and Java 1.5.
             </action>
     	</release>
         <release version="1.5" date="april 22, 2008" description="The latest major release before Java 1.5 migration">
