[HtmlUnit] SVN: [7924] trunk/htmlunit/src

[<asa...@us...>]

Revision: 7924
          http://sourceforge.net/p/htmlunit/code/7924
Author:   asashour
Date:     2012-12-31 05:02:39 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Fixing build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2012-12-30 13:57:46 UTC (rev 7923)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2012-12-31 05:02:39 UTC (rev 7924)
@@ -16,6 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_SELECTOR_LANG;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_SPECIAL_PSEUDO_CLASSES;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.QUERYSELECTORALL_NOT_IN_QUIRKS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STYLESHEET_HREF_EXPANDURL;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STYLESHEET_HREF_STYLE_EMPTY;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STYLESHEET_HREF_STYLE_NULL;
@@ -86,6 +87,7 @@
 import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
 import com.gargoylesoftware.htmlunit.javascript.host.Element;
 import com.gargoylesoftware.htmlunit.javascript.host.Window;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDocument;
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
 import com.gargoylesoftware.htmlunit.util.UrlUtils;
 import com.steadystate.css.dom.CSSImportRuleImpl;
@@ -531,6 +533,11 @@
         if (!browserVersion.hasFeature(CSS_SPECIAL_PSEUDO_CLASSES)) {
             return false;
         }
+        if (browserVersion.hasFeature(QUERYSELECTORALL_NOT_IN_QUIRKS)
+                && ((HTMLDocument) ((Window) element.getScriptObject().getParentScope()).getDocument())
+                    .getDocumentMode() < 9) {
+            return false;
+        }
 
         final String value = condition.getValue();
         if ("root".equals(value)) {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java	2012-12-30 13:57:46 UTC (rev 7923)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java	2012-12-31 05:02:39 UTC (rev 7924)
@@ -543,7 +543,8 @@
     private void browserVersion_isIE(final List<String> lines, final String relativePath) {
         if (relativePath.replace('\\', '/').contains("src/main/java")
                 && !relativePath.contains("JavaScriptConfiguration")
-                && !relativePath.contains("BrowserVersionFeatures")) {
+                && !relativePath.contains("BrowserVersionFeatures")
+                && !relativePath.contains("HTMLDocument")) {
             int index = 1;
             for (final String line : lines) {
                 if ((line.contains(".isIE()") || line.contains(".isFirefox()"))) {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java	2012-12-30 13:57:46 UTC (rev 7923)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java	2012-12-31 05:02:39 UTC (rev 7924)
@@ -868,8 +868,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF = { "3", "div1" },
-            IE = "undefined", IE8 = { "3", "div1" })
+    @Alerts(FF = { "3", "div1" }, IE = "undefined")
     public void querySelectorAll() throws Exception {
         final String html = "<html><head><title>Test</title>\n"
             + "<style>\n"
@@ -901,9 +900,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "1", "p1" },
-            IE6 = "undefined",
-            IE7 = "undefined")
+    @Alerts(DEFAULT = { "1", "p1" }, IE = "undefined")
     public void querySelectorAllOnDisconnectedElement() throws Exception {
         final String html = "<html><head><title>Test</title>\n"
             + "<script>\n"