working on junit5 update / WebDriverTestCases (wip)

Author: rbri

src/test/java/org/htmlunit/BrowserVersionFeaturesTest.java

@@ -30,7 +30,7 @@
 import org.htmlunit.javascript.configuration.AbstractJavaScriptConfiguration;
 import org.htmlunit.javascript.configuration.BrowserFeature;
 import org.htmlunit.javascript.configuration.SupportedBrowser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link BrowserVersionFeatures}.

src/test/java/org/htmlunit/BrowserVersionTest.java

@@ -21,7 +21,7 @@
 
 import java.util.TimeZone;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link BrowserVersion}.

src/test/java/org/htmlunit/CodeStyleTest.java

@@ -41,7 +41,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test of coding style for issues which cannot be detected by Checkstyle.

src/test/java/org/htmlunit/CookieManager3Test.java

@@ -21,7 +21,7 @@
 import java.util.Date;
 
 import org.htmlunit.util.Cookie;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link CookieManager}.

src/test/java/org/htmlunit/DefaultCredentialsProvider3Test.java

@@ -19,7 +19,7 @@
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link DefaultCredentialsProvider}.

src/test/java/org/htmlunit/DefaultPageCreator2Test.java

@@ -18,7 +18,7 @@
 
 import org.htmlunit.DefaultPageCreator.PageType;
 import org.htmlunit.util.MimeType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link DefaultPageCreator}.

src/test/java/org/htmlunit/ExternalTest.java

@@ -41,7 +41,7 @@
 import org.htmlunit.xml.XmlPage;
 import org.junit.Assert;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests against external web sites, this should be done once every while.

src/test/java/org/htmlunit/NicelyResynchronizingAjaxControllerTest.java

@@ -14,7 +14,7 @@
  */
 package org.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link NicelyResynchronizingAjaxController}.

src/test/java/org/htmlunit/NoHttpResponseTest.java

@@ -20,12 +20,12 @@
 import java.nio.charset.StandardCharsets;
 
 import org.htmlunit.html.HtmlPage;
-import org.htmlunit.junit.BrowserRunner;
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
 import org.junit.After;
-import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -57,7 +57,6 @@ public class NoHttpResponseTest {
     /**
      * Test using WebDriver.
      */
-    @RunWith(BrowserRunner.class)
     public static class WithWebDriverTest extends WebDriverTestCase {
 
         /**
@@ -133,7 +132,6 @@ public void callSubmitInButtonAndReturnTrue() throws Exception {
     /**
      * Test using WebClient with default configuration allowing to throw exception.
      */
-    @RunWith(BrowserRunner.class)
     public static class WithWebClientTest extends SimpleWebTestCase {
 
         /**
@@ -149,10 +147,14 @@ public void after() throws Exception {
         /**
          * @throws Throwable if the test fails
          */
-        @Test(expected = FailingHttpStatusCodeException.class)
+        @Test
+        @Alerts("§§URL§§")
         public void submit() throws Throwable {
+            expandExpectedAlertsVariables(URL_FIRST);
+
             final MockWebConnection mockWebConnection = getMockWebConnection();
             mockWebConnection.setResponse(URL_FIRST, HTML);
+
             MiniServer.configureDropRequest(new URL(URL_FIRST, "page2?textfield="));
             final URL urlRightSubmit = new URL(URL_FIRST, "page2?textfield=new+value");
             mockWebConnection.setResponse(urlRightSubmit,
@@ -163,8 +165,11 @@ public void submit() throws Throwable {
             try (MiniServer miniServer = new MiniServer(PORT, mockWebConnection)) {
                 miniServer.start();
 
-                HtmlPage page = getWebClient().getPage(URL_FIRST);
-                page = page.getElementById("inputSubmit").click();
+                final HtmlPage page = getWebClient().getPage(URL_FIRST);
+
+                Assertions.assertThrows(FailingHttpStatusCodeException.class,
+                            () -> page.getElementById("inputSubmit").click());
+
                 assertEquals(getExpectedAlerts()[0], page.getUrl());
             }
         }

src/test/java/org/htmlunit/NotYetImplementedTest.java

@@ -24,7 +24,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.htmlunit.general.ElementPropertiesTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Generates HTML file with all <tt>NotYetImplemented</tt> methods.