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

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

Revision: 15340
          http://sourceforge.net/p/htmlunit/code/15340
Author:   rbri
Date:     2018-06-17 08:14:55 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-17 08:14:55 UTC (rev 15340)
@@ -108,7 +108,7 @@
     public static final BrowserVersion INTERNET_EXPLORER = new BrowserVersion(11, "IE");
 
     /** Latest Chrome. */
-    public static final BrowserVersion CHROME = new BrowserVersion(60, "Chrome");
+    public static final BrowserVersion CHROME = new BrowserVersion(67, "Chrome");
 
     /** Microsoft Edge. Work In Progress!!! */
     public static final BrowserVersion EDGE = new BrowserVersion(14, "Edge");

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2018-06-17 08:14:55 UTC (rev 15340)
@@ -31,10 +31,10 @@
      */
     @Test
     public void getBrowserVersionNumeric() {
-        assertEquals(45, BrowserVersion.FIREFOX_60.getBrowserVersionNumeric());
+        assertEquals(60, BrowserVersion.FIREFOX_60.getBrowserVersionNumeric());
         assertEquals(52, BrowserVersion.FIREFOX_52.getBrowserVersionNumeric());
         assertEquals(11, BrowserVersion.INTERNET_EXPLORER.getBrowserVersionNumeric());
-        assertEquals(60, BrowserVersion.CHROME.getBrowserVersionNumeric());
+        assertEquals(67, BrowserVersion.CHROME.getBrowserVersionNumeric());
         assertEquals(14, BrowserVersion.EDGE.getBrowserVersionNumeric());
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java	2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java	2018-06-17 08:14:55 UTC (rev 15340)
@@ -98,7 +98,8 @@
      */
     @Test
     @Alerts(DEFAULT = "[object HTMLAppletElement]",
-            CHROME = "[object HTMLUnknownElement]")
+            CHROME = "[object HTMLUnknownElement]",
+            FF60 = "[object HTMLUnknownElement]")
     public void applet() throws Exception {
         test("applet");
     }
@@ -465,9 +466,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "[object HTMLElement]",
-            CHROME = "[object HTMLPreElement]",
-            FF52 = "[object HTMLPreElement]",
+    @Alerts(DEFAULT = "[object HTMLPreElement]",
             IE = "[object HTMLBlockElement]")
     public void xmp() throws Exception {
         test("xmp");
@@ -825,9 +824,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "[object HTMLElement]",
-            CHROME = "[object HTMLPreElement]",
-            FF52 = "[object HTMLPreElement]",
+    @Alerts(DEFAULT = "[object HTMLPreElement]",
             IE = "[object HTMLBlockElement]")
     public void listing() throws Exception {
         test("listing");
@@ -1307,9 +1304,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "[object HTMLUnknownElement]",
-            CHROME = "[object HTMLElement]",
-            FF52 = "[object HTMLElement]")
+    @Alerts(DEFAULT = "[object HTMLElement]",
+            IE = "[object HTMLUnknownElement]")
     public void summary() throws Exception {
         test("summary");
     }
@@ -1657,9 +1653,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "[object HTMLUnknownElement]",
-            CHROME = "[object HTMLDetailsElement]",
-            FF52 = "[object HTMLDetailsElement]")
+    @Alerts(DEFAULT = "[object HTMLDetailsElement]",
+            IE = "[object HTMLUnknownElement]")
     public void details() throws Exception {
         test("details");
     }
@@ -2023,9 +2018,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "[object HTMLContentElement]",
-            FF52 = "[object HTMLUnknownElement]",
-            IE = "[object HTMLUnknownElement]")
+    @Alerts(DEFAULT = "[object HTMLUnknownElement]",
+            CHROME = "[object HTMLContentElement]")
     public void content() throws Exception {
         test("content");
     }