[SUREFIRE-2214] Uprade to HtmlUnit 3.8.0

This closes #688

Author: rbri

maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml

@@ -40,9 +40,9 @@
  <scope>test</scope>
  </dependency>
  <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
  <artifactId>htmlunit</artifactId>
- <version>2.3</version>
+ <version>3.8.0</version>
  <scope>test</scope>
  </dependency>
  </dependencies>

maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java

@@ -22,8 +22,8 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import junit.framework.TestCase;
 
 public class BasicIT
@@ -48,16 +48,16 @@ public void tearDown()
  {
  if ( client != null )
  {
- client.closeAllWindows();
+ client.close();
  client = null;
  }
  }
 
  public void testSmokes()
  throws Exception
  {
- client.setThrowExceptionOnFailingStatusCode( false );
+ client.getOptions().setThrowExceptionOnFailingStatusCode( false );
  HtmlPage page = client.getPage( baseUrl + "index.html" );
- assertFalse( page.asText().contains( "Hello World" ) );
+ assertFalse( page.asNormalizedText().contains( "Hello World" ) );
  }
 }

maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml

@@ -40,9 +40,9 @@
  <scope>test</scope>
  </dependency>
  <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
  <artifactId>htmlunit</artifactId>
- <version>2.3</version>
+ <version>3.8.0</version>
  <scope>test</scope>
  </dependency>
  </dependencies>

maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java

@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import junit.framework.TestCase;
 
 public class BasicIT
@@ -47,16 +47,16 @@ public void tearDown()
  {
  if ( client != null )
  {
- client.closeAllWindows();
+ client.close();
  client = null;
  }
  }
 
  public void testSmokes()
  throws Exception
  {
- client.setThrowExceptionOnFailingStatusCode( false );
+ client.getOptions().setThrowExceptionOnFailingStatusCode( false );
  HtmlPage page = client.getPage( baseUrl + "index.html" );
- assertTrue( page.asText().contains( "Hello World" ) );
+ assertTrue( page.asNormalizedText().contains( "Hello World" ) );
  }
 }

pom.xml

@@ -212,9 +212,9 @@
  <version>2.9.1</version>
  </dependency>
  <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
  <artifactId>htmlunit</artifactId>
- <version>2.70.0</version>
+ <version>3.8.0</version>
  </dependency>
  <dependency>
  <!-- used in the unit tests and maven-shared-utils:3.3.4 -->

surefire-its/pom.xml

@@ -53,7 +53,7 @@
  <scope>test</scope>
  </dependency>
  <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
  <artifactId>htmlunit</artifactId>
  <scope>test</scope>
  </dependency>

surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java

@@ -21,13 +21,13 @@
 import java.io.IOException;
 import java.net.URI;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.TestFile;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlTableRow;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;