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

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

Revision: 15369
          http://sourceforge.net/p/htmlunit/code/15369
Author:   rbri
Date:     2018-06-20 10:04:14 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -1507,7 +1507,7 @@
      * Indicates, that the pathname for the url 'blank' is empty;
      * instead of 'blank'.
      */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     URL_ABOUT_BLANK_HAS_BLANK_PATH,
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,7 +17,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -168,7 +167,7 @@
      * Returns the {@code scrollRestoration} property.
      * @return the {@code scrollRestoration} property
      */
-    @JsxGetter({CHROME, FF52})
+    @JsxGetter({CHROME, FF})
     public String getScrollRestoration() {
         return scrollRestoration_;
     }
@@ -176,7 +175,7 @@
     /**
      * @param scrollRestoration the new value
      */
-    @JsxSetter({CHROME, FF52})
+    @JsxSetter({CHROME, FF})
     public void setScrollRestoration(final String scrollRestoration) {
         if (SCROLL_RESTAURATION_AUTO.equals(scrollRestoration)) {
             scrollRestoration_ = SCROLL_RESTAURATION_AUTO;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
@@ -911,7 +912,7 @@
                 + "width",
             CHROME = "-",
             FF60 = "-")
-    @NotYetImplemented({FF, IE})
+    @NotYetImplemented({FF52, IE})
     public void applet() throws Exception {
         test("applet");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import org.junit.Test;
@@ -23,10 +24,10 @@
 import org.junit.runner.RunWith;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
-import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.BrowserRunner.AlertsStandards;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 import com.gargoylesoftware.htmlunit.annotations.StandardsMode;
 
@@ -7205,7 +7206,7 @@
     @Alerts(DEFAULT = "exception",
             CHROME = "function RTCDataChannel() { [native code] }",
             FF60 = "function RTCDataChannel() {\n    [native code]\n}")
-    @NotYetImplemented(CHROME)
+    @NotYetImplemented({CHROME, FF60})
     public void rtcDataChannel() throws Exception {
         test("RTCDataChannel");
     }
@@ -10241,6 +10242,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRDisplay() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrDisplay() throws Exception {
         test("VRDisplay");
     }
@@ -10251,6 +10253,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRDisplayCapabilities() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrDisplayCapabilities() throws Exception {
         test("VRDisplayCapabilities");
     }
@@ -10261,6 +10264,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VREyeParameters() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrEyeParameters() throws Exception {
         test("VREyeParameters");
     }
@@ -10271,6 +10275,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRFieldOfView() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrFieldOfView() throws Exception {
         test("VRFieldOfView");
     }
@@ -10299,6 +10304,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRPose() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrPose() throws Exception {
         test("VRPose");
     }
@@ -10318,6 +10324,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRStageParameters() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrStageParameters() throws Exception {
         test("VRStageParameters");
     }