Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made CommonDBTest use PluginComponentMocker instead 

- Added H2 to PluginComponent databases
This commit is contained in:
Rsl1122 2019-01-02 16:55:19 +02:00
parent 6c5355369a
commit 722e28005d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/common/src/test/java/utilities/dagger/PluginSuperClassBindingModule.java
View File

@ -62,6 +62,7 @@ public class PluginSuperClassBindingModule {
@Override
public void enable() throws EnableException {
databases.add(sqLiteDB.usingDefaultFile());
databases.add(h2Factory.usingDefaultFile());
databases.add(mySQLDB);
String dbType = config.get(DatabaseSettings.TYPE).toLowerCase().trim();
db = getActiveDatabaseByName(dbType);

10
Plan/plugin/src/test/java/com/djrapitops/plan/system/database/databases/sql/CommonDBTest.java
View File

@ -40,8 +40,8 @@ import com.djrapitops.plan.utilities.SHA256Hash;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
import rules.BukkitComponentMocker;
import rules.ComponentMocker;
import rules.PluginComponentMocker;
import utilities.FieldFetcher;
import utilities.OptionalAssert;
import utilities.RandomData;
@ -68,7 +68,10 @@ public abstract class CommonDBTest {
@ClassRule
public static TemporaryFolder temporaryFolder = new TemporaryFolder();
@ClassRule
public static ComponentMocker component = new BukkitComponentMocker(temporaryFolder);
public static ComponentMocker component = new PluginComponentMocker(temporaryFolder);
public static UUID serverUUID;
public static DBSystem dbSystem;
public static SQLDB db;
@ -77,7 +80,6 @@ public abstract class CommonDBTest {
public final List<String> worlds = Arrays.asList("TestWorld", "TestWorld2");
public final UUID playerUUID = TestConstants.PLAYER_ONE_UUID;
public final UUID player2UUID = TestConstants.PLAYER_TWO_UUID;
public final UUID serverUUID = TestConstants.SERVER_UUID;
@Rule
public Timeout globalTimeout = Timeout.seconds(5);
@ -91,6 +93,8 @@ public abstract class CommonDBTest {
db = (SQLDB) dbSystem.getActiveDatabaseByName(dbName);
db.init();
serverUUID = system.getServerInfo().getServerUUID();
}
@AfterClass