diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/export/ExportJSErrorRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/export/ExportJSErrorRegressionTest.java index 68b654e66..971bbc12f 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/export/ExportJSErrorRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/export/ExportJSErrorRegressionTest.java @@ -154,7 +154,7 @@ class ExportJSErrorRegressionTest { } @TestFactory - Collection playerPageDoesNotHaveJavascriptErrors(ChromeDriver driver) { + Collection exportedWebpageDoesNotHaveErrors(ChromeDriver driver) { String[] endpointsToTest = new String[]{ "/player/" + TestConstants.PLAYER_ONE_UUID_STRING + "/index.html", // "/network/index.html", @@ -163,7 +163,7 @@ class ExportJSErrorRegressionTest { }; return Arrays.stream(endpointsToTest).map( - endpoint -> DynamicTest.dynamicTest("Test exported endpoint " + endpoint, () -> { + endpoint -> DynamicTest.dynamicTest("Exported page does not log errors to js console " + endpoint, () -> { String address = nginx.getBaseUrl("http", 80).toURI().resolve(endpoint).toString(); driver.get(address); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java index 3cea7cfaf..4f7c12f05 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java @@ -30,6 +30,7 @@ import com.djrapitops.plan.utilities.PassEncryptUtil; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; @@ -136,11 +137,12 @@ class AccessControlTest { System.out.println("Got cookie: " + cookie); } } finally { - loginConnection.disconnect(); + if (loginConnection != null) loginConnection.disconnect(); } return cookie; } + @DisplayName("Access control test, level 0:") @ParameterizedTest(name = "{0}: expecting {1}") @CsvSource({ "/,302", @@ -206,6 +208,7 @@ class AccessControlTest { assertEquals(Integer.parseInt(expectedResponseCode), responseCode, () -> "User level 0, Wrong response code for " + resource + ", expected " + expectedResponseCode + " but was " + responseCode); } + @DisplayName("Access control test, level 1:") @ParameterizedTest(name = "{0}: expecting {1}") @CsvSource({ "/,302", @@ -271,6 +274,7 @@ class AccessControlTest { assertEquals(Integer.parseInt(expectedResponseCode), responseCode, () -> "User level 1, Wrong response code for " + resource + ", expected " + expectedResponseCode + " but was " + responseCode); } + @DisplayName("Access control test, level 2:") @ParameterizedTest(name = "{0}: expecting {1}") @CsvSource({ "/,302", @@ -336,6 +340,7 @@ class AccessControlTest { assertEquals(Integer.parseInt(expectedResponseCode), responseCode, () -> "User level 2, Wrong response code for " + resource + ", expected " + expectedResponseCode + " but was " + responseCode); } + @DisplayName("Access control test, level 100:") @ParameterizedTest(name = "{0}: expecting {1}") @CsvSource({ "/,403", @@ -408,7 +413,7 @@ class AccessControlTest { return connection.getResponseCode(); } finally { - connection.disconnect(); + if (connection != null) connection.disconnect(); } } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java index 9b7c70719..a08d948a2 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java @@ -32,6 +32,7 @@ import extension.SeleniumExtension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; @@ -106,7 +107,8 @@ class JSErrorRegressionTest { SeleniumExtension.newTab(driver); } - @ParameterizedTest + @DisplayName("Page does not log anything on js console: ") + @ParameterizedTest(name = "{0}") @CsvSource({ "http://localhost:" + TEST_PORT_NUMBER + "/player/" + TestConstants.PLAYER_ONE_NAME, "http://localhost:" + TEST_PORT_NUMBER + "/player/" + TestConstants.PLAYER_ONE_UUID_STRING, @@ -114,7 +116,7 @@ class JSErrorRegressionTest { "http://localhost:" + TEST_PORT_NUMBER + "/server/Server 1", "http://localhost:" + TEST_PORT_NUMBER + "/players" }) - void playerPageDoesNotHaveJavascriptErrors(String address, ChromeDriver driver) { + void javascriptRegressionTest(String address, ChromeDriver driver) { driver.get(address); List logs = new ArrayList<>();