#437 Create test for AddEmail task; fix bugs

src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

@@ -15,29 +15,30 @@ import org.bukkit.entity.Player;
  */
 public class AsyncAddEmail {
 
-    private AuthMe plugin;
-    private Player player;
-    private String email;
-    private Messages messages;
+    private final Player player;
+    private final String email;
+    private final Messages messages;
+    private final DataSource dataSource;
+    private final PlayerCache playerCache;
 
-    public AsyncAddEmail(AuthMe plugin, Player player, String email) {
-        this.plugin = plugin;
+    public AsyncAddEmail(AuthMe plugin, Player player, String email, DataSource dataSource, PlayerCache playerCache) {
         this.messages = plugin.getMessages();
         this.player = player;
         this.email = email;
+        this.dataSource = dataSource;
+        this.playerCache = playerCache;
     }
 
     public void process() {
         String playerName = player.getName().toLowerCase();
-        PlayerCache playerCache = PlayerCache.getInstance();
 
         if (playerCache.isAuthenticated(playerName)) {
-            PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
+            PlayerAuth auth = playerCache.getAuth(playerName);
             String currentEmail = auth.getEmail();
 
-            if (currentEmail == null) {
+            if (currentEmail != null) {
                 messages.send(player, MessageKey.USAGE_CHANGE_EMAIL);
-            } else if (StringUtils.isEmpty(email) || "your@email.com".equals(email) || Settings.isEmailCorrect(email)) {
+            } else if (isEmailInvalid(email)) {
                 messages.send(player, MessageKey.INVALID_EMAIL);
             } else {
                 auth.setEmail(email);
@@ -45,10 +46,15 @@ public class AsyncAddEmail {
                 messages.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
             }
         } else {
-            sendUnloggedMessage(plugin.getDataSource());
+            sendUnloggedMessage(dataSource);
         }
     }
 
+    private static boolean isEmailInvalid(String email) {
+        return StringUtils.isEmpty(email) || "your@email.com".equals(email)
+            || !Settings.isEmailCorrect(email);
+    }
+
     private void sendUnloggedMessage(DataSource dataSource) {
         if (dataSource.isAuthAvailable(player.getName())) {
             messages.send(player, MessageKey.LOGIN_MESSAGE);

src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -3,7 +3,6 @@ package fr.xephi.authme.process.email;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
-import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.settings.Settings;
@@ -11,6 +10,7 @@ import fr.xephi.authme.util.StringUtils;
 import org.bukkit.entity.Player;
 
 /**
+ * Async task for changing the email.
  */
 public class AsyncChangeEmail {