From c77ebc26a8a626f927a2298034245d607bd9ec73 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 21 Aug 2008 21:58:53 +0000 Subject: [PATCH] Ignore CSS errors in YUI. We aren't fixing those. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11654 71c3de6d-444a-0410-be80-ed276b4c234a --- test/pom.xml | 2 +- .../org/jvnet/hudson/test/HudsonTestCase.java | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index 4c5e215cad..76ea3c9097 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -72,7 +72,7 @@ org.jvnet.hudson htmlunit - 2.2-hudson-1 + 2.2-hudson-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 5a3dd0c144..2f84628209 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -2,6 +2,7 @@ package org.jvnet.hudson.test; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.javascript.host.Stylesheet; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; @@ -20,6 +21,9 @@ import org.mortbay.jetty.webapp.Configuration; import org.mortbay.jetty.webapp.WebAppContext; import org.mortbay.jetty.webapp.WebXmlConfiguration; import org.xml.sax.SAXException; +import org.w3c.css.sac.ErrorHandler; +import org.w3c.css.sac.CSSParseException; +import org.w3c.css.sac.CSSException; import javax.servlet.ServletContext; import java.io.File; @@ -30,6 +34,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.logging.Logger; /** * Base class for all Hudson test cases. @@ -260,7 +265,36 @@ public abstract class HudsonTestCase extends TestCase { } static { + // screen scraping relies on locale being fixed. Locale.setDefault(Locale.ENGLISH); + // don't waste bandwidth talking to the update center UpdateCenter.neverUpdate = true; + + // we don't care CSS errors in YUI + final ErrorHandler defaultHandler = Stylesheet.CSS_ERROR_HANDLER; + Stylesheet.CSS_ERROR_HANDLER = new ErrorHandler() { + public void warning(CSSParseException exception) throws CSSException { + if(!ignore(exception)) + defaultHandler.warning(exception); + } + + public void error(CSSParseException exception) throws CSSException { + if(!ignore(exception)) + defaultHandler.warning(exception); + } + + public void fatalError(CSSParseException exception) throws CSSException { + if(!ignore(exception)) + defaultHandler.warning(exception); + } + + private boolean ignore(CSSParseException e) { + return e.getURI().contains("/yui/"); + } + }; } + + + + private static final Logger LOGGER = Logger.getLogger(HudsonTestCase.class.getName()); }