From 754f9934d4e48d084028ff8ccb83dd380284de46 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 14 Aug 2008 23:20:30 +0000 Subject: [PATCH] HttpUnit doesn't properly shut down the connection, causing the queue on Jetty to run out. Switching to HtmlUnit, as the project seems more actively maintained. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11481 71c3de6d-444a-0410-be80-ed276b4c234a --- test/pom.xml | 20 +++++++++++++++---- .../org/jvnet/hudson/test/HudsonTestCase.java | 14 ++++++++----- .../hudson/model/AbstractProjectTest.java | 13 +++++++----- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 6184bc62de..6418b4d3d3 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -1,4 +1,5 @@ - + + pom org.jvnet.hudson.main @@ -8,6 +9,17 @@ org.jvnet.hudson.main test test + + + + + maven-surefire-plugin + + never + + + + @@ -31,9 +43,9 @@ 1.0-beta-1 - httpunit - httpunit - 1.6.2 + net.sourceforge.htmlunit + htmlunit + 2.2 junit diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 2c862e7f66..67809ca807 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -1,6 +1,6 @@ package org.jvnet.hudson.test; -import com.meterware.httpunit.WebResponse; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; import hudson.model.Hudson; import hudson.model.Item; @@ -115,12 +115,16 @@ public abstract class HudsonTestCase extends TestCase { } /** - * Extends {@link com.meterware.httpunit.WebConversation} and provide convenience methods + * Extends {@link com.gargoylesoftware.htmlunit.WebClient} and provide convenience methods * for accessing Hudson. */ - public class WebConversation extends com.meterware.httpunit.WebConversation { - public WebResponse getResponse(Item item) throws IOException, SAXException { - return getResponse("http://localhost:"+localPort+contextPath+item.getUrl()); + public class WebClient extends com.gargoylesoftware.htmlunit.WebClient { + public WebClient() { + setJavaScriptEnabled(false); + } + + public HtmlPage getPage(Item item) throws IOException, SAXException { + return (HtmlPage)getPage("http://localhost:"+localPort+contextPath+item.getUrl()); } } } diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java index 223615b634..ea5187a33a 100644 --- a/test/src/test/java/hudson/model/AbstractProjectTest.java +++ b/test/src/test/java/hudson/model/AbstractProjectTest.java @@ -1,8 +1,9 @@ package hudson.model; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.tasks.Shell; import org.jvnet.hudson.test.HudsonTestCase; -import com.meterware.httpunit.WebResponse; /** * @author Kohsuke Kawaguchi @@ -25,10 +26,12 @@ public class AbstractProjectTest extends HudsonTestCase { project.getWorkspace().exists()); // emulate the user behavior - WebResponse rsp = new WebConversation().getResponse(project); - rsp = rsp.getLinkWith("Workspace").click(); - rsp = rsp.getLinkWith("Wipe Out Workspace").click(); - rsp = rsp.getFormWithID("confirmation").submit(); + WebClient webClient = new WebClient(); + HtmlPage page = webClient.getPage(project); + + page = (HtmlPage)page.getFirstAnchorByText("Workspace").click(); + page = (HtmlPage)page.getFirstAnchorByText("Wipe Out Workspace").click(); + page = (HtmlPage)((HtmlForm)page.getElementById("confirmation")).submit(null); assertFalse("Workspace should be gone by now", project.getWorkspace().exists());