Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email

Browse Source 
Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/Management.java
	src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
This commit is contained in:
ljacqu
2016-02-06 18:01:11 +01:00
parent d4e3e55e07 ad9625bb4e
commit b4b679d3b9
96 changed files with 1674 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java
+4 -1
View File
@@ -6,6 +6,7 @@ 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.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.WrapperMock;
import org.bukkit.entity.Player;
@@ -29,6 +30,7 @@ public class AsyncAddEmailTest {
private Player player;
private DataSource dataSource;
private PlayerCache playerCache;
private NewSetting settings;
@BeforeClass
public static void setUp() {
@@ -184,7 +186,8 @@ public class AsyncAddEmailTest {
player = mock(Player.class);
dataSource = mock(DataSource.class);
playerCache = mock(PlayerCache.class);
return new AsyncAddEmail(authMe, player, email, dataSource, playerCache);
settings = mock(NewSetting.class);
return new AsyncAddEmail(authMe, player, email, dataSource, playerCache, settings);
}
}
src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java
+4 -1
View File
@@ -6,6 +6,7 @@ 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.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.WrapperMock;
import org.bukkit.entity.Player;
@@ -29,6 +30,7 @@ public class AsyncChangeEmailTest {
private Messages messages;
private PlayerCache playerCache;
private DataSource dataSource;
private NewSetting settings;
@BeforeClass
public static void setUp() {
@@ -221,6 +223,7 @@ public class AsyncChangeEmailTest {
when(authMe.getMessages()).thenReturn(messages);
playerCache = mock(PlayerCache.class);
dataSource = mock(DataSource.class);
return new AsyncChangeEmail(player, authMe, oldEmail, newEmail, dataSource, playerCache);
settings = mock(NewSetting.class);
return new AsyncChangeEmail(player, authMe, oldEmail, newEmail, dataSource, playerCache, settings);
}
}