You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/05/28 04:16:09 UTC
svn commit: r409909 - in /cocoon/branches/BRANCH_2_1_X: build.properties
src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
Author: antonio
Date: Sat May 27 19:16:08 2006
New Revision: 409909
URL: http://svn.apache.org/viewvc?rev=409909&view=rev
Log:
Upgrade to htmlunit-1.8.
Modified:
cocoon/branches/BRANCH_2_1_X/build.properties
cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
Modified: cocoon/branches/BRANCH_2_1_X/build.properties
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/build.properties?rev=409909&r1=409908&r2=409909&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/build.properties Sat May 27 19:16:08 2006
@@ -63,10 +63,10 @@
# ---- htmlUnit ----------------------------------------------------------------
# htmlunit can be downloaded from http://htmlunit.sourceforge.net/
-# Tests currently require htmlunit 1.7, please change this
+# Tests currently require htmlunit 1.8, please change this
# comment and the default value below if moving to another version
-htmlunit.home = /default-from-build.properties/htmlunit-1.7
+htmlunit.home = /default-from-build.properties/htmlunit-1.8
htmlunit.test.baseurl=http://localhost:8888/
# for serious leak testing increase iteration count to 10000
Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java?rev=409909&r1=409908&r2=409909&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java Sat May 27 19:16:08 2006
@@ -18,8 +18,8 @@
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.SubmitMethod;
import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.WebRequestSettings;
import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.xpath.HtmlUnitXPath;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
@@ -40,11 +40,9 @@
import org.jaxen.dom.DOMXPath;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import java.io.File;
import java.net.URL;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -151,8 +149,8 @@
protected void loadResponse(String pageURL)
throws Exception
{
- URL url = new URL(baseURL, pageURL);
- this.response = webClient.loadWebResponse(url, SubmitMethod.GET, new ArrayList(0));
+ WebRequestSettings webRequestSettings = new WebRequestSettings(new URL(baseURL, pageURL), SubmitMethod.GET);
+ this.response = webClient.loadWebResponse(webRequestSettings);
}
/**
@@ -280,7 +278,6 @@
FileUtils.writeStringToFile(dstfile, content.toString(), encoding);
// Leave server some time to realize that file has changed.
-
Thread.sleep(1000);
}
}