Create tests for admin commands

src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java

@@ -2,7 +2,6 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
@@ -41,6 +40,8 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
             commandService.send(sender, MessageKey.INVALID_PASSWORD_LENGTH);
             return;
         }
+        // TODO ljacqu 20160312: The UNSAFE_PASSWORDS should be all lowercase
+        // -> introduce a lowercase String list property type
         if (commandService.getProperty(SecuritySettings.UNSAFE_PASSWORDS).contains(playerPassLowerCase)) {
             commandService.send(sender, MessageKey.PASSWORD_UNSAFE_ERROR);
             return;
@@ -53,8 +54,8 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
             public void run() {
                 DataSource dataSource = commandService.getDataSource();
                 PlayerAuth auth = null;
-                if (PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
-                    auth = PlayerCache.getInstance().getAuth(playerNameLowerCase);
+                if (commandService.getPlayerCache().isAuthenticated(playerNameLowerCase)) {
+                    auth = commandService.getPlayerCache().getAuth(playerNameLowerCase);
                 } else if (dataSource.isAuthAvailable(playerNameLowerCase)) {
                     auth = dataSource.getAuth(playerNameLowerCase);
                 }

src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

@@ -6,6 +6,9 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
+/**
+ * Teleports the player to the first spawn.
+ */
 public class FirstSpawnCommand extends PlayerCommand {
 
     @Override

src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java

@@ -8,13 +8,16 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
+/**
+ * Returns a player's email.
+ */
 public class GetEmailCommand implements ExecutableCommand {
 
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         String playerName = arguments.isEmpty() ? sender.getName() : arguments.get(0);
 
-        PlayerAuth auth = commandService.getDataSource().getAuth(playerName.toLowerCase());
+        PlayerAuth auth = commandService.getDataSource().getAuth(playerName);
         if (auth == null) {
             commandService.send(sender, MessageKey.UNKNOWN_USER);
         } else {

src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java

@@ -10,6 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ * Returns the last login date of the given user.
  */
 public class LastLoginCommand implements ExecutableCommand {
 
@@ -18,23 +19,24 @@ public class LastLoginCommand implements ExecutableCommand {
         // Get the player
         String playerName = (arguments.size() >= 1) ? arguments.get(0) : sender.getName();
 
-        PlayerAuth auth = commandService.getDataSource().getAuth(playerName.toLowerCase());
+        PlayerAuth auth = commandService.getDataSource().getAuth(playerName);
         if (auth == null) {
             commandService.send(sender, MessageKey.USER_NOT_REGISTERED);
             return;
         }
 
         // Get the last login date
-        long lastLogin = auth.getLastLogin();
+        final long lastLogin = auth.getLastLogin();
         final long diff = System.currentTimeMillis() - lastLogin;
-        final String lastLoginMessage = (int) (diff / 86400000) + " days " + (int) (diff / 3600000 % 24) + " hours "
-            + (int) (diff / 60000 % 60) + " mins " + (int) (diff / 1000 % 60) + " secs";
+        final String lastLoginMessage = (int) (diff / 86400000) + " days "
+            + (int) (diff / 3600000 % 24) + " hours "
+            + (int) (diff / 60000 % 60) + " mins "
+            + (int) (diff / 1000 % 60) + " secs";
         Date date = new Date(lastLogin);
 
         // Show the player status
         sender.sendMessage("[AuthMe] " + playerName + " last login: " + date.toString());
-        sender.sendMessage("[AuthMe] The player " + auth.getNickname() + " last logged in "
-            + lastLoginMessage + " ago.");
+        sender.sendMessage("[AuthMe] The player " + playerName + " last logged in " + lastLoginMessage + " ago.");
         sender.sendMessage("[AuthMe] Last Player's IP: " + auth.getIp());
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java

@@ -10,6 +10,10 @@ import org.bukkit.command.CommandSender;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Command for purging data of banned players. Depending on the settings
+ * it purges (deletes) data from third-party plugins as well.
+ */
 public class PurgeBannedPlayersCommand implements ExecutableCommand {
 
     @Override
@@ -24,7 +28,7 @@ public class PurgeBannedPlayersCommand implements ExecutableCommand {
         }
 
         // Purge the banned players
-        plugin.getDataSource().purgeBanned(bannedPlayers);
+        commandService.getDataSource().purgeBanned(bannedPlayers);
         if (commandService.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES)
             && commandService.getPluginHooks().isEssentialsAvailable())
             plugin.dataManager.purgeEssentials(bannedPlayers);

src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java

@@ -10,13 +10,16 @@ import org.bukkit.command.CommandSender;
 import java.util.Calendar;
 import java.util.List;
 
+/**
+ * Command for purging the data of players which have not been since for a given number
+ * of days. Depending on the settings, this removes player data in third-party plugins as well.
+ */
 public class PurgeCommand implements ExecutableCommand {
 
+    private static final int MINIMUM_LAST_SEEN_DAYS = 30;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
-        // AuthMe plugin instance
-        AuthMe plugin = commandService.getAuthMe();
-
         // Get the days parameter
         String daysStr = arguments.get(0);
 
@@ -30,8 +33,9 @@ public class PurgeCommand implements ExecutableCommand {
         }
 
         // Validate the value
-        if (days < 30) {
-            sender.sendMessage(ChatColor.RED + "You can only purge data older than 30 days");
+        if (days < MINIMUM_LAST_SEEN_DAYS) {
+            sender.sendMessage(ChatColor.RED + "You can only purge data older than "
+                + MINIMUM_LAST_SEEN_DAYS + " days");
             return;
         }
 
@@ -47,6 +51,7 @@ public class PurgeCommand implements ExecutableCommand {
         sender.sendMessage(ChatColor.GOLD + "Deleted " + purged.size() + " user accounts");
 
         // Purge other data
+        AuthMe plugin = commandService.getAuthMe();
         if (commandService.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES) &&
             commandService.getPluginHooks().isEssentialsAvailable())
             plugin.dataManager.purgeEssentials(purged);

src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java

@@ -8,45 +8,39 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
+/**
+ * Removes the stored last position of a user or of all.
+ */
 public class PurgeLastPositionCommand implements ExecutableCommand {
 
     @Override
     public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         String playerName = arguments.isEmpty() ? sender.getName() : arguments.get(0);
-        String playerNameLowerCase = playerName.toLowerCase();
 
-        if (playerNameLowerCase.equalsIgnoreCase("*"))
-        {
-        	for (PlayerAuth auth : commandService.getDataSource().getAllAuths())
-        	{
-                // Set the last position
-                auth.setQuitLocX(0D);
-                auth.setQuitLocY(0D);
-                auth.setQuitLocZ(0D);
-                auth.setWorld("world");
+        if ("*".equals(playerName)) {
+            for (PlayerAuth auth : commandService.getDataSource().getAllAuths()) {
+                resetLastPosition(auth);
                 commandService.getDataSource().updateQuitLoc(auth);
-        	}
-        	sender.sendMessage("All players last position locations are now reset");
-        }
-        else
-        {
+            }
+            sender.sendMessage("All players last position locations are now reset");
+        } else {
             // Get the user auth and make sure the user exists
-            PlayerAuth auth = commandService.getDataSource().getAuth(playerNameLowerCase);
+            PlayerAuth auth = commandService.getDataSource().getAuth(playerName);
             if (auth == null) {
                 commandService.send(sender, MessageKey.UNKNOWN_USER);
                 return;
             }
 
-            // Set the last position
-            auth.setQuitLocX(0D);
-            auth.setQuitLocY(0D);
-            auth.setQuitLocZ(0D);
-            auth.setWorld("world");
+            resetLastPosition(auth);
             commandService.getDataSource().updateQuitLoc(auth);
-
-            // Show a status message
-            sender.sendMessage(playerNameLowerCase + "'s last position location is now reset");
+            sender.sendMessage(playerName + "'s last position location is now reset");
         }
+    }
 
+    private static void resetLastPosition(PlayerAuth auth) {
+        auth.setQuitLocX(0d);
+        auth.setQuitLocY(0d);
+        auth.setQuitLocZ(0d);
+        auth.setWorld("world");
     }
 }