Testing - change to non-reflection WrapperMock test setup

Replaced many classes to use Wrapper to get singletons and replaced the test setups to use the WrapperMock instead of setting fields through reflection

src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java

@@ -8,6 +8,7 @@ import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -22,8 +23,8 @@ public class ChangePasswordCommand extends ExecutableCommand {
             return true;
         }
 
-        final AuthMe plugin = AuthMe.getInstance();
-        final Messages m = plugin.getMessages();
+        final Wrapper wrapper = Wrapper.getInstance();
+        final Messages m = wrapper.getMessages();
 
         // Get the passwords
         String playerPass = commandArguments.get(0);
@@ -32,7 +33,8 @@ public class ChangePasswordCommand extends ExecutableCommand {
         // Get the player instance and make sure it's authenticated
         Player player = (Player) sender;
         String name = player.getName().toLowerCase();
-        if (!PlayerCache.getInstance().isAuthenticated(name)) {
+        final PlayerCache playerCache = wrapper.getPlayerCache();
+        if (!playerCache.isAuthenticated(name)) {
             m.send(player, MessageKey.NOT_LOGGED_IN);
             return true;
         }
@@ -45,7 +47,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
             || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select")
             || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null")
             || !playerPassLowerCase.matches(Settings.getPassRegex)) {
-            m.send(player, MessageKey.PASSWORD_IS_USERNAME_ERROR);
+            m.send(player, MessageKey.PASSWORD_MATCH_ERROR);
             return true;
         }
         if (playerPassLowerCase.equalsIgnoreCase(name)) {
@@ -63,6 +65,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
         }
 
         // Set the password
+        final AuthMe plugin = wrapper.getAuthMe();
         plugin.getServer().getScheduler().runTaskAsynchronously(plugin,
             new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
         return true;

src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.email;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -22,7 +23,7 @@ public class AddEmailCommand extends ExecutableCommand {
         String playerMailVerify = commandArguments.get(1);
 
         // Get the player and perform email addition
-        final AuthMe plugin = AuthMe.getInstance();
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
         final Player player = (Player) sender;
         plugin.getManagement().performAddEmail(player, playerMail, playerMailVerify);
         return true;

src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.email;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -22,7 +23,7 @@ public class ChangeEmailCommand extends ExecutableCommand {
         String playerMailNew = commandArguments.get(1);
 
         // Get the player instance and execute action
-        final AuthMe plugin = AuthMe.getInstance();
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
         final Player player = (Player) sender;
         plugin.getManagement().performChangeEmail(player, playerMailOld, playerMailNew);
         return true;

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -11,6 +11,7 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -35,8 +36,9 @@ public class RecoverEmailCommand extends ExecutableCommand {
         final String playerName = player.getName();
 
         // Command logic
-        final AuthMe plugin = AuthMe.getInstance();
-        final Messages m = plugin.getMessages();
+        final Wrapper wrapper = Wrapper.getInstance();
+        final AuthMe plugin = wrapper.getAuthMe();
+        final Messages m = wrapper.getMessages();
 
         if (plugin.mail == null) {
             m.send(player, MessageKey.ERROR);

src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.login;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -18,7 +19,7 @@ public class LoginCommand extends ExecutableCommand {
         }
 
         // Get the necessary objects
-        final AuthMe plugin = AuthMe.getInstance();
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
         final Player player = (Player) sender;
         final String password = commandArguments.get(0);
 

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -8,6 +8,7 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -24,8 +25,9 @@ public class RegisterCommand extends ExecutableCommand {
             return true;
         }
 
-        final AuthMe plugin = AuthMe.getInstance();
-        final Messages m = plugin.getMessages();
+        final Wrapper wrapper = Wrapper.getInstance();
+        final AuthMe plugin = wrapper.getAuthMe();
+        final Messages m = wrapper.getMessages();
 
         // Make sure the command arguments are valid
         final Player player = (Player) sender;

src/main/java/fr/xephi/authme/util/Wrapper.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.util;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Messages;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -55,6 +56,10 @@ public class Wrapper {
         return getAuthMe().getMessages();
     }
 
+    public PlayerCache getPlayerCache() {
+        return PlayerCache.getInstance();
+    }
+
     /**
      * Return the folder containing plugin data via the AuthMe instance.
      *