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

Follow remarks

Browse Source 
#1509
This commit is contained in:
Maxetto
2018-03-05 19:38:24 +01:00
parent 914c4adc0b
commit 00de15016a
18 changed files with 132 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class RegisterAdminCommandTest {
Player player = mock(Player.class);
given(bukkitService.getPlayerExact(user)).willReturn(player);
String kickForAdminRegister = "Admin registered you -- log in again";
given(commandService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER)).willReturn(kickForAdminRegister);
given(commandService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER, player)).willReturn(kickForAdminRegister);
CommandSender sender = mock(CommandSender.class);
setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask(bukkitService);
setBukkitServiceToRunTaskOptionallyAsync(bukkitService);
src/test/java/fr/xephi/authme/data/TempbanManagerTest.java
+2 -2
View File
@@ -149,7 +149,7 @@ public class TempbanManagerTest {
String ip = "123.45.67.89";
TestHelper.mockPlayerIp(player, ip);
String banReason = "IP ban too many logins";
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS, player)).willReturn(banReason);
Settings settings = mockSettings(2, 100, "");
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
setBukkitServiceToScheduleSyncDelayedTask(bukkitService);
@@ -195,7 +195,7 @@ public class TempbanManagerTest {
String ip = "22.44.66.88";
TestHelper.mockPlayerIp(player, ip);
String banReason = "kick msg";
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS, player)).willReturn(banReason);
Settings settings = mockSettings(10, 60, "");
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
manager.increaseCount(ip, "user");
src/test/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManagerTest.java
+8 -8
View File
@@ -71,7 +71,7 @@ public class LimboPlayerTaskManagerTest {
Player player = mock(Player.class);
LimboPlayer limboPlayer = mock(LimboPlayer.class);
MessageKey key = MessageKey.REGISTER_MESSAGE;
given(messages.retrieveSingle(key)).willReturn("Please register!");
given(messages.retrieveSingle(key, player)).willReturn("Please register!");
int interval = 12;
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(interval);
@@ -80,7 +80,7 @@ public class LimboPlayerTaskManagerTest {
// then
verify(limboPlayer).setMessageTask(any(MessageTask.class));
verify(messages).retrieveSingle(key);
verify(messages).retrieveSingle(key, player);
verify(bukkitService).runTaskTimer(
any(MessageTask.class), eq(2L * TICKS_PER_SECOND), eq((long) interval * TICKS_PER_SECOND));
}
@@ -110,7 +110,7 @@ public class LimboPlayerTaskManagerTest {
MessageTask existingMessageTask = mock(MessageTask.class);
limboPlayer.setMessageTask(existingMessageTask);
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(8);
given(messages.retrieveSingle(MessageKey.REGISTER_MESSAGE)).willReturn("Please register!");
given(messages.retrieveSingle(MessageKey.REGISTER_MESSAGE, player)).willReturn("Please register!");
// when
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
@@ -119,7 +119,7 @@ public class LimboPlayerTaskManagerTest {
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
assertThat(limboPlayer.getMessageTask(), not(sameInstance(existingMessageTask)));
verify(registrationCaptchaManager).isCaptchaRequired(name);
verify(messages).retrieveSingle(MessageKey.REGISTER_MESSAGE);
verify(messages).retrieveSingle(MessageKey.REGISTER_MESSAGE, player);
verify(existingMessageTask).cancel();
}
@@ -134,14 +134,14 @@ public class LimboPlayerTaskManagerTest {
given(registrationCaptchaManager.isCaptchaRequired(name)).willReturn(true);
String captcha = "M032";
given(registrationCaptchaManager.getCaptchaCodeOrGenerateNew(name)).willReturn(captcha);
given(messages.retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha)).willReturn("Need to use captcha");
given(messages.retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, player, captcha)).willReturn("Need to use captcha");
// when
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
// then
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
verify(messages).retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha);
verify(messages).retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, player, captcha);
}
@Test
@@ -159,7 +159,7 @@ public class LimboPlayerTaskManagerTest {
// then
verify(limboPlayer).setTimeoutTask(bukkitTask);
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(600L)); // 30 * TICKS_PER_SECOND
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR, player);
}
@Test
@@ -194,7 +194,7 @@ public class LimboPlayerTaskManagerTest {
verify(existingTask).cancel();
assertThat(limboPlayer.getTimeoutTask(), equalTo(bukkitTask));
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(360L)); // 18 * TICKS_PER_SECOND
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR, player);
}
}
src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
+3 -3
View File
@@ -101,7 +101,7 @@ public class OnJoinVerifierTest {
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
given(permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)).willReturn(false);
String serverFullMessage = "server is full";
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn(serverFullMessage);
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player)).willReturn(serverFullMessage);
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
@@ -125,7 +125,7 @@ public class OnJoinVerifierTest {
given(permissionsManager.hasPermission(onlinePlayers.get(1), PlayerStatePermission.IS_VIP)).willReturn(false);
returnOnlineListFromBukkitServer(onlinePlayers);
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
given(messages.retrieveSingle(MessageKey.KICK_FOR_VIP)).willReturn("kick for vip");
given(messages.retrieveSingle(MessageKey.KICK_FOR_VIP, player)).willReturn("kick for vip");
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
@@ -149,7 +149,7 @@ public class OnJoinVerifierTest {
given(permissionsManager.hasPermission(onlinePlayers.get(0), PlayerStatePermission.IS_VIP)).willReturn(true);
returnOnlineListFromBukkitServer(onlinePlayers);
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn("kick full server");
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player)).willReturn("kick full server");
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
+1 -1
View File
@@ -596,7 +596,7 @@ public class PlayerListenerTest {
MessageKey.INVALID_NAME_CHARACTERS, "[a-z]");
doThrow(exception).when(onJoinVerifier).checkIsValidName(name);
String message = "Invalid characters!";
given(messages.retrieveSingle(exception.getReason(), exception.getArgs())).willReturn(message);
given(messages.retrieveSingle(exception.getReason(), player, exception.getArgs())).willReturn(message);
// when
listener.onPlayerLogin(event);
src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
+40 -7
View File
@@ -81,9 +81,11 @@ public class MessagesIntegrationTest {
public void shouldLoadMessageAndSplitAtNewLines() {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String[] message = messages.retrieve(key);
String[] message = messages.retrieve(key, sender);
// then
String[] lines = new String[]{"We've got", "new lines", "and ' apostrophes"};
@@ -94,9 +96,11 @@ public class MessagesIntegrationTest {
public void shouldLoadMessageAsStringWithNewLines() {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String message = messages.retrieveSingle(key);
String message = messages.retrieveSingle(key, sender);
// then
assertThat(message, equalTo("We've got\nnew lines\nand ' apostrophes"));
@@ -106,9 +110,11 @@ public class MessagesIntegrationTest {
public void shouldFormatColorCodes() {
// given
MessageKey key = MessageKey.LOGIN_SUCCESS;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String[] message = messages.retrieve(key);
String[] message = messages.retrieve(key, sender);
// then
assertThat(message, arrayWithSize(1));
@@ -120,6 +126,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.EMAIL_ALREADY_USED_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key);
@@ -133,6 +140,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.LOGIN_SUCCESS;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
// when
messages.send(player, key);
@@ -146,6 +154,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
// when
messages.send(player, key);
@@ -157,11 +166,26 @@ public class MessagesIntegrationTest {
assertThat(captor.getAllValues(), contains(lines));
}
@Test
public void shouldSendMessageToPlayerWithNameReplacement() {
// given
MessageKey key = MessageKey.REGISTER_MESSAGE;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
// when
messages.send(player, key);
// then
verify(player).sendMessage("§3Please Tester, register to the server with the command: /register <password> <ConfirmPassword>");
}
@Test
public void shouldSendMessageToPlayerWithTagReplacement() {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = Mockito.mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key, "1234");
@@ -175,6 +199,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key);
@@ -189,9 +214,11 @@ public class MessagesIntegrationTest {
Logger logger = mock(Logger.class);
ConsoleLogger.setLogger(logger);
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(mock(CommandSender.class), key, "rep", "rep2");
messages.send(sender, key, "rep", "rep2");
// then
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
@@ -203,9 +230,11 @@ public class MessagesIntegrationTest {
Logger logger = mock(Logger.class);
ConsoleLogger.setLogger(logger);
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(mock(CommandSender.class), key, "Replacement");
messages.send(sender, key, "Replacement");
// then
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
@@ -216,9 +245,11 @@ public class MessagesIntegrationTest {
// given
// Key is present in both files
MessageKey key = MessageKey.WRONG_PASSWORD;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String message = messages.retrieveSingle(key);
String message = messages.retrieveSingle(key, sender);
// then
assertThat(message, equalTo("§cWrong password!"));
@@ -228,9 +259,11 @@ public class MessagesIntegrationTest {
public void shouldRetrieveMessageWithReplacements() {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String result = messages.retrieveSingle(key, "24680");
String result = messages.retrieveSingle(key, sender.getName(), "24680");
// then
assertThat(result, equalTo("Use /captcha 24680 to solve the captcha"));
src/test/java/fr/xephi/authme/service/CommonServiceTest.java
+4 -3
View File
@@ -83,15 +83,16 @@ public class CommonServiceTest {
public void shouldRetrieveSingleMessage() {
// given
MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
Player player = mock(Player.class);
String text = "Test text";
given(messages.retrieveSingle(key)).willReturn(text);
given(messages.retrieveSingle(key, player)).willReturn(text);
// when
String result = commonService.retrieveSingleMessage(key);
String result = commonService.retrieveSingleMessage(key, player);
// then
assertThat(result, equalTo(text));
verify(messages).retrieveSingle(key);
verify(messages).retrieveSingle(key, player);
}
@Test