Merge branches 'master' and 'passwd_recovery_process' of https://github.com/AuthMe/AuthMeReloaded into passwd_recovery_process

# Conflicts:
#	docs/config.md
#	src/main/resources/messages/messages_bg.yml
#	src/main/resources/messages/messages_es.yml
#	src/main/resources/messages/messages_pt.yml
#	src/main/resources/messages/messages_zhcn.yml

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

@@ -95,4 +95,14 @@ public class StringUtilsTest {
     public void shouldHaveHiddenConstructor() {
         TestHelper.validateHasOnlyPrivateEmptyConstructor(StringUtils.class);
     }
+
+    @Test
+    public void shouldCheckIfHasNeedleInWord() {
+        // given/when/then
+        assertThat(StringUtils.isInsideString('@', "@hello"), equalTo(false));
+        assertThat(StringUtils.isInsideString('?', "absent"), equalTo(false));
+        assertThat(StringUtils.isInsideString('-', "abcd-"), equalTo(false));
+        assertThat(StringUtils.isInsideString('@', "hello@example"), equalTo(true));
+        assertThat(StringUtils.isInsideString('@', "D@Z"), equalTo(true));
+    }
 }

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

@@ -1,13 +1,20 @@
 package fr.xephi.authme.util;
 
 import fr.xephi.authme.TestHelper;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 /**
  * Test for {@link Utils}.
@@ -49,6 +56,49 @@ public class UtilsTest {
         TestHelper.validateHasOnlyPrivateEmptyConstructor(Utils.class);
     }
 
+    @Test
+    public void shouldLogAndSendMessage() {
+        // given
+        Logger logger = TestHelper.setupLogger();
+        Player player = mock(Player.class);
+        String message = "Finished adding foo to the bar";
+
+        // when
+        Utils.logAndSendMessage(player, message);
+
+        // then
+        verify(logger).info(message);
+        verify(player).sendMessage(message);
+    }
+
+    @Test
+    public void shouldHandleNullAsCommandSender() {
+        // given
+        Logger logger = TestHelper.setupLogger();
+        String message = "Test test, test.";
+
+        // when
+        Utils.logAndSendMessage(null, message);
+
+        // then
+        verify(logger).info(message);
+    }
+
+    @Test
+    public void shouldNotSendToCommandSenderTwice() {
+        // given
+        Logger logger = TestHelper.setupLogger();
+        CommandSender sender = mock(ConsoleCommandSender.class);
+        String message = "Test test, test.";
+
+        // when
+        Utils.logAndSendMessage(sender, message);
+
+        // then
+        verify(logger).info(message);
+        verifyZeroInteractions(sender);
+    }
+
     @Test
     public void shouldCheckIfClassIsLoaded() {
         // given / when / then