Add SparkUICssErrorHandler for all tests

hellot911 · Jun 8, 2015 · 4202728 · 4202728
1 parent d1398ad
commit 4202728
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 79 deletions.
diff --git a/core/src/test/scala/org/apache/spark/ui/UISeleniumSuite.scala b/core/src/test/scala/org/apache/spark/ui/UISeleniumSuite.scala
@@ -41,6 +41,31 @@ import org.apache.spark.deploy.history.HistoryServerSuite
 import org.apache.spark.shuffle.FetchFailedException
 import org.apache.spark.status.api.v1.{JacksonMessageWriter, StageStatus}
 
+private[spark] class SparkUICssErrorHandler extends DefaultCssErrorHandler {
+
+  private val cssWhiteList = List("bootstrap.min.css", "vis.min.css")
+
+  private def isInWhileList(uri: String): Boolean = cssWhiteList.exists(uri.endsWith)
+
+  override def warning(e: CSSParseException): Unit = {
+    if (!isInWhileList(e.getURI)) {
+      super.warning(e)
+    }
+  }
+
+  override def fatalError(e: CSSParseException): Unit = {
+    if (!isInWhileList(e.getURI)) {
+      super.fatalError(e)
+    }
+  }
+
+  override def error(e: CSSParseException): Unit = {
+    if (!isInWhileList(e.getURI)) {
+      super.error(e)
+    }
+  }
+}
+
 /**
  * Selenium tests for the Spark Web UI.
  */
@@ -52,31 +77,7 @@ class UISeleniumSuite extends SparkFunSuite with WebBrowser with Matchers with B
 
   override def beforeAll(): Unit = {
     webDriver = new HtmlUnitDriver {
-
-      getWebClient.setCssErrorHandler(new DefaultCssErrorHandler {
-
-        private val cssWhiteList = List("bootstrap.min.css", "vis.min.css")
-
-        private def isInWhileList(uri: String): Boolean = cssWhiteList.exists(uri.endsWith)
-
-        override def warning(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.warning(e)
-          }
-        }
-
-        override def fatalError(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.fatalError(e)
-          }
-        }
-
-        override def error(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.error(e)
-          }
-        }
-      })
+      getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
     }
   }
 

diff --git a/...-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/UISeleniumSuite.scala b/...-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/UISeleniumSuite.scala
@@ -19,17 +19,16 @@ package org.apache.spark.sql.hive.thriftserver
 
 import scala.util.Random
 
-import com.gargoylesoftware.htmlunit.DefaultCssErrorHandler
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.htmlunit.HtmlUnitDriver
 import org.scalatest.{BeforeAndAfterAll, Matchers}
 import org.scalatest.concurrent.Eventually._
 import org.scalatest.selenium.WebBrowser
 import org.scalatest.time.SpanSugar._
-import org.w3c.css.sac.CSSParseException
 
 import org.apache.spark.sql.hive.HiveContext
+import org.apache.spark.ui.SparkUICssErrorHandler
 
 class UISeleniumSuite
   extends HiveThriftJdbcTest
@@ -43,31 +42,7 @@ class UISeleniumSuite
 
   override def beforeAll(): Unit = {
     webDriver = new HtmlUnitDriver {
-
-      getWebClient.setCssErrorHandler(new DefaultCssErrorHandler {
-
-        private val cssWhiteList = List("bootstrap.min.css", "vis.min.css")
-
-        private def isInWhileList(uri: String): Boolean = cssWhiteList.exists(uri.endsWith)
-
-        override def warning(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.warning(e)
-          }
-        }
-
-        override def fatalError(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.fatalError(e)
-          }
-        }
-
-        override def error(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.error(e)
-          }
-        }
-      })
+      getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
     }
     super.beforeAll()
   }

diff --git a/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
@@ -19,16 +19,15 @@ package org.apache.spark.streaming
 
 import scala.collection.mutable.Queue
 
-import com.gargoylesoftware.htmlunit.DefaultCssErrorHandler
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.htmlunit.HtmlUnitDriver
 import org.scalatest._
 import org.scalatest.concurrent.Eventually._
 import org.scalatest.selenium.WebBrowser
 import org.scalatest.time.SpanSugar._
-import org.w3c.css.sac.CSSParseException
 
 import org.apache.spark._
+import org.apache.spark.ui.SparkUICssErrorHandler
 
 /**
  * Selenium tests for the Spark Streaming Web UI.
@@ -40,31 +39,7 @@ class UISeleniumSuite
 
   override def beforeAll(): Unit = {
     webDriver = new HtmlUnitDriver {
-
-      getWebClient.setCssErrorHandler(new DefaultCssErrorHandler {
-
-        private val cssWhiteList = List("bootstrap.min.css", "vis.min.css")
-
-        private def isInWhileList(uri: String): Boolean = cssWhiteList.exists(uri.endsWith)
-
-        override def warning(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.warning(e)
-          }
-        }
-
-        override def fatalError(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.fatalError(e)
-          }
-        }
-
-        override def error(e: CSSParseException): Unit = {
-          if (!isInWhileList(e.getURI)) {
-            super.error(e)
-          }
-        }
-      })
+      getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
     }
   }