Revision: 819
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=819&view=rev
Author: henryju
Date: 2010-02-09 22:11:05 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Updated to HtmlUnit 2.7
Modified Paths:
--------------
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
trunk/pom.xml
trunk/src/changes/changes.xml
Modified:
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2009-12-15 13:22:43 UTC (rev 818)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2010-02-09 22:11:05 UTC (rev 819)
@@ -36,8 +36,6 @@
import net.sourceforge.jwebunit.javascript.JavascriptPrompt;
import net.sourceforge.jwebunit.util.TestContext;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.NameValuePair;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.slf4j.Logger;
@@ -63,7 +61,6 @@
import com.gargoylesoftware.htmlunit.WebWindowEvent;
import com.gargoylesoftware.htmlunit.WebWindowListener;
import com.gargoylesoftware.htmlunit.WebWindowNotFoundException;
-import com.gargoylesoftware.htmlunit.html.ClickableElement;
import com.gargoylesoftware.htmlunit.html.DomComment;
import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.FrameWindow;
@@ -85,8 +82,10 @@
import com.gargoylesoftware.htmlunit.html.HtmlTable;
import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow.CellIterator;
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
+import com.gargoylesoftware.htmlunit.html.HtmlTableRow.CellIterator;
+import com.gargoylesoftware.htmlunit.util.Cookie;
+import com.gargoylesoftware.htmlunit.util.NameValuePair;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
/**
@@ -269,9 +268,9 @@
for (Cookie cookie : cookies) {
javax.servlet.http.Cookie c = new javax.servlet.http.Cookie(
cookie.getName(), cookie.getValue());
- c.setComment(cookie.getComment());
+ c.setComment(cookie.toHttpClient().getComment());
c.setDomain(cookie.getDomain());
- Date expire = cookie.getExpiryDate();
+ Date expire = cookie.toHttpClient().getExpiryDate();
if (expire == null) {
c.setMaxAge(-1);
} else {
@@ -281,8 +280,8 @@
c.setMaxAge(second.intValue());
}
c.setPath(cookie.getPath());
- c.setSecure(cookie.getSecure());
- c.setVersion(cookie.getVersion());
+ c.setSecure(cookie.toHttpClient().getSecure());
+ c.setVersion(cookie.toHttpClient().getVersion());
result.add(c);
}
return result;
@@ -1164,7 +1163,7 @@
return null;
}
- public ClickableElement getResetButton(String buttonName) {
+ public HtmlElement getResetButton(String buttonName) {
List<HtmlElement> btns = new LinkedList<HtmlElement>();
if (form != null) {
btns.addAll(getForm().getInputsByName(buttonName));
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-15 13:22:43 UTC (rev 818)
+++ trunk/pom.xml 2010-02-09 22:11:05 UTC (rev 819)
@@ -295,7 +295,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2009-12-15 13:22:43 UTC (rev 818)
+++ trunk/src/changes/changes.xml 2010-02-09 22:11:05 UTC (rev 819)
@@ -9,7 +9,7 @@
<body>
<release version="2.3" date="UNKNOW" description="Updated to JUnit
4.7">
<action type="update" dev="henryju">
- Updated to HtmlUnit 2.6.
+ Updated to HtmlUnit 2.7.
</action>
<action type="update" dev="henryju">
Updated to JUnit 4.7.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
