Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-24 18:17:53 +01:00
Code Issues Projects Releases Wiki Activity

Removed WorldTable#saveWorlds

Browse Source
This commit is contained in:
Rsl1122 2019-01-29 11:05:36 +02:00
parent 9e9196b181
commit a548ae6cf6
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/WorldTable.java
View File

@ -97,10 +97,6 @@ public class WorldTable extends Table {
});
}
public void saveWorlds(Collection<String> worlds) {
saveWorlds(worlds, getServerUUID());
}
/**
* Used to save a list of world names.
* <p>

34
Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
View File

@ -83,7 +83,7 @@ public abstract class CommonDBTest {
public static SQLDB db;
public static PlanSystem system;
public final List<String> worlds = Arrays.asList("TestWorld", "TestWorld2");
public final String[] worlds = new String[]{"TestWorld", "TestWorld2"};
public final UUID playerUUID = TestConstants.PLAYER_ONE_UUID;
public final UUID player2UUID = TestConstants.PLAYER_TWO_UUID;
@ -297,19 +297,28 @@ public abstract class CommonDBTest {
}
@Test
public void testWorldTable() throws DBInitException {
WorldTable worldTable = db.getWorldTable();
List<String> worlds = Arrays.asList("Test", "Test2", "Test3");
worldTable.saveWorlds(worlds);
public void worldNamesAreStored() throws DBInitException {
String[] expected = {"Test", "Test2", "Test3"};
saveWorlds(expected);
commitTest();
List<String> saved = worldTable.getWorlds(serverUUID);
assertEquals(new HashSet<>(worlds), new HashSet<>(saved));
Collection<String> result = db.query(LargeFetchQueries.fetchAllWorldNames()).getOrDefault(serverUUID, new HashSet<>());
assertEquals(Arrays.asList(expected), result);
}
private void saveWorld(String worldName) {
db.executeTransaction(new WorldNameStoreTransaction(serverUUID, worldName));
}
private void saveWorlds(String... worldNames) {
for (String worldName : worldNames) {
saveWorld(worldName);
}
}
private void saveTwoWorlds() {
db.getWorldTable().saveWorlds(worlds);
saveWorlds(worlds);
}
private WorldTimes createWorldTimes() {
@ -321,7 +330,7 @@ public abstract class CommonDBTest {
gm.put(gms[2], 3000L);
gm.put(gms[3], 4000L);
String worldName = worlds.get(0);
String worldName = worlds[0];
times.put(worldName, new GMTimes(gm));
db.executeTransaction(new WorldNameStoreTransaction(serverUUID, worldName));
@ -794,13 +803,6 @@ public abstract class CommonDBTest {
assertTrue(db.check().isPlayerRegisteredOnThisServer(playerUUID));
}
@Test
public void testWorldTableGetWorldNamesNoException() throws NoSuchAlgorithmException {
saveAllData();
Set<String> worldNames = db.getWorldTable().getWorldNames(serverUUID);
assertEquals(new HashSet<>(worlds), worldNames);
}
@Test
public void testGetNetworkGeolocations() {
GeoInfoTable geoInfoTable = db.getGeoInfoTable();