Testing - start change to non-reflection WrapperMock test setup

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

@@ -33,8 +33,8 @@ public final class Utils {
     private static Method getOnlinePlayers;
 
     static {
-        plugin = AuthMe.getInstance();
         wrapper = Wrapper.getInstance();
+        plugin = wrapper.getAuthMe();
         initializeOnlinePlayersIsCollectionField();
     }
 
@@ -111,8 +111,9 @@ public final class Utils {
      * @return True on success, false on failure.
      */
     public static boolean addNormal(Player player, String group) {
-        if (!Settings.isPermissionCheckEnabled)
+        if (!Settings.isPermissionCheckEnabled) {
             return false;
+        }
 
         // Get the permissions manager, and make sure it's valid
         PermissionsManager permsMan = plugin.getPermissionsManager();

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

@@ -1,10 +1,12 @@
 package fr.xephi.authme.util;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.settings.Messages;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.scheduler.BukkitScheduler;
 
+import java.io.File;
 import java.util.logging.Logger;
 
 /**
@@ -21,6 +23,15 @@ public class Wrapper {
     Wrapper() {
     }
 
+    /**
+     * Package-private setter of the singleton field used for tests to inject a mock instance.
+     *
+     * @param wrapper The wrapper to use as singleton
+     */
+    static void setSingleton(Wrapper wrapper) {
+        Wrapper.singleton = wrapper;
+    }
+
     public static Wrapper getInstance() {
         if (singleton == null) {
             singleton = new Wrapper();
@@ -40,6 +51,20 @@ public class Wrapper {
         return getAuthMe().getLogger();
     }
 
+    public Messages getMessages() {
+        return getAuthMe().getMessages();
+    }
+
+    /**
+     * Return the folder containing plugin data via the AuthMe instance.
+     *
+     * @return The plugin data folder
+     * @see AuthMe#getDataFolder()
+     */
+    public File getDataFolder() {
+        return getAuthMe().getDataFolder();
+    }
+
     public BukkitScheduler getScheduler() {
         return Bukkit.getScheduler();
     }