Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor

src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java

@@ -4,8 +4,8 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ReflectionTestUtils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
-import fr.xephi.authme.settings.MessageKey;
-import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
 import fr.xephi.authme.util.WrapperMock;

src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java

@@ -2,8 +2,8 @@ package fr.xephi.authme.command.executable.register;
 
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.process.Management;
-import fr.xephi.authme.settings.MessageKey;
-import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.WrapperMock;
 import org.bukkit.command.BlockCommandSender;

src/test/java/fr/xephi/authme/output/Log4JFilterTest.java

@@ -1,4 +1,4 @@
-package fr.xephi.authme;
+package fr.xephi.authme.output;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

src/test/java/fr/xephi/authme/output/MessageKeyTest.java

@@ -1,4 +1,4 @@
-package fr.xephi.authme.settings;
+package fr.xephi.authme.output;
 
 import fr.xephi.authme.util.StringUtils;
 import org.junit.Test;

src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java

@@ -1,5 +1,6 @@
-package fr.xephi.authme.settings;
+package fr.xephi.authme.output;
 
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.WrapperMock;
 import org.bukkit.entity.Player;
 import org.junit.Before;
@@ -18,7 +19,7 @@ import static org.mockito.Mockito.verify;
 /**
  * Test for {@link Messages}.
  */
-public class MessagesTest {
+public class MessagesIntegrationTest {
 
     private static final String YML_TEST_FILE = "messages_test.yml";
     private Messages messages;
@@ -38,8 +39,9 @@ public class MessagesTest {
             throw new RuntimeException("File '" + YML_TEST_FILE + "' could not be loaded");
         }
 
-        File file = new File(url.getFile());
-        messages = new Messages(file, "en");
+        Settings.messageFile = new File(url.getFile());
+        Settings.messagesLanguage = "en";
+        messages = Messages.getInstance();
     }
 
     @Test

src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java

@@ -20,7 +20,8 @@ public class PlayerPermissionTest {
         // when/then
         for (PlayerPermission permission : PlayerPermission.values()) {
             if (!permission.getNode().startsWith(requiredPrefix)) {
-                fail("The permission '" + permission + "' does not start with the required prefix '" + requiredPrefix + "'");
+                fail("The permission '" + permission + "' does not start with the required prefix '" + requiredPrefix
+                    + "'");
             }
         }
     }

src/test/java/fr/xephi/authme/util/WrapperMock.java

@@ -2,7 +2,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 fr.xephi.authme.output.Messages;
 import org.bukkit.Server;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.mockito.Mockito;