[HtmlUnit] SVN: [15302] trunk/htmlunit

rbri--- via HtmlUnit-develop <[email protected]>
Newsgroups gmane.comp.java.htmlunit.devel
Message-ID <[email protected]>
Revision: 15302
          http://sourceforge.net/p/htmlunit/code/15302
Author:   rbri
Date:     2018-06-13 17:58:09 +0000 (Wed, 13 Jun 2018)
Log Message:
-----------
test updates for chrome and ff60

Modified Paths:
--------------
    trunk/htmlunit/pom.xml
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/SharedArrayBufferTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCryptoTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedFontTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOutputElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java

Modified: trunk/htmlunit/pom.xml
===================================================================
--- trunk/htmlunit/pom.xml	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/pom.xml	2018-06-13 17:58:09 UTC (rev 15302)
@@ -18,10 +18,10 @@
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <additionalparam>-Xdoclint:none</additionalparam>
         <!-- As a property, as it is included in Checkstyle build -->
-        <checkstyle.version>8.10</checkstyle.version>
-        <jetty.version>9.4.10.v20180503</jetty.version>
+        <checkstyle.version>8.10.1</checkstyle.version>
+        <jetty.version>9.4.11.v20180605</jetty.version>
         <selenium.version>3.12.0</selenium.version>
-        <htmlunitdriver.version>2.30.1</htmlunitdriver.version>
+        <htmlunitdriver.version>2.31.0</htmlunitdriver.version>
     </properties>
 
     <build>
@@ -125,7 +125,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>--allow-script-in-comments</additionalparam>
                 </configuration>
@@ -213,7 +213,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-plugin</artifactId>
-                <version>1.9.5</version>
+                <version>1.10.0</version>
                 <configuration>
                     <tag>${project.name}-${project.version}</tag>
                     <message>Release ${project.version}</message>
@@ -250,7 +250,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
             </extension>
         </extensions>
     </build>
@@ -372,7 +372,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <configuration>
                     <excludePackageNames>com.gargoylesoftware.htmlunit.javascript:com.gargoylesoftware.htmlunit.protocol:com.gargoylesoftware.htmlunit.ssl:com.gargoylesoftware.htmlunit.html.xpath:com.gargoylesoftware.htmlunit.html.applets:com.gargoylesoftware.htmlunit.html.impl:com.gargoylesoftware.htmlunit.activex</excludePackageNames>
                     <additionalparam>--allow-script-in-comments</additionalparam>
@@ -397,7 +397,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.10.0</version>
                 <configuration>
                     <targetJdk>1.8</targetJdk>
             </configuration>
@@ -1069,7 +1069,7 @@
         <dependency>
             <groupId>org.tmatesoft.svnkit</groupId>
             <artifactId>svnkit</artifactId>
-            <version>1.9.2</version>
+            <version>1.9.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -125,9 +125,8 @@
     static {
         // FF60
         FIREFOX_60.applicationVersion_ = "5.0 (Windows)";
-        FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
-        FIREFOX_60.platform_ = PLATFORM_WIN32;
-        FIREFOX_60.buildId_ = "20170411115307";
+        FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0";
+        FIREFOX_60.buildId_ = "20180605201706";
         FIREFOX_60.productSub_ = "20100101";
         FIREFOX_60.headerNamesOrdered_ = new String[] {
             HttpHeader.HOST,
@@ -211,8 +210,8 @@
         EDGE.scriptAcceptHeader_ = "application/javascript, */*;q=0.8";
 
         // CHROME
-        CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.117 Safari/537.36";
-        CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.117 Safari/537.36";
+        CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36";
+        CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36";
 
         CHROME.applicationCodeName_ = "Mozilla";
         CHROME.vendor_ = "Google Inc.";
@@ -354,12 +353,6 @@
 
         // flush plugin (windows version)
         PluginConfiguration flash = new PluginConfiguration("Shockwave Flash",
-                "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll");
-        flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
-                "Shockwave Flash", "swf"));
-        FIREFOX_60.plugins_.add(flash);
-
-        flash = new PluginConfiguration("Shockwave Flash",
                 "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
         flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
                 "Shockwave Flash", "swf"));

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -141,9 +141,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "Accept: image/png,image/*;q=0.8,*/*;q=0.5",
-            CHROME = "Accept: image/webp,image/apng,image/*,*/*;q=0.8",
-            FF52 = "Accept: */*",
+    @Alerts(CHROME = "Accept: image/webp,image/apng,image/*,*/*;q=0.8",
+            FF = "Accept: */*",
             IE = "Accept: image/png, image/svg+xml, image/*;q=0.8, */*;q=0.5",
             EDGE = "Accept: image/png, image/svg+xml, image/jxr, image/*;q=0.8, */*;q=0.5")
     public void acceptHeaderImage() throws Exception {
@@ -389,8 +388,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "Accept: */*",
-            FF60 = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+    @Alerts("Accept: */*")
     public void acceptHeaderXMLHttpRequest() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -48,7 +48,7 @@
 public class ExternalTest {
 
     /** Chrome driver. */
-    static String CHROME_DRIVER_ = "2.38";
+    static String CHROME_DRIVER_ = "2.40";
 
     /**
      * Tests that POM dependencies are the latest.

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -81,19 +81,11 @@
                                 + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
         }
         if (getBrowserVersion().isFirefox()) {
-            if (getBrowserVersion().isFirefox52()) {
-                expectedHeaders = "Connection: keep-alive\n"
-                        + "Host: localhost:" + PORT + "\n"
-                        + "Referer: http://localhost:" + PORT + "/\n"
-                        + "Upgrade-Insecure-Requests: 1\n"
-                        + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
-            }
-            else {
-                expectedHeaders = "Connection: keep-alive\n"
-                        + "Host: localhost:" + PORT + "\n"
-                        + "Referer: http://localhost:" + PORT + "/\n"
-                        + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
-            }
+            expectedHeaders = "Connection: keep-alive\n"
+                    + "Host: localhost:" + PORT + "\n"
+                    + "Referer: http://localhost:" + PORT + "/\n"
+                    + "Upgrade-Insecure-Requests: 1\n"
+                    + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
         }
         if (getBrowserVersion().isIE()) {
             expectedHeaders = "Connection: keep-alive\n"
@@ -158,23 +150,13 @@
                                 + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
         }
         if (getBrowserVersion().isFirefox()) {
-            if (getBrowserVersion().getBrowserVersionNumeric() < 52) {
-                expectedHeaders = "Connection: keep-alive\n"
-                                    + "Content-Length: 48\n"
-                                    + "Content-Type: application/x-www-form-urlencoded\n"
-                                    + "Host: localhost:" + PORT + "\n"
-                                    + "Referer: http://localhost:" + PORT + "/\n"
-                                    + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
-            }
-            else {
-                expectedHeaders = "Connection: keep-alive\n"
-                        + "Content-Length: 48\n"
-                        + "Content-Type: application/x-www-form-urlencoded\n"
-                        + "Host: localhost:" + PORT + "\n"
-                        + "Referer: http://localhost:" + PORT + "/\n"
-                        + "Upgrade-Insecure-Requests: 1\n"
-                        + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
-            }
+            expectedHeaders = "Connection: keep-alive\n"
+                    + "Content-Length: 48\n"
+                    + "Content-Type: application/x-www-form-urlencoded\n"
+                    + "Host: localhost:" + PORT + "\n"
+                    + "Referer: http://localhost:" + PORT + "/\n"
+                    + "Upgrade-Insecure-Requests: 1\n"
+                    + "User-Agent: " + getBrowserVersion().getUserAgent() + "\n";
         }
         if (getBrowserVersion().isIE()) {
             expectedHeaders = "Cache-Control: no-cache\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -50,9 +50,7 @@
     @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS,
                         HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE},
-            FF60 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
-                        HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION},
-            FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
+            FF = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION})
@@ -97,9 +95,7 @@
                         HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.COOKIE},
-            FF60 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
-                        HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION},
-            FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
+            FF = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION,
                         HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,

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-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -132,7 +132,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function Animation() {\n    [native code]\n}")
+            FF = "function Animation() {\n    [native code]\n}")
     public void animation() throws Exception {
         test("Animation");
     }
@@ -324,8 +324,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            CHROME = "[object Atomics]")
+    @Alerts("exception")
     public void atomics() throws Exception {
         test("Atomics");
     }
@@ -460,7 +459,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function AudioScheduledSourceNode() { [native code] }")
+            CHROME = "function AudioScheduledSourceNode() { [native code] }",
+            FF60 = "function AudioScheduledSourceNode() {\n    [native code]\n}")
     public void audioScheduledSourceNode() throws Exception {
         test("AudioScheduledSourceNode");
     }
@@ -490,7 +490,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function BaseAudioContext() { [native code] }")
+            CHROME = "function BaseAudioContext() { [native code] }",
+            FF60 = "function BaseAudioContext() {\n    [native code]\n}")
     public void baseAudioContext() throws Exception {
         test("BaseAudioContext");
     }
@@ -1101,7 +1102,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function ConstantSourceNode() { [native code] }",
-            FF52 = "function ConstantSourceNode() {\n    [native code]\n}")
+            FF = "function ConstantSourceNode() {\n    [native code]\n}")
     public void constantSourceNode() throws Exception {
         test("ConstantSourceNode");
     }
@@ -1180,7 +1181,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function Credential() { [native code] }")
+            CHROME = "function Credential() { [native code] }",
+            FF60 = "function Credential() {\n    [native code]\n}")
     public void credential() throws Exception {
         test("Credential");
     }
@@ -1190,7 +1192,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function CredentialsContainer() { [native code] }")
+            CHROME = "function CredentialsContainer() { [native code] }",
+            FF60 = "function CredentialsContainer() {\n    [native code]\n}")
     public void credentialsContainer() throws Exception {
         test("CredentialsContainer");
     }
@@ -1255,8 +1258,9 @@
     @Test
     @Alerts(DEFAULT = "exception",
             EDGE = "function CSSConditionRule() { [native code] }",
-            FF = "[object CSSConditionRule]",
-            CHROME = "function CSSConditionRule() { [native code] }")
+            FF52 = "[object CSSConditionRule]",
+            CHROME = "function CSSConditionRule() { [native code] }",
+            FF60 = "function CSSConditionRule() {\n    [native code]\n}")
     public void cssConditionRule() throws Exception {
         test("CSSConditionRule");
     }
@@ -1266,7 +1270,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF = "[object CSSCounterStyleRule]")
+            FF52 = "[object CSSCounterStyleRule]",
+            FF60 = "function CSSCounterStyleRule() {\n    [native code]\n}")
     public void cssCounterStyleRule() throws Exception {
         test("CSSCounterStyleRule");
     }
@@ -1278,7 +1283,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSFontFaceRule]",
-            CHROME = "function CSSFontFaceRule() { [native code] }")
+            CHROME = "function CSSFontFaceRule() { [native code] }",
+            FF60 = "function CSSFontFaceRule() {\n    [native code]\n}")
     public void cssFontFaceRule() throws Exception {
         test("CSSFontFaceRule");
     }
@@ -1289,7 +1295,8 @@
     @Test
     @Alerts(DEFAULT = "function CSSGroupingRule() { [native code] }",
             IE = "exception",
-            FF = "[object CSSGroupingRule]")
+            FF52 = "[object CSSGroupingRule]",
+            FF60 = "function CSSGroupingRule() {\n    [native code]\n}")
     public void cssGroupingRule() throws Exception {
         test("CSSGroupingRule");
     }
@@ -1301,7 +1308,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSImportRule]",
-            CHROME = "function CSSImportRule() { [native code] }")
+            CHROME = "function CSSImportRule() { [native code] }",
+            FF60 = "function CSSImportRule() {\n    [native code]\n}")
     public void cssImportRule() throws Exception {
         test("CSSImportRule");
     }
@@ -1312,7 +1320,7 @@
     @Test
     @Alerts(DEFAULT = "[object CSSKeyframeRule]",
             CHROME = "function CSSKeyframeRule() { [native code] }",
-            FF60 = "exception")
+            FF60 = "function CSSKeyframeRule() {\n    [native code]\n}")
     public void cssKeyframeRule() throws Exception {
         test("CSSKeyframeRule");
     }
@@ -1322,8 +1330,8 @@
      */
     @Test
     @Alerts(DEFAULT = "function CSSKeyframesRule() { [native code] }",
-            FF60 = "exception",
             FF52 = "[object CSSKeyframesRule]",
+            FF60 = "function CSSKeyframesRule() {\n    [native code]\n}",
             IE = "[object CSSKeyframesRule]")
     public void cssKeyframesRule() throws Exception {
         test("CSSKeyframesRule");
@@ -1345,7 +1353,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSMediaRule]",
-            CHROME = "function CSSMediaRule() { [native code] }")
+            CHROME = "function CSSMediaRule() { [native code] }",
+            FF60 = "function CSSMediaRule() {\n    [native code]\n}")
     public void cssMediaRule() throws Exception {
         test("CSSMediaRule");
     }
@@ -1355,8 +1364,9 @@
      */
     @Test
     @Alerts(DEFAULT = "function CSSNamespaceRule() { [native code] }",
+            FF60 = "function CSSNamespaceRule() {\n    [native code]\n}",
             IE = "[object CSSNamespaceRule]",
-            FF = "exception")
+            FF52 = "exception")
     public void cssNamespaceRule() throws Exception {
         test("CSSNamespaceRule");
     }
@@ -1368,7 +1378,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSPageRule]",
-            CHROME = "function CSSPageRule() { [native code] }")
+            CHROME = "function CSSPageRule() { [native code] }",
+            FF60 = "function CSSPageRule() {\n    [native code]\n}")
     public void cssPageRule() throws Exception {
         test("CSSPageRule");
     }
@@ -1392,7 +1403,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSRule]",
-            CHROME = "function CSSRule() { [native code] }")
+            CHROME = "function CSSRule() { [native code] }",
+            FF60 = "function CSSRule() {\n    [native code]\n}")
     public void cssRule() throws Exception {
         test("CSSRule");
     }
@@ -1430,9 +1442,11 @@
      */
     @Test
     @Alerts(DEFAULT = "[object CSSStyleRule]",
-            CHROME = "function CSSStyleRule() { [native code] }")
+            CHROME = "function CSSStyleRule() { [native code] }",
+            FF60 = "function CSSStyleRule() {\n    [native code]\n}")
     @AlertsStandards(DEFAULT = "[object CSSStyleRule]",
             CHROME = "function CSSStyleRule() { [native code] }",
+            FF60 = "function CSSStyleRule() {\n    [native code]\n}",
             EDGE = "function CSSStyleRule() { [native code] }")
     public void cssStyleRule() throws Exception {
         test("CSSStyleRule");
@@ -1457,7 +1471,8 @@
     @Test
     @Alerts(DEFAULT = "function CSSSupportsRule() { [native code] }",
             IE = "exception",
-            FF = "[object CSSSupportsRule]")
+            FF52 = "[object CSSSupportsRule]",
+            FF60 = "function CSSSupportsRule() {\n    [native code]\n}")
     public void cssSupportsRule() throws Exception {
         test("CSSSupportsRule");
     }
@@ -1576,7 +1591,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function DataTransferItem() { [native code] }",
-            FF52 = "function DataTransferItem() {\n    [native code]\n}")
+            FF = "function DataTransferItem() {\n    [native code]\n}")
     public void dataTransferItem() throws Exception {
         test("DataTransferItem");
     }
@@ -1587,7 +1602,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function DataTransferItemList() { [native code] }",
-            FF52 = "function DataTransferItemList() {\n    [native code]\n}")
+            FF = "function DataTransferItemList() {\n    [native code]\n}")
     public void dataTransferItemList() throws Exception {
         test("DataTransferItemList");
     }
@@ -2094,10 +2109,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "function DOMSettableTokenList() {\n    [native code]\n}",
-            IE = "[object DOMSettableTokenList]",
-            CHROME = "exception",
-            FF52 = "exception")
+    @Alerts(DEFAULT = "exception",
+            IE = "[object DOMSettableTokenList]")
     public void domSettableTokenList() throws Exception {
         test("DOMSettableTokenList");
     }
@@ -2497,7 +2510,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF = "function External() {\n    [native code]\n}")
+            FF52 = "function External() {\n    [native code]\n}")
     public void external() throws Exception {
         test("External");
     }
@@ -2622,7 +2635,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function FileSystem() {\n    [native code]\n}")
+            FF = "function FileSystem() {\n    [native code]\n}")
     public void fileSystem() throws Exception {
         test("FileSystem");
     }
@@ -2632,7 +2645,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function FileSystemDirectoryEntry() {\n    [native code]\n}")
+            FF = "function FileSystemDirectoryEntry() {\n    [native code]\n}")
     public void fileSystemDirectoryEntry() throws Exception {
         test("FileSystemDirectoryEntry");
     }
@@ -2642,7 +2655,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function FileSystemDirectoryReader() {\n    [native code]\n}")
+            FF = "function FileSystemDirectoryReader() {\n    [native code]\n}")
     public void fileSystemDirectoryReader() throws Exception {
         test("FileSystemDirectoryReader");
     }
@@ -2652,7 +2665,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function FileSystemEntry() {\n    [native code]\n}")
+            FF = "function FileSystemEntry() {\n    [native code]\n}")
     public void fileSystemEntry() throws Exception {
         test("FileSystemEntry");
     }
@@ -2662,7 +2675,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function FileSystemFileEntry() {\n    [native code]\n}")
+            FF = "function FileSystemFileEntry() {\n    [native code]\n}")
     public void fileSystemFileEntry() throws Exception {
         test("FileSystemFileEntry");
     }
@@ -2978,7 +2991,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             IE = "[object HTMLAppletElement]",
-            FF = "function HTMLAppletElement() {\n    [native code]\n}")
+            FF52 = "function HTMLAppletElement() {\n    [native code]\n}")
     public void htmlAppletElement() throws Exception {
         test("HTMLAppletElement");
     }
@@ -3151,8 +3164,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function HTMLContentElement() { [native code] }",
-            FF60 = "function HTMLContentElement() {\n    [native code]\n}")
+            CHROME = "function HTMLContentElement() { [native code] }")
     public void htmlContentElement() throws Exception {
         test("HTMLContentElement");
     }
@@ -3223,7 +3235,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function HTMLDetailsElement() { [native code] }",
-            FF52 = "function HTMLDetailsElement() {\n    [native code]\n}")
+            FF = "function HTMLDetailsElement() {\n    [native code]\n}")
     public void htmlDetailsElement() throws Exception {
         test("HTMLDetailsElement");
     }
@@ -3935,8 +3947,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function HTMLShadowElement() { [native code] }",
-            FF60 = "function HTMLShadowElement() {\n    [native code]\n}")
+            CHROME = "function HTMLShadowElement() { [native code] }")
     public void htmlShadowElement() throws Exception {
         test("HTMLShadowElement");
     }
@@ -4471,7 +4482,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function IdleDeadline() { [native code] }")
+            CHROME = "function IdleDeadline() { [native code] }",
+            FF60 = "function IdleDeadline() {\n    [native code]\n}")
     public void idleDeadline() throws Exception {
         test("IdleDeadline");
     }
@@ -4482,7 +4494,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function IIRFilterNode() { [native code] }",
-            FF52 = "function IIRFilterNode() {\n    [native code]\n}")
+            FF = "function IIRFilterNode() {\n    [native code]\n}")
     public void iirFilterNode() throws Exception {
         test("IIRFilterNode");
     }
@@ -4527,7 +4539,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function ImageBitmapRenderingContext() { [native code] }",
-            FF52 = "function ImageBitmapRenderingContext() {\n    [native code]\n}")
+            FF = "function ImageBitmapRenderingContext() {\n    [native code]\n}")
     public void imageBitmapRenderingContext() throws Exception {
         test("ImageBitmapRenderingContext");
     }
@@ -4683,7 +4695,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function IntersectionObserver() { [native code] }")
+            CHROME = "function IntersectionObserver() { [native code] }",
+            FF60 = "function IntersectionObserver() {\n    [native code]\n}")
     public void intersectionObserver() throws Exception {
         test("IntersectionObserver");
     }
@@ -4693,7 +4706,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function IntersectionObserverEntry() { [native code] }")
+            CHROME = "function IntersectionObserverEntry() { [native code] }",
+            FF60 = "function IntersectionObserverEntry() {\n    [native code]\n}")
     public void intersectionObserverEntry() throws Exception {
         test("IntersectionObserverEntry");
     }
@@ -4769,7 +4783,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF = "function Iterator() {\n    [native code]\n}")
+            FF52 = "function Iterator() {\n    [native code]\n}")
     public void iterator() throws Exception {
         test("Iterator");
     }
@@ -5156,7 +5170,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function MediaQueryListEvent() { [native code] }")
+            CHROME = "function MediaQueryListEvent() { [native code] }",
+            FF60 = "function MediaQueryListEvent() {\n    [native code]\n}")
     public void mediaQueryListEvent() throws Exception {
         test("MediaQueryListEvent");
     }
@@ -5531,8 +5546,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "function MozContactChangeEvent() {\n    [native code]\n}")
+    @Alerts("exception")
     public void mozContactChangeEvent() throws Exception {
         test("MozContactChangeEvent");
     }
@@ -5541,8 +5555,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "[object MozCSSKeyframesRule]")
+    @Alerts("exception")
     public void mozCSSKeyframesRule() throws Exception {
         test("MozCSSKeyframesRule");
     }
@@ -5713,8 +5726,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "function MozPowerManager() {\n    [native code]\n}")
+    @Alerts("exception")
     public void mozPowerManager() throws Exception {
         test("MozPowerManager");
     }
@@ -5753,8 +5765,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "function MozSettingsEvent() {\n    [native code]\n}")
+    @Alerts("exception")
     public void mozSettingsEvent() throws Exception {
         test("MozSettingsEvent");
     }
@@ -6546,8 +6557,9 @@
      */
     @Test
     @Alerts(DEFAULT = "function PerformanceNavigationTiming() { [native code] }",
+            FF60 = "function PerformanceNavigationTiming() {\n    [native code]\n}",
             IE = "[object PerformanceNavigationTiming]",
-            FF = "exception")
+            FF52 = "exception")
     public void performanceNavigationTiming() throws Exception {
         test("PerformanceNavigationTiming");
     }
@@ -6557,7 +6569,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function PerformanceObserver() { [native code] }")
+            CHROME = "function PerformanceObserver() { [native code] }",
+            FF60 = "function PerformanceObserver() {\n    [native code]\n}")
     public void performanceObserver() throws Exception {
         test("PerformanceObserver");
     }
@@ -6567,7 +6580,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function PerformanceObserverEntryList() { [native code] }")
+            CHROME = "function PerformanceObserverEntryList() { [native code] }",
+            FF60 = "function PerformanceObserverEntryList() {\n    [native code]\n}")
     public void performanceObserverEntryList() throws Exception {
         test("PerformanceObserverEntryList");
     }
@@ -6638,7 +6652,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function Permissions() { [native code] }",
-            FF52 = "function Permissions() {\n    [native code]\n}")
+            FF = "function Permissions() {\n    [native code]\n}")
     public void permissions() throws Exception {
         test("Permissions");
     }
@@ -6658,7 +6672,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function PermissionStatus() { [native code] }",
-            FF52 = "function PermissionStatus() {\n    [native code]\n}")
+            FF = "function PermissionStatus() {\n    [native code]\n}")
     public void permissionStatus() throws Exception {
         test("PermissionStatus");
     }
@@ -6706,6 +6720,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function PointerEvent() { [native code] }",
+            FF60 = "function PointerEvent() {\n    [native code]\n}",
             IE = "[object PointerEvent]",
             EDGE = "function PointerEvent() { [native code] }")
     public void pointerEvent() throws Exception {
@@ -7188,7 +7203,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function RTCDataChannel() { [native code] }")
+            CHROME = "function RTCDataChannel() { [native code] }",
+            FF60 = "function RTCDataChannel() {\n    [native code]\n}")
     @NotYetImplemented(CHROME)
     public void rtcDataChannel() throws Exception {
         test("RTCDataChannel");
@@ -7474,8 +7490,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            CHROME = "function SharedArrayBuffer() { [native code] }")
+    @Alerts("exception")
     public void sharedArrayBuffer() throws Exception {
         test("SharedArrayBuffer");
     }
@@ -7792,7 +7807,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function SpeechSynthesis() {\n    [native code]\n}")
+            FF = "function SpeechSynthesis() {\n    [native code]\n}")
     public void speechSynthesis() throws Exception {
         test("SpeechSynthesis");
     }
@@ -7802,7 +7817,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function SpeechSynthesisErrorEvent() {\n    [native code]\n}")
+            FF = "function SpeechSynthesisErrorEvent() {\n    [native code]\n}")
     public void speechSynthesisErrorEvent() throws Exception {
         test("SpeechSynthesisErrorEvent");
     }
@@ -7813,7 +7828,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function SpeechSynthesisEvent() { [native code] }",
-            FF52 = "function SpeechSynthesisEvent() {\n    [native code]\n}")
+            FF = "function SpeechSynthesisEvent() {\n    [native code]\n}")
     public void speechSynthesisEvent() throws Exception {
         test("SpeechSynthesisEvent");
     }
@@ -7824,7 +7839,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function SpeechSynthesisUtterance() { [native code] }",
-            FF52 = "function SpeechSynthesisUtterance() {\n    [native code]\n}")
+            FF = "function SpeechSynthesisUtterance() {\n    [native code]\n}")
     public void speechSynthesisUtterance() throws Exception {
         test("SpeechSynthesisUtterance");
     }
@@ -7834,7 +7849,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF52 = "function SpeechSynthesisVoice() {\n    [native code]\n}")
+            FF = "function SpeechSynthesisVoice() {\n    [native code]\n}")
     public void speechSynthesisVoice() throws Exception {
         test("SpeechSynthesisVoice");
     }
@@ -7867,7 +7882,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF = "[object StopIteration]")
+            FF52 = "[object StopIteration]")
     public void stopIteration() throws Exception {
         test("StopIteration");
     }
@@ -7910,7 +7925,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function StorageManager() { [native code] }")
+            CHROME = "function StorageManager() { [native code] }",
+            FF60 = "function StorageManager() {\n    [native code]\n}")
     public void storageManager() throws Exception {
         test("StorageManager");
     }
@@ -8000,8 +8016,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "function SVGAltGlyphElement() {\n    [native code]\n}")
+    @Alerts("exception")
     public void svgAltGlyphElement() throws Exception {
         test("SVGAltGlyphElement");
     }
@@ -8305,8 +8320,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            FF60 = "function SVGDocument() {\n    [native code]\n}")
+    @Alerts("exception")
     public void svgDocument() throws Exception {
         test("SVGDocument");
     }
@@ -8767,7 +8781,8 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            CHROME = "function SVGGeometryElement() { [native code] }")
+            CHROME = "function SVGGeometryElement() { [native code] }",
+            FF60 = "function SVGGeometryElement() {\n    [native code]\n}")
     public void svgGeometryElement() throws Exception {
         test("SVGGeometryElement");
     }
@@ -8987,9 +9002,10 @@
      */
     @Test
     @Alerts(DEFAULT = "function SVGPathSeg() { [native code] }",
-            FF = "function SVGPathSeg() {\n    [native code]\n}",
+            FF52 = "function SVGPathSeg() {\n    [native code]\n}",
             IE = "[object SVGPathSeg]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSeg() throws Exception {
         test("SVGPathSeg");
     }
@@ -9000,7 +9016,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegArcAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegArcAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegArcAbs() throws Exception {
         test("SVGPathSegArcAbs");
     }
@@ -9011,7 +9028,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegArcRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegArcRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegArcRel() throws Exception {
         test("SVGPathSegArcRel");
     }
@@ -9022,7 +9040,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegClosePath() {\n    [native code]\n}",
             IE = "[object SVGPathSegClosePath]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegClosePath() throws Exception {
         test("SVGPathSegClosePath");
     }
@@ -9033,7 +9052,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoCubicAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoCubicAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoCubicAbs() throws Exception {
         test("SVGPathSegCurvetoCubicAbs");
     }
@@ -9044,7 +9064,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoCubicRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoCubicRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoCubicRel() throws Exception {
         test("SVGPathSegCurvetoCubicRel");
     }
@@ -9055,7 +9076,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoCubicSmoothAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoCubicSmoothAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoCubicSmoothAbs() throws Exception {
         test("SVGPathSegCurvetoCubicSmoothAbs");
     }
@@ -9066,7 +9088,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoCubicSmoothRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoCubicSmoothRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoCubicSmoothRel() throws Exception {
         test("SVGPathSegCurvetoCubicSmoothRel");
     }
@@ -9077,7 +9100,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoQuadraticAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoQuadraticAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoQuadraticAbs() throws Exception {
         test("SVGPathSegCurvetoQuadraticAbs");
     }
@@ -9088,7 +9112,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoQuadraticRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoQuadraticRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoQuadraticRel() throws Exception {
         test("SVGPathSegCurvetoQuadraticRel");
     }
@@ -9099,7 +9124,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoQuadraticSmoothAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoQuadraticSmoothAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoQuadraticSmoothAbs() throws Exception {
         test("SVGPathSegCurvetoQuadraticSmoothAbs");
     }
@@ -9110,7 +9136,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegCurvetoQuadraticSmoothRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegCurvetoQuadraticSmoothRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegCurvetoQuadraticSmoothRel() throws Exception {
         test("SVGPathSegCurvetoQuadraticSmoothRel");
     }
@@ -9121,7 +9148,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoAbs() throws Exception {
         test("SVGPathSegLinetoAbs");
     }
@@ -9132,7 +9160,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoHorizontalAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoHorizontalAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoHorizontalAbs() throws Exception {
         test("SVGPathSegLinetoHorizontalAbs");
     }
@@ -9143,7 +9172,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoHorizontalRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoHorizontalRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoHorizontalRel() throws Exception {
         test("SVGPathSegLinetoHorizontalRel");
     }
@@ -9154,7 +9184,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoRel() throws Exception {
         test("SVGPathSegLinetoRel");
     }
@@ -9165,7 +9196,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoVerticalAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoVerticalAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoVerticalAbs() throws Exception {
         test("SVGPathSegLinetoVerticalAbs");
     }
@@ -9176,7 +9208,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegLinetoVerticalRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegLinetoVerticalRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegLinetoVerticalRel() throws Exception {
         test("SVGPathSegLinetoVerticalRel");
     }
@@ -9198,7 +9231,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegMovetoAbs() {\n    [native code]\n}",
             IE = "[object SVGPathSegMovetoAbs]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegMovetoAbs() throws Exception {
         test("SVGPathSegMovetoAbs");
     }
@@ -9209,7 +9243,8 @@
     @Test
     @Alerts(DEFAULT = "function SVGPathSegMovetoRel() {\n    [native code]\n}",
             IE = "[object SVGPathSegMovetoRel]",
-            CHROME = "exception")
+            CHROME = "exception",
+            FF60 = "exception")
     public void svgPathSegMovetoRel() throws Exception {
         test("SVGPathSegMovetoRel");
     }
@@ -9628,7 +9663,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF = "function SVGZoomEvent() {\n    [native code]\n}",
+            FF52 = "function SVGZoomEvent() {\n    [native code]\n}",
             IE = "[object SVGZoomEvent]")
     public void svgZoomEvent() throws Exception {
         test("SVGZoomEvent");
@@ -10204,7 +10239,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VRDisplay() {\n    [native code]\n}")
     public void vrDisplay() throws Exception {
         test("VRDisplay");
     }
@@ -10213,7 +10249,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VRDisplayCapabilities() {\n    [native code]\n}")
     public void vrDisplayCapabilities() throws Exception {
         test("VRDisplayCapabilities");
     }
@@ -10222,7 +10259,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VREyeParameters() {\n    [native code]\n}")
     public void vrEyeParameters() throws Exception {
         test("VREyeParameters");
     }
@@ -10231,7 +10269,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VRFieldOfView() {\n    [native code]\n}")
     public void vrFieldOfView() throws Exception {
         test("VRFieldOfView");
     }
@@ -10258,7 +10297,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VRPose() {\n    [native code]\n}")
     public void vrPose() throws Exception {
         test("VRPose");
     }
@@ -10276,7 +10316,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception")
+    @Alerts(DEFAULT = "exception",
+            FF60 = "function VRStageParameters() {\n    [native code]\n}")
     public void vrStageParameters() throws Exception {
         test("VRStageParameters");
     }
@@ -10450,7 +10491,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGL2RenderingContext() { [native code] }",
-            FF52 = "function WebGL2RenderingContext() {\n    [native code]\n}")
+            FF = "function WebGL2RenderingContext() {\n    [native code]\n}")
     public void webGL2RenderingContext() throws Exception {
         test("WebGL2RenderingContext");
     }
@@ -10482,9 +10523,8 @@
      */
     @Test
     @Alerts(DEFAULT = "function WebGLContextEvent() { [native code] }",
-            FF60 = "exception",
             IE = "\nfunction WebGLContextEvent() {\n    [native code]\n}\n",
-            FF52 = "function WebGLContextEvent() {\n    [native code]\n}")
+            FF = "function WebGLContextEvent() {\n    [native code]\n}")
     public void webGLContextEvent() throws Exception {
         test("WebGLContextEvent");
     }
@@ -10517,7 +10557,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGLQuery() { [native code] }",
-            FF52 = "function WebGLQuery() {\n    [native code]\n}")
+            FF = "function WebGLQuery() {\n    [native code]\n}")
     public void webGLQuery() throws Exception {
         test("WebGLQuery");
     }
@@ -10552,7 +10592,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGLSampler() { [native code] }",
-            FF52 = "function WebGLSampler() {\n    [native code]\n}")
+            FF = "function WebGLSampler() {\n    [native code]\n}")
     public void webGLSampler() throws Exception {
         test("WebGLSampler");
     }
@@ -10585,7 +10625,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGLSync() { [native code] }",
-            FF52 = "function WebGLSync() {\n    [native code]\n}")
+            FF = "function WebGLSync() {\n    [native code]\n}")
     public void webGLSync() throws Exception {
         test("WebGLSync");
     }
@@ -10616,7 +10656,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGLTransformFeedback() { [native code] }",
-            FF52 = "function WebGLTransformFeedback() {\n    [native code]\n}")
+            FF = "function WebGLTransformFeedback() {\n    [native code]\n}")
     public void webGLTransformFeedback() throws Exception {
         test("WebGLTransformFeedback");
     }
@@ -10638,7 +10678,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function WebGLVertexArrayObject() { [native code] }",
-            FF52 = "function WebGLVertexArrayObject() {\n    [native code]\n}")
+            FF = "function WebGLVertexArrayObject() {\n    [native code]\n}")
     public void webGLVertexArrayObject() throws Exception {
         test("WebGLVertexArrayObject");
     }
@@ -10678,7 +10718,7 @@
     @Alerts(DEFAULT = "exception",
             CHROME = "function DOMMatrix() { [native code] }",
             EDGE = "function WebKitCSSMatrix() { [native code] }",
-            FF52 = "function WebKitCSSMatrix() {\n    [native code]\n}")
+            FF = "function WebKitCSSMatrix() {\n    [native code]\n}")
     @NotYetImplemented(CHROME)
     public void webKitCSSMatrix() throws Exception {
         test("WebKitCSSMatrix");

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -188,8 +188,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "undefined",
-            CHROME = "object")
+    @Alerts("undefined")
     public void atomics() throws Exception {
         test("Atomics");
     }
@@ -4970,8 +4969,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "undefined",
-            CHROME = "function")
+    @Alerts("undefined")
     public void sharedArrayBuffer() throws Exception {
         test("SharedArrayBuffer");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -530,6 +530,7 @@
     @Test
     @Alerts(DEFAULT = {"0,0", "11,11", "0,11", "0,11"},
             CHROME = {"0,0", "11,11", "11,11", "11,11"},
+            FF60 = {"0,0", "11,11", "11,11", "11,11"},
             IE = {"0,0", "0,0", "0,0", "0,11"})
     public void selection2_2() throws Exception {
         selection2(-3, 15);

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -203,6 +203,7 @@
     @Test
     @Alerts(DEFAULT = {"0,0", "11,11", "0,11", "0,11"},
             CHROME = {"0,0", "11,11", "11,11", "11,11"},
+            FF60 = {"0,0", "11,11", "11,11", "11,11"},
             IE = {"0,0", "0,0", "0,0", "0,11"})
     public void selection2_2() throws Exception {
         selection2(-3, 15);
@@ -508,7 +509,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"},
-            CHROME = {"0", "2", "1", "2", "1", "1"})
+            CHROME = {"0", "2", "1", "2", "1", "1"},
+            FF60 = {"0", "2", "1", "2", "1", "1"})
     public void labels() throws Exception {
         final String html =
             "<html><head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -43,7 +43,6 @@
      */
     @Test
     @Alerts(DEFAULT = {"1<>5", "5<>2", "1<>2", "5<>1", "2<>1", "1<>1", "5<>9"},
-            FF60 = {"1<>5", "5<>2", "1<>2", "1<>9", "5<>1", "1<>1", "2<>1", "2<>9", "5<>9"},
             IE = {"5<>1", "2<>5", "2<>1", "2<>5", "1<>5", "1<>2", "1<>1", "9<>5"})
     @NotYetImplemented({FF60, IE})
     public void sortSteps() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -113,7 +113,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("function anonymous() {\n    var x = 1;\n}")
+    @Alerts(DEFAULT = "function anonymous() {\n    var x = 1;\n}",
+            CHROME = "function anonymous(\n) {\n    var x = 1;\n}")
     public void newFunctionToString() throws Exception {
         final String html
             = "<html><head><title>foo</title><script>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -422,7 +422,6 @@
      */
     @Test
     @Alerts(DEFAULT = "[object Map Iterator]",
-            FF60 = "[object Object]",
             IE = {})
     @NotYetImplemented(FF60)
     public void iteratorPrototype() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -216,10 +216,9 @@
      * @throws Exception on test failure
      */
     @Test
-    @Alerts(FF60 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll"},
-            FF52 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll"},
-            CHROME = "Shockwave Flash not available",
-            IE = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "Flash32_29_0_0_140.ocx"},
+    @Alerts(DEFAULT = "Shockwave Flash not available",
+            FF52 = {"Shockwave Flash", "Shockwave Flash 30.0 r0", "30.0.0.113", "NPSWF64_30_0_0_113.dll"},
+            IE = {"Shockwave Flash", "Shockwave Flash 30.0 r0", "30.0.0.113", "Flash32_30_0_0_113.ocx"},
             EDGE = {"Shockwave Flash", "Shockwave Flash 18.0 r0", "18.0.0.232", "Flash.ocx"})
     public void pluginsShockwaveFlash() throws Exception {
         final String html = "<html>\n"
@@ -386,8 +385,8 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF60 = "20170411115307",
-            FF52 = "20180315163333")
+            FF60 = "20180605201706",
+            FF52 = "20180430140610")
     public void buildID() throws Exception {
         final String html
             = "<html><head><title>First</title>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PromiseTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -14,8 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -23,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;
 
 /**
@@ -461,9 +458,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"true", "fulfilled!", "TypeError: Throwing 1", "Resolving"},
-            CHROME = {"true", "fulfilled!", "Resolving"},
             IE = "")
-    @NotYetImplemented(CHROME)
     public void resolveThenables() throws Exception {
         final String html = "<html>\n"
             + "<head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -153,7 +153,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "0")
+    @Alerts("0")
     public void sliceInvalidStartIndexPositiveInfinity() throws Exception {
         sliceInvalidIndex("Number.POSITIVE_INFINITY");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/SharedArrayBufferTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/SharedArrayBufferTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/SharedArrayBufferTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -16,6 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,6 +31,7 @@
  * @author Ronald Brill
  */
 @RunWith(BrowserRunner.class)
+@Ignore
 public class SharedArrayBufferTest extends WebDriverTestCase {
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -193,8 +193,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"rendering...", "...done"},
-            FF60 = {"rendering...", "exception"})
+    @Alerts(DEFAULT = {"rendering...", "...done"})
     public void drawImage_noImage() throws Exception {
         final String html = "<html><body>\n"
             + "<img id='myImage'>\n"
@@ -217,8 +216,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"rendering...", "...done"},
-            FF60 = {"rendering...", "exception"})
+    @Alerts(DEFAULT = {"rendering...", "...done"})
     public void drawImage_invalidImage() throws Exception {
         try (InputStream is = getClass().getResourceAsStream("invalid.png")) {
             final byte[] directBytes = IOUtils.toByteArray(is);

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCryptoTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCryptoTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCryptoTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -49,6 +49,12 @@
                         "private", "false", "sign",
                         "name RSASSA-PKCS1-v1_5", "hash [object Object]", "modulusLength 2048",
                         "publicExponent 1,0,1"},
+            FF60 = {"[object Crypto]", "public", "true", "verify",
+                        "name RSASSA-PKCS1-v1_5", "hash [object Object]", "modulusLength 2048",
+                        "publicExponent 1,0,1",
+                        "private", "false", "sign",
+                        "name RSASSA-PKCS1-v1_5", "hash [object Object]", "modulusLength 2048",
+                        "publicExponent 1,0,1"},
             FF52 = {"[object Crypto]", "public", "true", "verify",
                         "name RSASSA-PKCS1-v1_5", "hash [object Object]", "modulusLength 2048",
                         "publicExponent 1,0,1",

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -34,8 +34,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"[object CSSKeyframesRule]", "7"},
-            FF60 = {"[object MozCSSKeyframesRule]", "7"})
+    @Alerts({"[object CSSKeyframesRule]", "7"})
     public void simple() throws Exception {
         final String html
             = "<html><body>\n"
@@ -64,8 +63,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"[object CSSKeyframesRule]", "identifier"},
-            FF60 = {"[object MozCSSKeyframesRule]", "identifier"})
+    @Alerts({"[object CSSKeyframesRule]", "identifier"})
     @NotYetImplemented
     public void name() throws Exception {
         final String html

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -122,8 +122,7 @@
      * @throws Exception on test failure
      */
     @Test
-    @Alerts(DEFAULT = {"1", "[object CSSKeyframesRule]"},
-            FF60 = {"1", "[object MozCSSKeyframesRule]"})
+    @Alerts({"1", "[object CSSKeyframesRule]"})
     public void ruleListKeyframes() throws Exception {
         final String html = "<html><head><title>First</title>\n"
                 + "<style>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedFontTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedFontTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedFontTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -114,8 +114,10 @@
                 "normal", "normal",
                 "oblique 15px arial, sans-serif", "italic normal 400 normal 15px / normal arial, sans-serif",
                 "oblique", "italic"},
-            FF = {"15px arial,sans-serif", "", "normal", "normal",
+            FF52 = {"15px arial,sans-serif", "", "normal", "normal",
                     "oblique 15px arial,sans-serif", "", "oblique", "oblique"},
+            FF60 = {"15px arial, sans-serif", "", "normal", "normal",
+                    "oblique 15px arial, sans-serif", "", "oblique", "oblique"},
             IE = {"15px/normal arial, sans-serif", "", "normal", "normal",
                     "oblique 15px/normal arial, sans-serif", "", "oblique", "oblique"})
     @NotYetImplemented

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -170,6 +170,26 @@
      */
     @Test
     @Alerts(DEFAULT = "true",
+            CHROME = "false")
+    public void _WEBKIT_BOX_FLEX_GROUP() throws Exception {
+        test("webkitBoxFlexGroup");
+    }
+
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts(DEFAULT = "true",
+            CHROME = "false")
+    public void _WEBKIT_BOX_LINES() throws Exception {
+        test("webkitBoxLines");
+    }
+
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts(DEFAULT = "true",
             IE = "false",
             FF60 = "false")
     public void _WEBKIT_BOX_ORDINAL_GROUP() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -274,7 +274,7 @@
             CHROME = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true",
                         "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.1: true",
                         "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: true"},
-            FF52 = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true",
+            FF = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true",
                         "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.1: true",
                         "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: true"})
     public void hasFeature_SVG_BasicStructure() throws Exception {
@@ -291,7 +291,7 @@
             CHROME = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true",
                         "http://www.w3.org/TR/SVG11/feature#Shape 1.1: true",
                         "http://www.w3.org/TR/SVG11/feature#Shape 1.2: true"},
-            FF52 = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true",
+            FF = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true",
                         "http://www.w3.org/TR/SVG11/feature#Shape 1.1: true",
                         "http://www.w3.org/TR/SVG11/feature#Shape 1.2: true"})
     public void hasFeature_SVG_Shape() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -14,8 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.dom;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -147,9 +145,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "[object XMLDocument]",
-            FF60 = "[object SVGDocument]")
-    @NotYetImplemented(FF60)
+    @Alerts("[object XMLDocument]")
     public void parseFromString_application_svgXml() throws Exception {
         final String content = HtmlPageTest.STANDARDS_MODE_PREFIX_
             + "<html><head><title>foo</title><script>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -39,9 +39,6 @@
     @Alerts(DEFAULT = {"[object DocumentType]", "true", "html,10,null,undefined,undefined,undefined",
                         "html,-//W3C//DTD XHTML 1.0 Strict//EN,http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd,"
                         + "undefined,undefined,undefined"},
-            FF60 = {"[object DocumentType]", "true", "html,10,null,null,null,null",
-                        "html,-//W3C//DTD XHTML 1.0 Strict//EN,http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd,"
-                            + "undefined,undefined,undefined"},
             IE = {"[object DocumentType]", "true", "html,10,null,null,null,null",
                         "html,-//W3C//DTD XHTML 1.0 Strict//EN,http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd,"
                         + "null,null,null"})
@@ -78,8 +75,6 @@
     @Test
     @Alerts(DEFAULT = {"[object DocumentType]", "greeting,10,null,undefined,undefined,undefined",
                     "greeting,MyIdentifier,hello.dtd,undefined,undefined,undefined"},
-            FF60 = {"[object DocumentType]", "greeting,10,null,null,null,null",
-                    "greeting,MyIdentifier,hello.dtd,undefined,undefined,undefined"},
             IE = {"[object DocumentType]", "greeting,10,null,null,null,null",
                     "greeting,MyIdentifier,hello.dtd,null,null,null"})
     public void doctype_xml() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEventTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEventTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -300,7 +300,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"13", "13", "13"},
-            FF = {"0", "13", "13"})
+            FF52 = {"0", "13", "13"},
+            FF60 = {"10", "0", "10"})
     public void keyCodeEnter_keypress() throws Exception {
         final String html = "<html>\n"
             + "<head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -56,7 +56,6 @@
      */
     @Test
     @Alerts(DEFAULT = {"-[object MessageEvent]", "-type-message", "-false", "-false", "-null", "-", "-", "-null"},
-            FF60 = {"-[object MessageEvent]", "-type-message", "-false", "-false", "-undefined", "-", "-", "-null"},
             IE = "exception")
     public void create_ctor() throws Exception {
         final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
@@ -130,7 +129,7 @@
     @Test
     @Alerts(DEFAULT = {"-[object MessageEvent]", "-message", "-true", "-true", "-hello",
                             "-http://localhost:", "-2", "-[object Window]"},
-            FF52 = "exception",
+            FF = "exception",
             IE = {"-[object MessageEvent]", "-message", "-true", "-true", "-hello",
                             "-http://localhost:", "-undefined", "-[object Window]"})
     @NotYetImplemented(FF52)

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	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -827,7 +827,7 @@
     @Test
     @Alerts(DEFAULT = {"something", "null"},
             CHROME = {"something", "0"},
-            FF52 = {"something", "0"})
+            FF = {"something", "0"})
     public void innerText_null() throws Exception {
         final String html = "<html><head>\n"
             + "<script>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -473,7 +473,6 @@
       */
     @Test
     @Alerts(DEFAULT = {"number: 300", "number: 200", "number: 0", "number: 0", "number: 0", "number: 0"},
-            FF60 = {"number: 300", "number: 200", "number: 24", "number: 24", "number: 24", "number: 24"},
             IE = {"number: 300", "number: 200", "number: 28", "number: 30", "number: 28", "number: 30"})
     @NotYetImplemented(FF52)
     public void widthHeightEmptySource() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOutputElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOutputElementTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOutputElementTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -34,7 +34,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"},
-            CHROME = {"0", "2", "1", "2", "1", "1"})
+            CHROME = {"0", "2", "1", "2", "1", "1"},
+            FF60 = {"0", "2", "1", "2", "1", "1"})
     public void labels() throws Exception {
         final String html =
             "<html><head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElementTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElementTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -34,7 +34,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"},
-            CHROME = {"0", "2", "1", "2", "1", "1"})
+            CHROME = {"0", "2", "1", "2", "1", "1"},
+            FF60 = {"0", "2", "1", "2", "1", "1"})
     public void labels() throws Exception {
         final String html =
             "<html><head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java	2018-06-13 13:41:50 UTC (rev 15301)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java	2018-06-13 17:58:09 UTC (rev 15302)
@@ -173,7 +173,6 @@
      */
     @Test
     @Alerts(DEFAULT = "n. Chr. Donnerstag",
-            FF60 = "",
             IE = "\u200EDonnerstag")
     @NotYetImplemented
     public void format_weekday_long_weekday_era() throws Exception {
@@ -198,7 +197,6 @@
      */
     @Test
     @Alerts(DEFAULT = "2012 n. Chr. Donnerstag",
-            FF60 = "",
             IE = "\u200EDonnerstag\u200E,"
                 + " \u200E20\u200E. \u200EDezember\u200E \u200E2012\u200E \u200E04\u200E:\u200E00\u200E:\u200E00")
     @NotYetImplemented
@@ -212,7 +210,6 @@
      */
     @Test
     @Alerts(DEFAULT = "Dezember 2012 n. Chr. Donnerstag",
-            FF60 = "",
             IE = "\u200EDonnerstag\u200E,"
                 + " \u200E20\u200E. \u200EDezember\u200E \u200E2012\u200E \u200E04\u200E:\u200E00\u200E:\u200E00")
     @NotYetImplemented
@@ -1053,7 +1050,6 @@
      */
     @Test
     @Alerts(DEFAULT = "20.12.2012",
-            FF60 = "20/12/2012",
             IE = "\u200E20\u200E.\u200E12\u200E.\u200E2012")
     public void format_fr_ch() throws Exception {
         test("new Intl.DateTimeFormat('fr-CH').format(date)");
@@ -1116,7 +1112,6 @@
      */
     @Test
     @Alerts(DEFAULT = "20. 12. 2012.",
-            FF60 = "20.12.2012.",
             IE = "\u200E20\u200E.\u200E12\u200E.\u200E2012\u200E.")
     public void format_hr() throws Exception {
         test("new Intl.DateTimeFormat('hr').format(date)");
@@ -1127,7 +1122,6 @@
      */
     @Test
     @Alerts(DEFAULT = "20. 12. 2012.",
-            FF60 = "20.12.2012.",
             IE = "\u200E20\u200E.\u200E12\u200E.\u200E2012\u200E.")
     public void format_hr_hr() throws Exception {
         test("new Intl.DateTimeFormat('hr-HR').format(date)");
@@ -1311,7 +1305,6 @@
      */
     @Test
     @Alerts(DEFAULT = "2012.12.20.",
-            FF60 = "20.12.2012.",
             IE = "\u200E2012\u200E.\u200E12\u200E.\u200E20\u200E.")
     public void format_lv() throws Exception {
         test("new Intl.DateTimeFormat('lv').format(date)");
@@ -1322,7 +1315,6 @@
      */
     @Test
     @Alerts(DEFAULT = "2012.12.20.",
-            FF60 = "20.12.2012.",
             IE = "\u200E2012\u200E.\u200E12\u200E.\u200E20\u200E.")
     public void format_lv_lv() throws Exception {
         test("new Intl.DateTimeFormat('lv-LV').format(date)");


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.