From 9241ef841f28eb3ff643277117b3cba898036c40 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 6 Apr 2018 10:00:04 +0300 Subject: [PATCH] Removed old Session constructor usage from outside database --- .../importing/importers/Importer.java | 2 +- .../plan/data/PlayerProfileTest.java | 20 +++++++++---------- .../system/database/databases/SQLiteTest.java | 6 +++--- Plan/src/test/java/utilities/RandomData.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java b/Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java index b564c9f81..51bb8d27a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java @@ -214,7 +214,7 @@ public abstract class Importer { int mobKills = userImportData.getMobKills(); int deaths = userImportData.getDeaths(); - Session session = new Session(0, 0L, 0L, mobKills, deaths); + Session session = new Session(0, 0L, 0L, mobKills, deaths, 0); session.setPlayerKills(userImportData.getKills()); session.setWorldTimes(new WorldTimes(userImportData.getWorldTimes())); diff --git a/Plan/src/test/java/com/djrapitops/plan/data/PlayerProfileTest.java b/Plan/src/test/java/com/djrapitops/plan/data/PlayerProfileTest.java index 0827fd968..f7d27150f 100644 --- a/Plan/src/test/java/com/djrapitops/plan/data/PlayerProfileTest.java +++ b/Plan/src/test/java/com/djrapitops/plan/data/PlayerProfileTest.java @@ -44,9 +44,9 @@ public class PlayerProfileTest { int requiredLogins = Settings.ACTIVE_LOGIN_THRESHOLD.getNumber(); for (int i = 0; i < requiredLogins; i++) { - sessions.add(new Session(0, weekAgo, weekAgo + requiredPlaytime * 4L, 0, 0)); - sessions.add(new Session(0, twoWeeksAgo, twoWeeksAgo + requiredPlaytime * 4L, 0, 0)); - sessions.add(new Session(0, threeWeeksAgo, threeWeeksAgo + requiredPlaytime * 4L, 0, 0)); + sessions.add(new Session(0, weekAgo, weekAgo + requiredPlaytime * 4L, 0, 0, 0)); + sessions.add(new Session(0, twoWeeksAgo, twoWeeksAgo + requiredPlaytime * 4L, 0, 0, 0)); + sessions.add(new Session(0, threeWeeksAgo, threeWeeksAgo + requiredPlaytime * 4L, 0, 0, 0)); } p.setSessions(null, sessions); @@ -68,9 +68,9 @@ public class PlayerProfileTest { int requiredLogins = Settings.ACTIVE_LOGIN_THRESHOLD.getNumber(); for (int i = 0; i < requiredLogins * 2; i++) { - sessions.add(new Session(0, weekAgo, weekAgo + requiredPlaytime * 3L, 0, 0)); - sessions.add(new Session(0, twoWeeksAgo, twoWeeksAgo + requiredPlaytime * 3L, 0, 0)); - sessions.add(new Session(0, threeWeeksAgo, threeWeeksAgo + requiredPlaytime * 3L, 0, 0)); + sessions.add(new Session(0, weekAgo, weekAgo + requiredPlaytime * 3L, 0, 0, 0)); + sessions.add(new Session(0, twoWeeksAgo, twoWeeksAgo + requiredPlaytime * 3L, 0, 0, 0)); + sessions.add(new Session(0, threeWeeksAgo, threeWeeksAgo + requiredPlaytime * 3L, 0, 0, 0)); } p.setSessions(null, sessions); @@ -92,9 +92,9 @@ public class PlayerProfileTest { long requiredPlaytime = Settings.ACTIVE_PLAY_THRESHOLD.getNumber() * TimeAmount.MINUTE.ms() / requiredLogins; for (int i = 0; i < requiredLogins; i++) { - sessions.add(new Session(i, weekAgo, weekAgo + requiredPlaytime, 0, 0)); - sessions.add(new Session(i * 2, twoWeeksAgo, twoWeeksAgo + requiredPlaytime, 0, 0)); - sessions.add(new Session(i * 3, threeWeeksAgo, threeWeeksAgo + requiredPlaytime, 0, 0)); + sessions.add(new Session(i, weekAgo, weekAgo + requiredPlaytime, 0, 0, 0)); + sessions.add(new Session(i * 2, twoWeeksAgo, twoWeeksAgo + requiredPlaytime, 0, 0, 0)); + sessions.add(new Session(i * 3, threeWeeksAgo, threeWeeksAgo + requiredPlaytime, 0, 0, 0)); } p.setSessions(null, sessions); @@ -108,7 +108,7 @@ public class PlayerProfileTest { long date = 0; for (int i = 0; i < 5000; i++) { - sessions.add(new Session(0, 0, 0, 0, 0)); + sessions.add(new Session(0, 0, 0, 0, 0, 0)); } p.setSessions(null, sessions); p.getActivityIndex(0); diff --git a/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java b/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java index e34207624..f5e0b8903 100644 --- a/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java +++ b/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java @@ -797,7 +797,7 @@ public class SQLiteTest { WorldTimesTable worldTimesTable = db.getWorldTimesTable(); worldTimesTable.saveWorldTimes(playerUUID, 1, worldTimes); - Session session = new Session(1, 12345L, 23456L, 0, 0); + Session session = new Session(1, 12345L, 23456L, 0, 0, 0); Map sessions = new HashMap<>(); sessions.put(1, session); worldTimesTable.addWorldTimesToSessions(playerUUID, sessions); @@ -811,7 +811,7 @@ public class SQLiteTest { WorldTimes worldTimes = createWorldTimes(); System.out.println(worldTimes); WorldTimesTable worldTimesTable = db.getWorldTimesTable(); - Session session = new Session(1, 12345L, 23456L, 0, 0); + Session session = new Session(1, 12345L, 23456L, 0, 0, 0); session.setWorldTimes(worldTimes); Map>> map = new HashMap<>(); @@ -834,7 +834,7 @@ public class SQLiteTest { saveUserOne(); WorldTimes worldTimes = createWorldTimes(); System.out.println(worldTimes); - Session session = new Session(1, 12345L, 23456L, 0, 0); + Session session = new Session(1, 12345L, 23456L, 0, 0, 0); session.setWorldTimes(worldTimes); Map>> map = new HashMap<>(); diff --git a/Plan/src/test/java/utilities/RandomData.java b/Plan/src/test/java/utilities/RandomData.java index e7204b375..d11584b00 100644 --- a/Plan/src/test/java/utilities/RandomData.java +++ b/Plan/src/test/java/utilities/RandomData.java @@ -47,7 +47,7 @@ public class RandomData { public static List randomSessions() { List test = new ArrayList<>(); for (int i = 0; i < 20; i++) { - test.add(new Session(1, r.nextLong(), r.nextLong(), 0, 0)); + test.add(new Session(1, r.nextLong(), r.nextLong(), 0, 0, 0)); } return test; }