ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

fix(test): gson constructor missing

Browse source
This commit is contained in:
ineanto 2023-10-10 13:15:06 +02:00
parent 52c7c00dd1
commit 4977e59d24
5 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pom.xml
View file

@ -47,6 +47,12 @@
<artifactId>paper-api</artifactId>
<version>1.20.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
@ -149,6 +155,7 @@
<include>org.mariadb.jdbc:*</include>
<include>redis.clients:*</include>
<include>org.apache.commons:commons-pool2</include>
<include>com.google.code.gson:gson</include>
</includes>
</artifactSet>
<relocations>
@ -184,6 +191,10 @@
<pattern>org.apache.commons.pool2</pattern>
<shadedPattern>net.artelnatif.libs.pool2</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.code.gson</pattern>
<shadedPattern>net.artelnatif.libs.gson</shadedPattern>
</relocation>
</relocations>
<!-- Prevents breaking AnvilGUI's VersionWrapper. -->
<minimizeJar>false</minimizeJar>

2
src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java
View file

@ -3,6 +3,8 @@ package xyz.atnrch.nicko.config;
public class SQLDataSourceConfiguration extends DataSourceConfiguration {
private final boolean mariadb;
public SQLDataSourceConfiguration() { this(false, "", 0, "", "", true); }
public SQLDataSourceConfiguration(boolean enabled, String address, Integer port, String username, String password, boolean mariadb) {
super(enabled, address, port, username, password);
this.mariadb = mariadb;

8
src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java
View file

@ -1,10 +1,12 @@
package xyz.atnrch.nicko.test;
import be.seeseemelk.mockbukkit.MockBukkit;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration;
import org.junit.jupiter.api.*;
import xyz.atnrch.nicko.config.DefaultDataSources;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ -15,7 +17,7 @@ public class NickoPluginTest {
@BeforeAll
public static void setup() {
final Configuration config = new Configuration(
new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345"),
DefaultDataSources.MARIADB_EMPTY,
DefaultDataSources.REDIS_EMPTY,
"",
false);

11
src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
View file

@ -3,13 +3,16 @@ package xyz.atnrch.nicko.test.storage;
import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.SQLDataSourceConfiguration;
import xyz.atnrch.nicko.profile.NickoProfile;
import org.junit.jupiter.api.*;
import java.util.Optional;
@ -23,7 +26,7 @@ public class BrokenSQLTest {
@BeforeAll
public static void setup() {
final Configuration config = new Configuration(
new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", ""),
new SQLDataSourceConfiguration(true, "127.0.0.1", 3306, "root", "", true),
DefaultDataSources.REDIS_EMPTY,
"",
false);

4
src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
View file

@ -5,8 +5,8 @@ import org.junit.jupiter.api.*;
import xyz.atnrch.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.SQLDataSourceConfiguration;
import xyz.atnrch.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore;
@ -24,7 +24,7 @@ public class SQLStorageTest {
@BeforeAll
public static void setup() {
final Configuration config = new Configuration(
new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345"),
new SQLDataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345", true),
DefaultDataSources.REDIS_EMPTY,
"",
false);