From ea92d3aa13e28dd527e6a42fdf2d44fa34bd6a4c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 4 Mar 2010 19:30:06 +0000 Subject: [PATCH] Integrated a newer version of htmlunit that performs XHR calls at the correct timing. This fixes the false positive test failure that I was struggling with since yesterday. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28266 71c3de6d-444a-0410-be80-ed276b4c234a --- test/pom.xml | 2 +- .../org/jvnet/hudson/test/HudsonTestCase.java | 5 +-- .../tasks/_ant/AntTargetAnnotationTest.java | 38 +++++++++---------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index ee04afed71..3a823a8462 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -151,7 +151,7 @@ THE SOFTWARE. org.jvnet.hudson htmlunit - 2.6-hudson-1 + 2.6-hudson-2 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 f589a884b5..a7c887ce9f 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -1154,11 +1154,10 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { // setJavaScriptEnabled(false); setPageCreator(HudsonPageCreator.INSTANCE); clients.add(new WeakReference(this)); - // make ajax calls synchronous for predictable behaviors that simplify debugging + // make ajax calls run as post-action for predictable behaviors that simplify debugging setAjaxController(new AjaxController() { - @Override public boolean processSynchron(HtmlPage page, WebRequestSettings settings, boolean async) { - return true; + return false; } }); diff --git a/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java b/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java index e9a19fa9ae..e07f68671b 100644 --- a/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java +++ b/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java @@ -13,25 +13,23 @@ import org.mozilla.javascript.tools.debugger.Dim; * @author Kohsuke Kawaguchi */ public class AntTargetAnnotationTest extends HudsonTestCase { - public void testDummy() {} + public void test1() throws Exception { + FreeStyleProject p = createFreeStyleProject(); + p.getBuildersList().add(new Ant("foo",null,null,null,null)); + p.setScm(new SingleFileSCM("build.xml",getClass().getResource("simple-build.xml"))); + FreeStyleBuild b = buildAndAssertSuccess(p); -// public void test1() throws Exception { -// FreeStyleProject p = createFreeStyleProject(); -// p.getBuildersList().add(new Ant("foo",null,null,null,null)); -// p.setScm(new SingleFileSCM("build.xml",getClass().getResource("simple-build.xml"))); -// FreeStyleBuild b = buildAndAssertSuccess(p); -// -// AntTargetNote.ENABLED = true; -// try { -// HudsonTestCase.WebClient wc = createWebClient(); -// wc.interactiveJavaScriptDebugger(); -// HtmlPage c = wc.getPage(b, "console"); -// System.out.println(c.asText()); -// -// HtmlElement o = c.getElementById("console-outline"); -// assertEquals(2,o.selectNodes("LI").size()); -// } finally { -// AntTargetNote.ENABLED = false; -// } -// } + AntTargetNote.ENABLED = true; + try { + HudsonTestCase.WebClient wc = createWebClient(); + wc.interactiveJavaScriptDebugger(); + HtmlPage c = wc.getPage(b, "console"); + System.out.println(c.asText()); + + HtmlElement o = c.getElementById("console-outline"); + assertEquals(2,o.selectNodes(".//LI").size()); + } finally { + AntTargetNote.ENABLED = false; + } + } }