From d169e328571cced232ca715a651101e6eff3a7b6 Mon Sep 17 00:00:00 2001 From: aro Date: Sun, 11 Dec 2022 12:31:36 +0100 Subject: [PATCH] feat: don't skip tests --- nicko-core/dependency-reduced-pom.xml | 47 +++++++--- nicko-core/pom.xml | 5 +- .../artelnatif/nicko/test/MojangAPITest.java | 87 ------------------- .../nicko/test/storage/SQLStorageTest.java | 6 +- 4 files changed, 39 insertions(+), 106 deletions(-) delete mode 100644 nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java diff --git a/nicko-core/dependency-reduced-pom.xml b/nicko-core/dependency-reduced-pom.xml index a0a2af8..d5378cc 100644 --- a/nicko-core/dependency-reduced-pom.xml +++ b/nicko-core/dependency-reduced-pom.xml @@ -18,10 +18,7 @@ maven-surefire-plugin - 2.12.4 - - true - + 3.0.0-M7 maven-shade-plugin @@ -57,6 +54,10 @@ + + papermc + https://repo.papermc.io/repository/maven-public/ + xenondevs https://repo.xenondevs.xyz/releases @@ -110,25 +111,47 @@ provided - org.junit.jupiter - junit-jupiter - 5.9.0 + com.github.seeseemelk + MockBukkit-v1.19 + 2.29.0 test - junit-jupiter-api + paper-api + io.papermc.paper + + + junit-jupiter org.junit.jupiter - junit-jupiter-params - org.junit.jupiter + hamcrest-library + org.hamcrest - junit-jupiter-engine - org.junit.jupiter + adventure-platform-bungeecord + net.kyori + + + maven-resolver-provider + org.apache.maven + + + maven-resolver-connector-basic + org.apache.maven.resolver + + + maven-resolver-transport-http + org.apache.maven.resolver + + org.mariadb.jdbc + mariadb-java-client + 3.1.0 + compile + 17 diff --git a/nicko-core/pom.xml b/nicko-core/pom.xml index 63c389d..53ac089 100644 --- a/nicko-core/pom.xml +++ b/nicko-core/pom.xml @@ -113,10 +113,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12.4 - - true - + 3.0.0-M7 org.apache.maven.plugins diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java b/nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java deleted file mode 100644 index 0fd8a47..0000000 --- a/nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java +++ /dev/null @@ -1,87 +0,0 @@ -package net.artelnatif.nicko.test; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import net.artelnatif.nicko.mojang.MojangAPI; -import net.artelnatif.nicko.mojang.MojangSkin; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.HttpsURLConnection; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.Optional; -import java.util.concurrent.ExecutionException; - -public class MojangAPITest { - public static final String NAME = "Notch"; - public static final String URL_NAME = "https://api.mojang.com/users/profiles/minecraft/{name}"; - public static final String URL_SKIN = "https://sessionserver.mojang.com/session/minecraft/profile/{uuid}?unsigned=false"; - - public static JsonObject object = null; - - @Test - @DisplayName("MojangAPI - GET - Name") - public void testGetMojangAPIName() throws IOException { - final URL url = new URL(URL_NAME.replace("{name}", NAME)); - final HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); - urlConnection.setRequestMethod("GET"); - urlConnection.setDoOutput(true); - - //DataOutputStream output = new DataOutputStream(urlConnection.getOutputStream()); - //output.writeBytes(); - //output.flush(); - //output.close(); - - final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); - final StringBuilder response = new StringBuilder(); - String inputLine; - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - object = JsonParser.parseString(response.toString()).getAsJsonObject(); - Assertions.assertEquals(NAME, object.get("name").getAsString()); - } - - @Test - @DisplayName("MojangAPI - GET - Skin") - public void testGetMojangAPISkin() throws IOException { - final URL url = new URL(URL_SKIN.replace("{uuid}", object.get("id").getAsString().replaceAll("-", ""))); - final HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); - urlConnection.setRequestMethod("GET"); - urlConnection.setDoOutput(true); - - final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); - final StringBuilder response = new StringBuilder(); - String inputLine; - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - System.out.println(response); - } - - @Test - @DisplayName("MojangAPI - New Methods") - public void testNewMojangAPIMethods() throws IOException { - final MojangAPI mojangAPI = new MojangAPI(); - final Optional uuid = mojangAPI.getUUID(NAME); - Assertions.assertTrue(uuid.isPresent()); - - final Optional skin; - try { - skin = mojangAPI.getSkin(uuid.get()); - } catch (ExecutionException e) { - throw new RuntimeException(e); - } - - Assertions.assertTrue(skin.isPresent()); - Assertions.assertDoesNotThrow(this::testNewMojangAPIMethods); - } -} diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java index d6cc9c1..756f13b 100644 --- a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java +++ b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java @@ -13,17 +13,17 @@ import java.util.Optional; public class SQLStorageTest { private static ServerMock server; private static NickoBukkit plugin; - private static NickoConfiguration config; @BeforeAll public static void setup() { - server = MockBukkit.mock(); - config = new NickoConfiguration(null); + final NickoConfiguration config = new NickoConfiguration(null); config.setLocalStorage(false); config.setBungeecordSupport(false); config.setSQLAddress("127.0.0.1"); config.setSQLUsername("root"); config.setSQLPassword("12345"); // https://howsecureismypassword.net/ "Your password would be cracked: Instantly" + + server = MockBukkit.mock(); plugin = MockBukkit.load(NickoBukkit.class, config); }