mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-10-02 08:27:47 +02:00
Fixed db test running BeforeEach method multiple times
This commit is contained in:
parent
bf7e47eb4c
commit
d6f35a6fc4
@ -17,20 +17,12 @@
|
||||
package com.djrapitops.plan.storage.database;
|
||||
|
||||
import com.djrapitops.plan.PlanSystem;
|
||||
import com.djrapitops.plan.identification.Server;
|
||||
import com.djrapitops.plan.storage.database.transactions.Executable;
|
||||
import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.Transaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.init.CreateTablesTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.patches.Patch;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import utilities.TestConstants;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
public interface DatabaseTestPreparer {
|
||||
|
||||
String[] worlds = new String[]{"TestWorld", "TestWorld2"};
|
||||
@ -43,30 +35,6 @@ public interface DatabaseTestPreparer {
|
||||
|
||||
PlanSystem system();
|
||||
|
||||
@BeforeEach
|
||||
default void setUp() {
|
||||
db().executeTransaction(new Patch() {
|
||||
@Override
|
||||
public boolean hasBeenApplied() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyPatch() {
|
||||
dropTable("plan_world_times");
|
||||
dropTable("plan_kills");
|
||||
dropTable("plan_sessions");
|
||||
dropTable("plan_worlds");
|
||||
dropTable("plan_users");
|
||||
}
|
||||
});
|
||||
db().executeTransaction(new CreateTablesTransaction());
|
||||
db().executeTransaction(new RemoveEverythingTransaction());
|
||||
|
||||
db().executeTransaction(new StoreServerInformationTransaction(new Server(-1, serverUUID(), "ServerName", "", 20)));
|
||||
assertEquals(serverUUID(), ((SQLDB) db()).getServerUUIDSupplier().get());
|
||||
}
|
||||
|
||||
default void execute(Executable executable) {
|
||||
db().executeTransaction(new Transaction() {
|
||||
@Override
|
||||
|
@ -17,9 +17,15 @@
|
||||
package com.djrapitops.plan.storage.database;
|
||||
|
||||
import com.djrapitops.plan.PlanSystem;
|
||||
import com.djrapitops.plan.identification.Server;
|
||||
import com.djrapitops.plan.storage.database.queries.*;
|
||||
import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.init.CreateTablesTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.patches.Patch;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@ -30,6 +36,8 @@ import utilities.mocks.PluginMockComponent;
|
||||
import java.nio.file.Path;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* Tests for the H2 database.
|
||||
*
|
||||
@ -63,6 +71,30 @@ public class H2Test implements DatabaseTest,
|
||||
.orElseThrow(IllegalStateException::new);
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
db().executeTransaction(new Patch() {
|
||||
@Override
|
||||
public boolean hasBeenApplied() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyPatch() {
|
||||
dropTable("plan_world_times");
|
||||
dropTable("plan_kills");
|
||||
dropTable("plan_sessions");
|
||||
dropTable("plan_worlds");
|
||||
dropTable("plan_users");
|
||||
}
|
||||
});
|
||||
db().executeTransaction(new CreateTablesTransaction());
|
||||
db().executeTransaction(new RemoveEverythingTransaction());
|
||||
|
||||
db().executeTransaction(new StoreServerInformationTransaction(new Server(-1, serverUUID(), "ServerName", "", 20)));
|
||||
assertEquals(serverUUID(), ((SQLDB) db()).getServerUUIDSupplier().get());
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void disableSystem() {
|
||||
if (database != null) {
|
||||
|
@ -17,10 +17,16 @@
|
||||
package com.djrapitops.plan.storage.database;
|
||||
|
||||
import com.djrapitops.plan.PlanSystem;
|
||||
import com.djrapitops.plan.identification.Server;
|
||||
import com.djrapitops.plan.storage.database.queries.*;
|
||||
import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.init.CreateTablesTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.patches.Patch;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.Assumptions;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@ -32,6 +38,8 @@ import java.nio.file.Path;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* Tests for MySQL database.
|
||||
* <p>
|
||||
@ -70,6 +78,29 @@ class MySQLTest implements DatabaseTest,
|
||||
database = mysql.get();
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
db().executeTransaction(new Patch() {
|
||||
@Override
|
||||
public boolean hasBeenApplied() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyPatch() {
|
||||
dropTable("plan_world_times");
|
||||
dropTable("plan_kills");
|
||||
dropTable("plan_sessions");
|
||||
dropTable("plan_worlds");
|
||||
dropTable("plan_users");
|
||||
}
|
||||
});
|
||||
db().executeTransaction(new CreateTablesTransaction());
|
||||
db().executeTransaction(new RemoveEverythingTransaction());
|
||||
|
||||
db().executeTransaction(new StoreServerInformationTransaction(new Server(-1, serverUUID(), "ServerName", "", 20)));
|
||||
assertEquals(serverUUID(), ((SQLDB) db()).getServerUUIDSupplier().get());
|
||||
}
|
||||
@AfterAll
|
||||
static void disableSystem() {
|
||||
if (database != null) database.close();
|
||||
|
@ -17,9 +17,15 @@
|
||||
package com.djrapitops.plan.storage.database;
|
||||
|
||||
import com.djrapitops.plan.PlanSystem;
|
||||
import com.djrapitops.plan.identification.Server;
|
||||
import com.djrapitops.plan.storage.database.queries.*;
|
||||
import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.init.CreateTablesTransaction;
|
||||
import com.djrapitops.plan.storage.database.transactions.patches.Patch;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@ -30,6 +36,8 @@ import utilities.mocks.PluginMockComponent;
|
||||
import java.nio.file.Path;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* Tests for SQLite Database.
|
||||
*
|
||||
@ -63,6 +71,30 @@ public class SQLiteTest implements DatabaseTest,
|
||||
.orElseThrow(IllegalStateException::new);
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
db().executeTransaction(new Patch() {
|
||||
@Override
|
||||
public boolean hasBeenApplied() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyPatch() {
|
||||
dropTable("plan_world_times");
|
||||
dropTable("plan_kills");
|
||||
dropTable("plan_sessions");
|
||||
dropTable("plan_worlds");
|
||||
dropTable("plan_users");
|
||||
}
|
||||
});
|
||||
db().executeTransaction(new CreateTablesTransaction());
|
||||
db().executeTransaction(new RemoveEverythingTransaction());
|
||||
|
||||
db().executeTransaction(new StoreServerInformationTransaction(new Server(-1, serverUUID(), "ServerName", "", 20)));
|
||||
assertEquals(serverUUID(), ((SQLDB) db()).getServerUUIDSupplier().get());
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void disableSystem() {
|
||||
if (database != null) database.close();
|
||||
|
Loading…
Reference in New Issue
Block a user