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

[<rb...@us...>]

Revision: 9084
          http://sourceforge.net/p/htmlunit/code/9084
Author:   rbri
Date:     2014-01-28 21:41:24 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
body.background property handling fixed for FF

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2014-01-28 19:52:59 UTC (rev 9083)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2014-01-28 21:41:24 UTC (rev 9084)
@@ -343,10 +343,6 @@
     GENERATED_157,
 
     /** Was originally .isFirefox(). */
-    @BrowserFeature({ @WebBrowser(FF), @WebBrowser(CHROME) })
-    GENERATED_158,
-
-    /** Was originally .isFirefox(). */
     @BrowserFeature({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
     GENERATED_164,
 

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java	2014-01-28 19:52:59 UTC (rev 9083)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java	2014-01-28 21:41:24 UTC (rev 9084)
@@ -14,19 +14,15 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.html;
 
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.GENERATED_158;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.GENERATED_41;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OUTER_HTML_BODY_HEAD_READONLY;
 
-import java.net.MalformedURLException;
 import java.util.Locale;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 
-import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlBody;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
@@ -110,18 +106,7 @@
     @JsxGetter
     public String getBackground() {
         final HtmlElement node = getDomNodeOrDie();
-        String background = node.getAttribute("background");
-        if (background != DomElement.ATTRIBUTE_NOT_DEFINED
-                && getBrowserVersion().hasFeature(GENERATED_158)) {
-            try {
-                final HtmlPage page = (HtmlPage) node.getPage();
-                background = page.getFullyQualifiedUrl(background).toExternalForm();
-            }
-            catch (final MalformedURLException e) {
-                Context.throwAsScriptRuntimeEx(e);
-            }
-        }
-        return background;
+        return node.getAttribute("background");
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java	2014-01-28 19:52:59 UTC (rev 9083)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java	2014-01-28 21:41:24 UTC (rev 9084)
@@ -14,9 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.html;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF17;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF24;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -24,7 +21,6 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
-import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 
 /**
@@ -45,9 +41,9 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(FF = {",0px,0px,0px,0px", ",,,,", ",8px,8px,8px,8px", ",,,," },
-            IE = {"0px,0px,0px,0px,0px", ",,,,", "15px 10px,10px,10px,15px,15px", ",,,," },
-            IE11 = {"0px,0px,0px,0px,0px", ",,,,", "8px,8px,8px,8px,8px", ",,,," })
+    @Alerts(DEFAULT = {"0px,0px,0px,0px,0px", ",,,,", "8px,8px,8px,8px,8px", ",,,," },
+            FF = {",0px,0px,0px,0px", ",,,,", ",8px,8px,8px,8px", ",,,," },
+            IE8 = {"0px,0px,0px,0px,0px", ",,,,", "15px 10px,10px,10px,15px,15px", ",,,," })
     public void testDefaultPaddingAndMargins() throws Exception {
         final String html =
             "<html>\n"
@@ -159,7 +155,6 @@
      */
     @Test
     @Alerts({"", "http://www.foo.com/blah.gif", "blah.gif" })
-    @NotYetImplemented({ FF17, FF24 })
     public void background() throws Exception {
         final String html =
             "<html>\n"