mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-31 18:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics

Browse Source
This commit is contained in:
Fuzzlemann 2017-07-31 13:38:16 +02:00
commit da7bf8f8ad
25 changed files with 97 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/pom.xml
View File

@ -199,5 +199,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sonar.language>java</sonar.language>
</properties>
</project>

14
Plan/src/main/java/com/djrapitops/plan/api/API.java
View File

@ -85,11 +85,11 @@ public class API {
* This method is useful if you have a table and want to link to the inspect
* page.
* <p>
* Html.LINK.parse("Link", "Playername") can be used to get a link
* {@code <a href="Link">Playername</a>}
* Html.LINK.parse("Link", "PlayerName") can be used to get a link
* {@code <a href="Link">PlayerName</a>}
*
* @param name Playername of the player
* @return ip:port/security/player/Playername
* @param name Name of the player
* @return ip:port/security/player/PlayerName
*/
public String getPlayerInspectPageLink(String name) {
return HtmlUtils.getInspectUrlWithProtocol(name);
@ -229,10 +229,10 @@ public class API {
}
/**
* Used to get the playerName of a player who has played on the server.
* Used to get the PlayerName of a player who has played on the server.
*
* @param uuid UUID of the player.
* @return Playername, eg "Rsl1122"
* @return PlayerName, eg "Rsl1122"
* @throws IllegalArgumentException If uuid is null.
* @throws IllegalStateException If the player has not played on the server
* before.
@ -253,7 +253,7 @@ public class API {
* @return UUID of the Player
* @throws Exception if player's name is not registered at Mojang
*/
public UUID playerNameToUUID(String playerName) throws Exception {
public UUID PlayerNameToUUID(String playerName) throws Exception {
return UUIDFetcher.getUUIDOf(playerName);
}

3
Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java
View File

@ -22,8 +22,6 @@ import main.java.com.djrapitops.plan.utilities.HtmlUtils;
*/
public class ListCommand extends SubCommand {
private final Plan plugin;
/**
* Class Constructor.
*
@ -32,7 +30,6 @@ public class ListCommand extends SubCommand {
public ListCommand(Plan plugin) {
super("list, pl", CommandType.CONSOLE, Permissions.INSPECT_OTHER.getPermission(), "List to all cached players", "");
this.plugin = plugin;
setHelp(plugin);
}

2
Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java
View File

@ -18,7 +18,7 @@ import java.util.Set;
*/
public class RegisterCommandFilter extends AbstractFilter {
private Set<String> censoredCommands = ImmutableSet.of("/plan web register", "/plan webuser register", "/plan register");
private final Set<String> censoredCommands = ImmutableSet.of("/plan web register", "/plan webuser register", "/plan register");
@Override
public Result filter(LogEvent event) {

2
Plan/src/main/java/com/djrapitops/plan/data/SessionData.java
View File

@ -1,7 +1,7 @@
package main.java.com.djrapitops.plan.data;
/**
* This class is used for storing start and end of a playsession inside UserData
* This class is used for storing start and end of a play session inside UserData
* object.
*
* @author Rsl1122

2
Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java
View File

@ -114,7 +114,7 @@ public class TPSCountTimer extends AbsRunnable {
diff -= twentySeconds;
}
double tpsN = MathUtils.round(twentySeconds / diff);
double tpsN = twentySeconds * 1.0 / diff;
return new TPS(now, tpsN, playersOnline, cpuUsage, usedMemory, entityCount, chunksLoaded);
}

2
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -123,7 +123,7 @@ public abstract class SQLDB extends Database {
try {
getVersion();
newDatabase = false;
} catch (Exception e) {
} catch (Exception ignored) {
}
if (!versionTable.createTable()) {

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

@ -38,7 +38,7 @@ public class LocationsTable extends Table {
public boolean removeAllData() {
try {
execute("DELETE FROM " + tableName);
} catch (Exception e) {
} catch (Exception ignored) {
}
return true;
}

54
Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
View File

@ -5,8 +5,6 @@ import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.database.Container;
import main.java.com.djrapitops.plan.database.databases.SQLDB;
import main.java.com.djrapitops.plan.utilities.Benchmark;
import main.java.com.djrapitops.plan.utilities.ManageUtils;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -257,56 +255,6 @@ public class SessionsTable extends Table {
* @throws SQLException
*/
public void clean() throws SQLException {
Map<Integer, Integer> loginTimes = db.getUsersTable().getLoginTimes();
Map<Integer, List<SessionData>> allSessions = getSessionData(loginTimes.keySet());
Benchmark.start("Database: Combine Sessions");
int before = MathUtils.sumInt(allSessions.values().stream().map(List::size));
Log.debug("Sessions before: " + before);
Map<Integer, Integer> beforeM = new HashMap<>();
Map<Integer, Integer> afterM = new HashMap<>();
for (Map.Entry<Integer, List<SessionData>> entrySet : allSessions.entrySet()) {
Integer id = entrySet.getKey();
List<SessionData> sessions = entrySet.getValue();
beforeM.put(id, sessions.size());
if (sessions.isEmpty()) {
afterM.put(id, 0);
continue;
}
Integer times = loginTimes.get(id);
if (sessions.size() == times) {
afterM.put(id, times);
continue;
}
List<SessionData> combined = ManageUtils.combineSessions(sessions, times);
afterM.put(id, combined.size());
allSessions.put(id, combined);
}
int after = MathUtils.sumInt(allSessions.values().stream().map(List::size));
Log.debug("Sessions after: " + after);
if (before - after > 50) {
Benchmark.start("Database: Save combined sessions");
for (Integer id : new HashSet<>(allSessions.keySet())) {
if (afterM.get(id) < beforeM.get(id)) {
removeUserSessions(id);
} else {
allSessions.remove(id);
}
}
saveSessionData(allSessions);
Benchmark.stop("Database: Save combined sessions");
}
Benchmark.stop("Database: Combine Sessions");
Log.info("Combined " + (before - after) + " sessions.");
// TODO Clean sessions before Configurable time span
}
}

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

@ -79,7 +79,7 @@ public class TPSTable extends Table {
} else {
execute("ALTER TABLE " + tableName + " ADD COLUMN " + columnCPUUsage + " double NOT NULL DEFAULT 0");
}
} catch (SQLException e) {
} catch (SQLException ignored) {
}
}

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

@ -96,7 +96,7 @@ public abstract class Table {
for (String statement : statements) {
try {
execute(statement);
} catch (SQLException e) {
} catch (SQLException ignored) {
}
}
}

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

@ -123,7 +123,7 @@ public class UsersTable extends Table {
execute("ALTER TABLE " + tableName
+ " DROP COLUMN " + columnDemAge + ","
+ " DROP COLUMN " + columnDemGender);
} catch (Exception e) {
} catch (Exception ignored) {
}
}
}

9
Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/PunchCardGraphCreator.java
View File

@ -6,7 +6,6 @@
package main.java.com.djrapitops.plan.ui.html.graphs;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils;
import java.util.Collection;
@ -15,7 +14,7 @@ import java.util.Objects;
import java.util.stream.Collectors;
/**
* Utility class for creating Punch Card Data Array for the javascripts.
* Utility class for creating Punch Card Data Array for the JavaScripts.
*
* @author Rsl1122
* @since 3.6.0
@ -30,9 +29,9 @@ public class PunchCardGraphCreator {
}
/**
* Creates a Punchcard series data Array for HighCharts
* Creates a PunchCard series data Array for HighCharts
*
* @param sessions Sessions (Unique/Player) to be placed into the punchcard.
* @param sessions Sessions (Unique/Player) to be placed into the PunchCard.
* @return Data array as a string.
*/
public static String createDataSeries(Collection<SessionData> sessions) {
@ -73,12 +72,10 @@ public class PunchCardGraphCreator {
}
private static List<Long> getSessionStarts(Collection<SessionData> data) {
long now = MiscUtils.getTime();
return data.stream()
.filter(Objects::nonNull)
.filter(SessionData::isValid)
.map(SessionData::getSessionStart)
.filter(start -> now - start < (long) 2592000 * (long) 1000)
.sorted()
.collect(Collectors.toList());
}

2
Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/SessionLengthDistributionGraphCreator.java
View File

@ -26,7 +26,7 @@ public class SessionLengthDistributionGraphCreator {
* Contains values from 0 up to 120 minutes
*
* @param lengths Lengths of all sessions in a list.
* @return Data for Highcharts series.
* @return Data for HighCharts series.
*/
public static String createDataSeries(List<Long> lengths) {
Map<Long, Integer> bars = getValues(lengths);

2
Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java
View File

@ -60,7 +60,7 @@ public class PlayersTableCreator {
String.valueOf(uData.getLastPlayed()), FormatUtils.formatTimeStamp(uData.getLastPlayed()),
String.valueOf(uData.getGeolocation())
));
} catch (NullPointerException e) {
} catch (NullPointerException ignored) {
}
i++;

2
Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
View File

@ -12,7 +12,7 @@ import java.text.DecimalFormat;
*/
public class FormatUtils {
private static DecimalFormat df = new DecimalFormat(Settings.FORMAT_DECIMALS.toString());
private static final DecimalFormat df = new DecimalFormat(Settings.FORMAT_DECIMALS.toString());
/**
* Constructor used to hide the public constructor

58
Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java
View File

@ -3,15 +3,12 @@ package main.java.com.djrapitops.plan.utilities;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.data.UserData;
import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.database.databases.SQLiteDB;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
import java.sql.SQLException;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author Rsl1122
@ -84,61 +81,6 @@ public class ManageUtils {
return true;
}
/**
* @param sessions
* @return
*/
public static boolean containsCombinable(List<SessionData> sessions) {
return containsCombinable(sessions, 5000);
}
private static boolean containsCombinable(List<SessionData> sessions, int threshold) {
// Checks if there are starts & ends that are the same, or less than threshold ms away from each other.
return sessions.stream()
.anyMatch(s -> sessions.stream()
.filter(ses -> !ses.equals(s))
.map(SessionData::getSessionStart)
.anyMatch(start -> Math.abs(s.getSessionEnd() - start) < threshold));
}
/**
* @param sessions
* @param loginTimes
* @return
*/
public static List<SessionData> combineSessions(List<SessionData> sessions, Integer loginTimes) {
return combineSessions(sessions, loginTimes, 5000);
}
private static List<SessionData> combineSessions(List<SessionData> sessions, Integer loginTimes, int threshold) {
if (threshold >= 35000) {
return sessions;
}
List<SessionData> newSessions = new ArrayList<>();
List<SessionData> removed = new ArrayList<>();
for (SessionData session : sessions) {
if (removed.contains(session)) {
continue;
}
List<SessionData> close = sessions.stream().filter(ses -> Math.abs(session.getSessionEnd() - ses.getSessionStart()) < threshold).collect(Collectors.toList());
if (!close.isEmpty()) {
long big = MathUtils.getBiggestLong(close.stream().map(SessionData::getSessionEnd).collect(Collectors.toList()));
session.endSession(big);
removed.addAll(close);
}
newSessions.add(session);
}
if (loginTimes == newSessions.size()) {
return newSessions;
}
boolean containsCombinable = containsCombinable(newSessions, threshold);
if (containsCombinable) {
return combineSessions(newSessions, threshold + 1000);
} else {
return newSessions;
}
}
public static Database getDB(Plan plugin, String dbName) {
Database database = null;
for (Database sqldb : plugin.getDatabases()) {

4
Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
View File

@ -99,7 +99,7 @@ public class MiscUtils {
if (c != null) {
try {
c.close();
} catch (IOException ex) {
} catch (IOException ignored) {
}
}
}
@ -110,7 +110,7 @@ public class MiscUtils {
if (c != null) {
try {
c.close();
} catch (Exception ex) {
} catch (Exception ignored) {
}
}
}

5
Plan/src/main/java/com/djrapitops/plan/utilities/PassEncryptUtil.java
View File

@ -75,7 +75,6 @@ public class PassEncryptUtil {
// Currently, Java only supports SHA1.
if (!params[HASH_ALGORITHM_INDEX].equals("sha1")) {
throw new CannotPerformOperationException(
"Unsupported hash type."
);
}
@ -182,8 +181,8 @@ public class PassEncryptUtil {
@SuppressWarnings("serial")
public static class CannotPerformOperationException extends Exception {
CannotPerformOperationException(String message) {
super(message);
CannotPerformOperationException() {
super("Unsupported hash type.");
}
CannotPerformOperationException(String message, Throwable source) {

2
Plan/src/main/java/com/djrapitops/plan/utilities/uuid/UUIDUtility.java
View File

@ -53,7 +53,7 @@ public class UUIDUtility {
if (uuid == null) {
uuid = UUIDFetcher.getUUIDOf(playername);
}
} catch (Exception e) {
} catch (Exception ignored) {
}
return uuid;
}

106
Plan/src/main/resources/analysis.html
View File

@ -278,6 +278,7 @@
}
</style>
</head>
<body onload="countUpTimer()">
@ -341,7 +342,7 @@
</div>
</div>
</div>
<div id="playerChartDay" style="width=100%; height=350px;"></div>
<div id="playerChartDay" style="width=100%; height=350px;"></div>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday%</p>
</div>
@ -388,7 +389,7 @@
class="fa fa-crosshairs" aria-hidden="true"></i> Mob kills: %mobkills% | <i
class="fa fa-meh-o" aria-hidden="true"></i> Deaths: %deaths%</p>
</div>
<div class=" box column">
<div class=" box column">
<div id="gmPie" style="width: 100%; height: 400px;"></div>
</div>
</div>
@ -415,29 +416,30 @@
</div>
</div>
</div>
<div id="playerChartMonth" style="width=100%; height=350px;"></div>
<div id="playerChartMonth" style="width=100%; height=350px;"></div>
</div>
<div class=" box column">
<p><b>Month:</b><br>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsmonth% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npmonth% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdaymonth% </p>
<p><b>Week:</b><br>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsweek% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npweek% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdayweek%</p>
<p><b>Day:</b><br>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npday% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdayday% </p>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsmonth% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth%
<br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npmonth% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdaymonth% </p>
<p><b>Week:</b><br>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsweek% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npweek% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdayweek%</p>
<p><b>Day:</b><br>
<i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% <br>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players: %npday% <br>
<i class="fa fa-user-plus" aria-hidden="true"></i> New Players / Day: %newperdayday% </p>
</div>
</div>
<div class="row">
<div class="box column">
<div class="headerbox" style="width: 95%;">
<div class="headerbox" style="width: 95%;">
<div class="header-icon">
<div class="header-label"><i class="fa fa-pie-chart" aria-hidden="true"></i><span
class="header-text"> Playerbase</span></div>
@ -534,14 +536,14 @@
<i class="fa fa-umbrella" aria-hidden="true"></i> Avg. Entities: %averageentitiesweek%<br>
<i class="fa fa-tree" aria-hidden="true"></i> Average Chunks: %averagechunksweek%
</p>
<p><b>Day:</b><br>
<i class="fa fa-tachometer" aria-hidden="true"></i> Average TPS: %averagetpsday%<br>
<p><b>Day:</b><br>
<i class="fa fa-tachometer" aria-hidden="true"></i> Average TPS: %averagetpsday%<br>
<i class="fa fa-building-o" aria-hidden="true"></i> Average CPU: %averagecpuday%<br>
<i class="fa fa-microchip" aria-hidden="true"></i> Average RAM: %averagememoryday%Mb<br>
<i class="fa fa-umbrella" aria-hidden="true"></i> Avg. Entities: %averageentitiesday%<br>
<i class="fa fa-tree" aria-hidden="true"></i> Average Chunks: %averagechunksday%</p>
</div>
<div class="box column">
<div class="box column">
<div id="resourceGraph" style="width: 100%; height: 400px;"></div>
</div>
</div>
@ -549,7 +551,7 @@
<div class="box column">
<div id="tpsGraph" style="width: 100%; height: 400px;"></div>
</div>
<div class="box column">
<div class="box column">
<div id="worldGraph" style="width: 100%; height: 400px;"></div>
</div>
</div>
@ -665,10 +667,10 @@
</div>
</div>
<script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script>
<script src="https://code.highcharts.com/stock/highstock.js"></script>
<script src="https://code.highcharts.com/maps/modules/map.js"></script>
<script src="https://code.highcharts.com/mapdata/custom/world.js"></script>
<script>
<script src="https://code.highcharts.com/stock/highstock.js"></script>
<script src="https://code.highcharts.com/maps/modules/map.js"></script>
<script src="https://code.highcharts.com/mapdata/custom/world.js"></script>
<script>
// Data Variables
var playersOnlineSeries = {
name: 'Players Online',
@ -783,8 +785,9 @@
color: '#222',
data: %punchcardseries%
};
</script>
<script>
</script>
<script>
function playersChart() {
var myChart = Highcharts.stockChart('playerChartDay', {
rangeSelector: {
@ -853,7 +856,8 @@
series: [playersOnlineSeries]
});
}
</script>
</script>
<script>
function tpsChart() {
var myChart = Highcharts.stockChart('tpsGraph', {
@ -881,18 +885,16 @@
}]
},
yAxis: [{
labels: {
labels: {
align: 'right',
x: -3
},
title: {
text: 'Players'
},
top: '55%',
height: '40%',
offset: 0,
lineWidth: 2
height: '30%',
}, {
lineWidth: 2,
labels: {
align: 'right',
x: -3
@ -900,9 +902,14 @@
title: {
text: 'TPS'
},
height: '55%',
height: '70%',
top: '30%',
offset: 0,
lineWidth: 2
}],
tooltip: {
split: true
},
plotOptions: {
areaspline: {
fillOpacity: 0.4
@ -912,8 +919,9 @@
series: [tpsSeries, playersOnlineSeries]
});
}
</script>
<script>
</script>
<script>
function resourceChart() {
var myChart = Highcharts.stockChart('resourceGraph', {
rangeSelector: {
@ -962,6 +970,9 @@
offset: 0,
lineWidth: 2
}],
tooltip: {
split: true
},
plotOptions: {
areaspline: {
fillOpacity: 0.4
@ -971,8 +982,9 @@
series: [cpuSeries, ramSeries]
});
}
</script>
<script>
</script>
<script>
function worldChart() {
var myChart = Highcharts.stockChart('worldGraph', {
rangeSelector: {
@ -1021,6 +1033,9 @@
offset: 0,
lineWidth: 2
}],
tooltip: {
split: true
},
plotOptions: {
areaspline: {
fillOpacity: 0.4
@ -1030,7 +1045,8 @@
series: [entitySeries, chunkSeries]
});
}
</script>
</script>
<script>
function activityPie() {
var myChart = Highcharts.chart('activityPie', {
@ -1059,8 +1075,9 @@
series: [activitySeries]
});
};
</script>
<script>
<script>
function gmPie() {
Highcharts.chart('gmPie', {
chart: {
@ -1086,6 +1103,7 @@
series: [gmSeries]
});
};
</script>
<script>
function punchCard() {
@ -1112,7 +1130,8 @@
series: [punchcardSeries]
});
}
</script>
</script>
<script>
function sessionDistributionChart() {
Highcharts.chart('sessionDistribution', {
@ -1146,6 +1165,7 @@
series: [sessionLengthSeries]
});
};
</script>
<script>
function worldMap() {
@ -1165,6 +1185,7 @@
series: [mapSeries]
});
}
</script>
<script>
// Navigation & Refresh time clock
@ -1256,6 +1277,7 @@
document.getElementById('divTime').innerHTML = out;
setTimeout('countUpTimer()', 1000);
}
</script>
</div>
</body>

3
Plan/src/test/java/main/java/com/djrapitops/plan/data/cache/DataCacheHandlerTest.java vendored
View File

@ -40,7 +40,6 @@ import static org.powermock.api.mockito.PowerMockito.when;
@PrepareForTest(JavaPlugin.class)
public class DataCacheHandlerTest {
private Plan plan;
private Database db;
private DataCacheHandler handler;
private boolean calledSaveCommandUse;
@ -59,7 +58,7 @@ public class DataCacheHandlerTest {
@Before
public void setUp() throws Exception {
TestInit t = TestInit.init();
plan = t.getPlanMock();
Plan plan = t.getPlanMock();
calledSaveCommandUse = false;
calledSaveUserData = false;
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime()) {

7
Plan/src/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueueTest.java vendored
View File

@ -24,9 +24,6 @@ import test.java.utils.TestInit;
@PrepareForTest({JavaPlugin.class})
public class DataCacheClearQueueTest {
private Plan plan;
private DataCacheHandler handler;
/**
*
*/
@ -39,8 +36,8 @@ public class DataCacheClearQueueTest {
@Before
public void setUp() throws Exception {
TestInit t = TestInit.init();
plan = t.getPlanMock();
handler = new DataCacheHandler(plan) {
Plan plan = t.getPlanMock();
DataCacheHandler handler = new DataCacheHandler(plan) {
@Override
public boolean getCommandUseFromDb() {
return true;

6
Plan/src/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheSaveQueueTest.java vendored
View File

@ -31,8 +31,6 @@ import static org.powermock.api.mockito.PowerMockito.when;
@PrepareForTest({JavaPlugin.class})
public class DataCacheSaveQueueTest {
private Plan plan;
private Database db;
private boolean calledSaveUserData;
private boolean calledSaveUserData2;
@ -48,10 +46,10 @@ public class DataCacheSaveQueueTest {
@Before
public void setUp() throws Exception {
TestInit t = TestInit.init();
plan = t.getPlanMock();
Plan plan = t.getPlanMock();
calledSaveUserData = false;
calledSaveUserData2 = false;
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime()) {
Database db = new SQLiteDB(plan, "debug" + MiscUtils.getTime()) {
@Override
public void startConnectionPingTask() {

175
Plan/src/test/java/main/java/com/djrapitops/plan/utilities/ManageUtilsTest.java
View File

@ -1,175 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package test.java.main.java.com.djrapitops.plan.utilities;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.utilities.ManageUtils;
import org.bukkit.plugin.java.JavaPlugin;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import test.java.utils.TestInit;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* @author Rsl1122
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({JavaPlugin.class})
public class ManageUtilsTest {
private final int threshold = 5000;
/**
*
*/
public ManageUtilsTest() {
}
/**
* @throws IOException
* @throws Exception
*/
@Before
public void setUp() throws Exception {
TestInit.init();
}
/**
*
*/
@Test
public void testContainsCombinable() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold - 100, threshold * 2));
data.add(new SessionData(threshold * 2 + 100, threshold * 3));
assertTrue(ManageUtils.containsCombinable(data));
}
/**
*
*/
@Test
public void testContainsCombinableFalse() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, threshold));
data.add(new SessionData(threshold * 3, threshold * 4));
assertTrue(!ManageUtils.containsCombinable(data));
}
/**
*
*/
@Test
public void testContainsCombinableFalse2() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, threshold * 2));
data.add(new SessionData(threshold * 3, threshold * 4));
assertTrue(!ManageUtils.containsCombinable(data));
}
/**
*
*/
@Test
public void testContainsCombinableFalse3() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, threshold * 2));
data.add(new SessionData(threshold * 3 + 200, threshold * 4));
assertTrue(!ManageUtils.containsCombinable(data));
}
/**
*
*/
@Test
public void testCombineSessions() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold, threshold * 2));
data.add(new SessionData(threshold * 2 + 100, threshold * 3));
SessionData get = ManageUtils.combineSessions(data, 1).get(0);
SessionData exp = new SessionData(0, threshold * 3);
assertEquals(exp, get);
}
/**
*
*/
@Test
public void testCombineSessions2() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold, threshold * 2));
data.add(new SessionData(threshold * 2 + 100, threshold * 3));
data.add(new SessionData(threshold * 3 + 200, threshold * 4));
SessionData get = ManageUtils.combineSessions(data, 1).get(0);
SessionData exp = new SessionData(0, threshold * 4);
assertEquals(exp, get);
}
/**
*
*/
@Test
public void testCombineSessions3() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold, threshold * 2));
data.add(new SessionData(threshold * 3 + 200, threshold * 4));
List<SessionData> result = ManageUtils.combineSessions(data, 2);
SessionData exp = new SessionData(0, threshold * 2);
assertEquals(exp, result.get(0));
SessionData exp2 = new SessionData(threshold * 3 + 200, threshold * 4);
assertEquals(exp2, result.get(1));
}
/**
*
*/
@Test
public void testCombineSessions4() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold, threshold * 2));
data.add(new SessionData(threshold * 3 + 200, threshold * 4));
data.add(new SessionData(threshold * 5 - 200, threshold * 5));
List<SessionData> result = ManageUtils.combineSessions(data, 2);
SessionData exp = new SessionData(0, threshold * 2);
assertEquals(exp, result.get(0));
SessionData exp2 = new SessionData(threshold * 3 + 200, threshold * 5);
assertEquals(exp2, result.get(1));
}
/**
*
*/
@Test
public void testCombineSessions5() {
List<SessionData> data = new ArrayList<>();
data.add(new SessionData(0, 100));
data.add(new SessionData(threshold, threshold * 2));
data.add(new SessionData(threshold * 5, threshold * 5 + 100));
data.add(new SessionData(threshold * 8, threshold * 8 + 200));
data.add(new SessionData(threshold * 9 - 200, threshold * 10));
List<SessionData> result = ManageUtils.combineSessions(data, 3);
SessionData exp = new SessionData(0, threshold * 2);
assertEquals(exp, result.get(0));
SessionData exp2 = new SessionData(threshold * 5, threshold * 5 + 100);
assertEquals(exp2, result.get(1));
SessionData exp3 = new SessionData(threshold * 8, threshold * 10);
assertEquals(exp3, result.get(2));
}
}