From 54c66c7232396efcfc394e40f37c3bbacd89bee2 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Fri, 9 Sep 2022 14:24:35 +0300 Subject: [PATCH] Fix flaky regular player test --- .../storage/database/queries/ActivityIndexQueriesTest.java | 4 +++- Plan/common/src/test/java/utilities/RandomData.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ActivityIndexQueriesTest.java b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ActivityIndexQueriesTest.java index 28152938f..8d5ecd4be 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ActivityIndexQueriesTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ActivityIndexQueriesTest.java @@ -250,8 +250,10 @@ public interface ActivityIndexQueriesTest extends DatabaseTestPreparer { @RepeatedTest(25) default void countRegularPlayers() { storeSessions(session -> true); - long playtimeThreshold = TimeUnit.SECONDS.toMillis(1L); + long playtimeThreshold = TimeUnit.MILLISECONDS.toMillis(1L); Integer expected = 1; // All players are very active + FinishedSession randomSession = RandomData.randomSession(serverUUID(), worlds, System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1L), playerUUID, player2UUID); + db().executeTransaction(new StoreSessionTransaction(randomSession)); Integer result = db().query(ActivityIndexQueries.fetchRegularPlayerCount(System.currentTimeMillis(), serverUUID(), playtimeThreshold)); assertEquals(expected, result); } diff --git a/Plan/common/src/test/java/utilities/RandomData.java b/Plan/common/src/test/java/utilities/RandomData.java index 83351dfce..139b1ca6a 100644 --- a/Plan/common/src/test/java/utilities/RandomData.java +++ b/Plan/common/src/test/java/utilities/RandomData.java @@ -112,9 +112,13 @@ public class RandomData { } public static FinishedSession randomSession(ServerUUID serverUUID, String[] worlds, UUID... uuids) { + long start = RandomData.randomTime(); + return randomSession(serverUUID, worlds, start, uuids); + } + + public static FinishedSession randomSession(ServerUUID serverUUID, String[] worlds, long start, UUID... uuids) { DataMap extraData = new DataMap(); extraData.put(WorldTimes.class, RandomData.randomWorldTimes(worlds)); - long start = RandomData.randomTime(); long end = RandomData.randomTimeAfter(start); if (uuids.length >= 2) {