Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 09:27:27 +02:00
Code Issues Projects Releases Wiki Activity

Test case against ShutdownSave doing the bad save in #1424

Browse Source 
- Rules out ShutdownSave code from the cause of the bug.
This commit is contained in:
Risto Lahtela 2020-05-05 10:23:53 +03:00
parent b7e1261597
commit 95cd4acb7d
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/gathering/ServerShutdownSave.java
View File

@ -111,7 +111,7 @@ public abstract class ServerShutdownSave {
return saveSessions(activeSessions, database);
}
private void prepareSessionsForStorage(Map<UUID, Session> activeSessions, long now) {
void prepareSessionsForStorage(Map<UUID, Session> activeSessions, long now) {
for (Session session : activeSessions.values()) {
Optional<Long> end = session.getValue(SessionKeys.END);
if (!end.isPresent()) {

23
Plan/common/src/test/java/com/djrapitops/plan/gathering/ShutdownSaveTest.java
View File

@ -16,6 +16,7 @@
*/
package com.djrapitops.plan.gathering;
import com.djrapitops.plan.delivery.domain.keys.SessionKeys;
import com.djrapitops.plan.gathering.cache.SessionCache;
import com.djrapitops.plan.gathering.domain.GMTimes;
import com.djrapitops.plan.gathering.domain.Session;
@ -36,16 +37,17 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import utilities.RandomData;
import utilities.TestConstants;
import utilities.dagger.DaggerPlanPluginComponent;
import utilities.dagger.PlanPluginComponent;
import utilities.mocks.PlanPluginMocker;
import java.nio.file.Path;
import java.util.Map;
import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -151,4 +153,21 @@ class ShutdownSaveTest {
sessionCache.cacheSession(playerUUID, session);
}
@Test
public void endedSessionsHaveSameEndTime() {
for (int i = 0; i < 100; i++) {
UUID playerUUID = UUID.randomUUID();
Session session = RandomData.randomUnfinishedSession(
TestConstants.SERVER_UUID, new String[]{"w1", "w2"}, playerUUID
);
sessionCache.cacheSession(playerUUID, session);
}
long endTime = System.currentTimeMillis();
Map<UUID, Session> activeSessions = SessionCache.getActiveSessions();
underTest.prepareSessionsForStorage(activeSessions, endTime);
for (Session session : activeSessions.values()) {
assertEquals(endTime, session.getUnsafe(SessionKeys.END), () -> "One of the sessions had differing end time");
}
}
}

13
Plan/common/src/test/java/utilities/RandomData.java
View File

@ -114,6 +114,19 @@ public class RandomData {
return session;
}
public static List<Session> randomUnfinishedSessions(UUID serverUUID, String[] worlds, UUID... uuids) {
return pickMultiple(randomInt(5, 50), () -> randomUnfinishedSession(serverUUID, worlds, uuids));
}
public static Session randomUnfinishedSession(UUID serverUUID, String[] worlds, UUID... uuids) {
Session session = new Session(uuids[0], serverUUID, RandomData.randomTime(), pickAtRandom(worlds), randomGameMode());
session.setWorldTimes(RandomData.randomWorldTimes(worlds));
if (uuids.length >= 2) {
session.setPlayerKills(RandomData.randomKills(pickAtRandom(Arrays.copyOfRange(uuids, 1, uuids.length))));
}
return session;
}
public static List<Point> randomPoints() {
List<Point> test = new ArrayList<>();
for (int i = 0; i < 20; i++) {