[HtmlUnit] SVN: [15266] trunk/htmlunit

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

Revision: 15266
          http://sourceforge.net/p/htmlunit/code/15266
Author:   rbri
Date:     2018-05-16 17:40:58 +0000 (Wed, 16 May 2018)
Log Message:
-----------
update selenium

Modified Paths:
--------------
    trunk/htmlunit/pom.xml
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java

Modified: trunk/htmlunit/pom.xml
===================================================================
--- trunk/htmlunit/pom.xml	2018-05-16 16:24:17 UTC (rev 15265)
+++ trunk/htmlunit/pom.xml	2018-05-16 17:40:58 UTC (rev 15266)
@@ -20,7 +20,8 @@
         <!-- As a property, as it is included in Checkstyle build -->
         <checkstyle.version>8.10</checkstyle.version>
         <jetty.version>9.4.10.v20180503</jetty.version>
-        <selenium.version>3.11.0</selenium.version>
+        <selenium.version>3.12.0</selenium.version>
+        <htmlunitdriver.version>2.30.1</htmlunitdriver.version>
     </properties>
 
     <build>
@@ -956,7 +957,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>htmlunit-driver</artifactId>
-            <version>2.30.0</version>
+            <version>${htmlunitdriver.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-05-16 16:24:17 UTC (rev 15265)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-05-16 17:40:58 UTC (rev 15266)
@@ -24,7 +24,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -31,7 +30,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-// import org.junit.Test;
+import org.junit.Test;
 
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -57,31 +56,31 @@
      *
      * @throws Exception if an error occurs
      */
-    // @Test
+    @Test
     public void pom() throws Exception {
-        if (isDifferentWeek()) {
-            final Map<String, String> properties = new HashMap<>();
-            final List<String> lines = FileUtils.readLines(new File("pom.xml"), ISO_8859_1);
-            for (int i = 0; i < lines.size(); i++) {
-                final String line = lines.get(i);
-                if (line.trim().equals("<properties>")) {
-                    processProperties(lines, i + 1, properties);
-                }
-                if (line.contains("artifactId") && !line.contains(">htmlunit<")) {
-                    final String artifactId = getValue(line);
-                    final String groupId = getValue(lines.get(i - 1));
-                    if (!lines.get(i + 1).contains("</exclusion>")) {
-                        String version = getValue(lines.get(i + 1));
-                        if (version.startsWith("${")) {
-                            version = properties.get(version.substring(2, version.length() - 1));
-                        }
-                        assertVersion(groupId, artifactId, version);
-                    }
-                }
-            }
-            assertVersion("org.sonatype.oss", "oss-parent", "9");
-            assertChromeDriver();
-        }
+//        if (isDifferentWeek()) {
+//            final Map<String, String> properties = new HashMap<>();
+//            final List<String> lines = FileUtils.readLines(new File("pom.xml"), ISO_8859_1);
+//            for (int i = 0; i < lines.size(); i++) {
+//                final String line = lines.get(i);
+//                if (line.trim().equals("<properties>")) {
+//                    processProperties(lines, i + 1, properties);
+//                }
+//                if (line.contains("artifactId") && !line.contains(">htmlunit<")) {
+//                    final String artifactId = getValue(line);
+//                    final String groupId = getValue(lines.get(i - 1));
+//                    if (!lines.get(i + 1).contains("</exclusion>")) {
+//                        String version = getValue(lines.get(i + 1));
+//                        if (version.startsWith("${")) {
+//                            version = properties.get(version.substring(2, version.length() - 1));
+//                        }
+//                        assertVersion(groupId, artifactId, version);
+//                    }
+//                }
+//            }
+//            assertVersion("org.sonatype.oss", "oss-parent", "9");
+//            assertChromeDriver();
+//        }
     }
 
     private static void processProperties(final List<String> lines, int i, final Map<String, String> map) {
@@ -112,7 +111,7 @@
      *
      * @throws Exception if an error occurs
      */
-    // @Test
+    @Test
     public void snapshot() throws Exception {
         if (isDifferentWeek()) {
             final List<String> lines = FileUtils.readLines(new File("pom.xml"), ISO_8859_1);