mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-21 05:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch

Browse Source 
# Conflicts:
#	Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
#	Plan/test/test/java/utils/TestInit.java
This commit is contained in:
Rsl1122 2017-08-23 22:16:30 +03:00
parent b4abc6a776
commit c268a44dcd
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java
View File

@ -203,4 +203,4 @@ public abstract class Table {
endTransaction(statement.getConnection());
}
}
}

7
Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
View File

@ -58,12 +58,7 @@ public class DatabaseTest {
public void setUp() throws Exception {
TestInit t = TestInit.init();
plan = t.getPlanMock();
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime()) {
@Override
public void startConnectionPingTask() {
}
};
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime());
db.init();
db.getServerTable().saveCurrentServerInfo(new ServerInfo(-1, t.getServerUUID(), "ServerName", ""));
File f = new File(plan.getDataFolder(), "Errors.txt");

1
Plan/test/test/java/utils/TestInit.java
View File

@ -24,7 +24,6 @@ import org.powermock.api.mockito.PowerMockito;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.UUID;
import java.util.logging.Logger;