Revision: 893
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=893&view=rev
Author: henryju
Date: 2011-01-27 13:15:33 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Updated HtmlUnitTestingEngine to remove usage of deprecated HtmlUnit API.
Modified Paths:
--------------
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
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
2011-01-27 13:03:38 UTC (rev 892)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2011-01-27 13:15:33 UTC (rev 893)
@@ -19,6 +19,8 @@
package net.sourceforge.jwebunit.htmlunit;
+import org.apache.http.auth.AuthScope;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
@@ -410,7 +412,7 @@
}
public boolean hasFormParameterNamed(String paramName) {
- for (HtmlElement e :
getCurrentPage().getAllHtmlChildElements()) {
+ for (HtmlElement e :
getCurrentPage().getHtmlElementDescendants()) {
if (e.getAttribute("name").equals(paramName)) {
// set the working form if none has been set
if (e.getEnclosingForm() != null &&
getWorkingForm() == null)
@@ -430,7 +432,7 @@
public String getTextFieldValue(String paramName) {
// first try the current form
if (form != null) {
- for (HtmlElement e : form.getAllHtmlChildElements()) {
+ for (HtmlElement e : form.getHtmlElementDescendants()) {
if (e instanceof HtmlInput &&
e.getAttribute("name").equals(paramName)) {
// we found it
return ((HtmlInput) e).getValueAttribute();
@@ -474,7 +476,7 @@
public String getHiddenFieldValue(String paramName) {
// first try the current form
if (form != null) {
- for (HtmlElement e : form.getAllHtmlChildElements()) {
+ for (HtmlElement e : form.getHtmlElementDescendants()) {
if (e instanceof HtmlHiddenInput &&
e.getAttribute("name").equals(paramName)) {
// we found it
return ((HtmlInput) e).getValueAttribute();
@@ -507,7 +509,7 @@
public void setTextField(String paramName, String text) {
// first try the current form
if (form != null) {
- for (HtmlElement e : form.getAllHtmlChildElements()) {
+ for (HtmlElement e : form.getHtmlElementDescendants()) {
if (e instanceof HtmlInput &&
e.getAttribute("name").equals(paramName)) {
// we found it
((HtmlInput) e).setValueAttribute(text);
@@ -554,7 +556,7 @@
public void setHiddenField(String fieldName, String text) {
// first try the current form
if (form != null) {
- for (HtmlElement e : form.getAllHtmlChildElements()) {
+ for (HtmlElement e : form.getHtmlElementDescendants()) {
if (e instanceof HtmlHiddenInput &&
e.getAttribute("name").equals(fieldName)) {
// we found it
((HtmlHiddenInput) e).setValueAttribute(text);
@@ -694,7 +696,7 @@
public URL getPageURL() {
- return
win.getEnclosedPage().getWebResponse().getRequestSettings().getUrl();
+ return win.getEnclosedPage().getWebResponse().getWebRequest().getUrl();
}
public String getPageSource() {
@@ -734,7 +736,7 @@
.getWebResponse();
result.append(wr.getStatusCode()).append(" ").append(
wr.getStatusMessage()).append("\n");
- result.append("Location:
").append(wr.getRequestSettings().getUrl()).append("\n");
+ result.append("Location:
").append(wr.getWebRequest().getUrl()).append("\n");
for (NameValuePair h : wr.getResponseHeaders()) {
result.append(h.getName()).append(": ").append(h.getValue())
.append("\n");
@@ -788,10 +790,8 @@
*/
BrowserVersion bv;
if (testContext.getUserAgent() != null) {
- bv = new BrowserVersion(
- BrowserVersion.NETSCAPE, "5.0 (Windows; en-US)",
- testContext.getUserAgent(),
- 3);
+ bv = BrowserVersion.FIREFOX_3;
+ bv.setUserAgent(testContext.getUserAgent());
} else {
bv = defaultBrowserVersion; // use default (which
includes a full UserAgent string)
}
@@ -839,9 +839,9 @@
getTestContext().getDomain());
}
if (getTestContext().hasProxyAuthorization()) {
- creds.addProxyCredentials(getTestContext().getProxyUser(),
+ creds.addCredentials(getTestContext().getProxyUser(),
getTestContext().getProxyPasswd(), getTestContext()
- .getProxyHost(), getTestContext().getProxyPort());
+ .getProxyHost(), getTestContext().getProxyPort(),
AuthScope.ANY_REALM);
}
wc.setCredentialsProvider(creds);
wc.addWebWindowListener(new WebWindowListener() {
@@ -1152,7 +1152,7 @@
* @return the element found, or null
*/
private HtmlElement getHtmlElementWithAttribute(String attributeName,
String value) {
- for (HtmlElement e : getCurrentPage().getAllHtmlChildElements()) {
+ for (HtmlElement e : getCurrentPage().getHtmlElementDescendants()) {
if (e.getAttribute(attributeName).equals(value)) {
return e;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
