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

#306 Adjust ExecutableCommand implementations to interface

Browse Source
This commit is contained in:
ljacqu
2015-12-23 14:55:04 +01:00
parent 8ef1b2ae3e
commit 14f6ecd716
37 changed files with 124 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/command/CommandInitializerTest.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class CommandInitializerTest {
@BeforeClass
public static void initializeCommandManager() {
WrapperMock.createInstance();
commands = CommandInitializer.getBaseCommands();
commands = CommandInitializer.buildCommands();
}
@Test
src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java
+4 -2
View File
@@ -1,6 +1,7 @@
package fr.xephi.authme.command.executable.captcha;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.command.ExecutableCommand;
import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
@@ -18,6 +19,7 @@ import java.util.ArrayList;
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.when;
@@ -41,7 +43,7 @@ public class CaptchaCommandTest {
ExecutableCommand command = new CaptchaCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
assertThat(wrapperMock.wasMockCalled(AuthMe.class), equalTo(false));
@@ -56,7 +58,7 @@ public class CaptchaCommandTest {
ExecutableCommand command = new CaptchaCommand();
// when
command.executeCommand(player, new ArrayList<String>());
command.executeCommand(player, new ArrayList<String>(), mock(CommandService.class));
// then
verify(wrapperMock.getMessages()).send(player, MessageKey.USAGE_LOGIN);
src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java
+9 -8
View File
@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.changepassword;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
import fr.xephi.authme.settings.Settings;
@@ -59,7 +60,7 @@ public class ChangePasswordCommandTest {
ChangePasswordCommand command = new ChangePasswordCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
assertThat(wrapperMock.wasMockCalled(Server.class), equalTo(false));
@@ -72,7 +73,7 @@ public class ChangePasswordCommandTest {
ChangePasswordCommand command = new ChangePasswordCommand();
// when
command.executeCommand(sender, Arrays.asList("pass", "pass"));
command.executeCommand(sender, Arrays.asList("pass", "pass"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.NOT_LOGGED_IN);
@@ -86,7 +87,7 @@ public class ChangePasswordCommandTest {
ChangePasswordCommand command = new ChangePasswordCommand();
// when
command.executeCommand(sender, Arrays.asList("old123", "!pass"));
command.executeCommand(sender, Arrays.asList("old123", "!pass"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.PASSWORD_MATCH_ERROR);
@@ -101,7 +102,7 @@ public class ChangePasswordCommandTest {
ChangePasswordCommand command = new ChangePasswordCommand();
// when
command.executeCommand(sender, Arrays.asList("old_", "Tester"));
command.executeCommand(sender, Arrays.asList("old_", "Tester"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.PASSWORD_IS_USERNAME_ERROR);
@@ -116,7 +117,7 @@ public class ChangePasswordCommandTest {
Settings.passwordMaxLength = 3;
// when
command.executeCommand(sender, Arrays.asList("12", "test"));
command.executeCommand(sender, Arrays.asList("12", "test"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.INVALID_PASSWORD_LENGTH);
@@ -131,7 +132,7 @@ public class ChangePasswordCommandTest {
Settings.getPasswordMinLen = 7;
// when
command.executeCommand(sender, Arrays.asList("oldverylongpassword", "tester"));
command.executeCommand(sender, Arrays.asList("oldverylongpassword", "tester"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.INVALID_PASSWORD_LENGTH);
@@ -146,7 +147,7 @@ public class ChangePasswordCommandTest {
Settings.unsafePasswords = asList("test", "abc123");
// when
command.executeCommand(sender, Arrays.asList("oldpw", "abc123"));
command.executeCommand(sender, Arrays.asList("oldpw", "abc123"), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.PASSWORD_UNSAFE_ERROR);
@@ -160,7 +161,7 @@ public class ChangePasswordCommandTest {
ChangePasswordCommand command = new ChangePasswordCommand();
// when
command.executeCommand(sender, Arrays.asList("abc123", "abc123"));
command.executeCommand(sender, Arrays.asList("abc123", "abc123"), mock(CommandService.class));
// then
verify(messagesMock, never()).send(eq(sender), any(MessageKey.class));
src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java
+4 -2
View File
@@ -1,6 +1,7 @@
package fr.xephi.authme.command.executable.email;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.util.WrapperMock;
import org.bukkit.command.BlockCommandSender;
@@ -13,6 +14,7 @@ import org.mockito.Mockito;
import java.util.ArrayList;
import java.util.Arrays;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -40,7 +42,7 @@ public class AddEmailCommandTest {
AddEmailCommand command = new AddEmailCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
verify(authMeMock, never()).getManagement();
@@ -53,7 +55,7 @@ public class AddEmailCommandTest {
AddEmailCommand command = new AddEmailCommand();
// when
command.executeCommand(sender, Arrays.asList("mail@example", "other_example"));
command.executeCommand(sender, Arrays.asList("mail@example", "other_example"), mock(CommandService.class));
// then
verify(authMeMock).getManagement();
src/test/java/fr/xephi/authme/command/executable/email/ChangeEmailCommandTest.java
+8 -5
View File
@@ -1,6 +1,7 @@
package fr.xephi.authme.command.executable.email;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.util.WrapperMock;
import org.bukkit.command.BlockCommandSender;
@@ -13,6 +14,7 @@ import org.mockito.Mockito;
import java.util.ArrayList;
import java.util.Arrays;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,18 +31,18 @@ public class ChangeEmailCommandTest {
public void setUpMocks() {
WrapperMock wrapper = WrapperMock.createInstance();
authMeMock = wrapper.getAuthMe();
managementMock = Mockito.mock(Management.class);
managementMock = mock(Management.class);
when(authMeMock.getManagement()).thenReturn(managementMock);
}
@Test
public void shouldRejectNonPlayerSender() {
// given
CommandSender sender = Mockito.mock(BlockCommandSender.class);
CommandSender sender = mock(BlockCommandSender.class);
ChangeEmailCommand command = new ChangeEmailCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
verify(authMeMock, never()).getManagement();
@@ -49,11 +51,12 @@ public class ChangeEmailCommandTest {
@Test
public void shouldForwardData() {
// given
Player sender = Mockito.mock(Player.class);
Player sender = mock(Player.class);
ChangeEmailCommand command = new ChangeEmailCommand();
// when
command.executeCommand(sender, Arrays.asList("new.mail@example.org", "old_mail@example.org"));
command.executeCommand(sender, Arrays.asList("new.mail@example.org", "old_mail@example.org"),
mock(CommandService.class));
// then
verify(authMeMock).getManagement();
src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java
+4 -1
View File
@@ -1,5 +1,6 @@
package fr.xephi.authme.command.executable.email;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.util.WrapperMock;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender;
@@ -10,6 +11,8 @@ import org.mockito.Mockito;
import java.util.ArrayList;
import static org.mockito.Mockito.mock;
/**
* Test for {@link RecoverEmailCommand}.
*/
@@ -28,7 +31,7 @@ public class RecoverEmailCommandTest {
RecoverEmailCommand command = new RecoverEmailCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
}
src/test/java/fr/xephi/authme/command/executable/login/LoginCommandTest.java
+3 -2
View File
@@ -1,5 +1,6 @@
package fr.xephi.authme.command.executable.login;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.WrapperMock;
@@ -40,7 +41,7 @@ public class LoginCommandTest {
LoginCommand command = new LoginCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
Mockito.verify(managementMock, never()).performLogin(any(Player.class), anyString(), anyBoolean());
@@ -53,7 +54,7 @@ public class LoginCommandTest {
LoginCommand command = new LoginCommand();
// when
command.executeCommand(sender, Collections.singletonList("password"));
command.executeCommand(sender, Collections.singletonList("password"), mock(CommandService.class));
// then
Mockito.verify(managementMock).performLogin(eq(sender), eq("password"), eq(false));
src/test/java/fr/xephi/authme/command/executable/logout/LogoutCommandTest.java
+3 -2
View File
@@ -1,6 +1,7 @@
package fr.xephi.authme.command.executable.logout;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.WrapperMock;
@@ -42,7 +43,7 @@ public class LogoutCommandTest {
LogoutCommand command = new LogoutCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
Mockito.verify(managementMock, never()).performLogout(any(Player.class));
@@ -55,7 +56,7 @@ public class LogoutCommandTest {
LogoutCommand command = new LogoutCommand();
// when
command.executeCommand(sender, Collections.singletonList("password"));
command.executeCommand(sender, Collections.singletonList("password"), mock(CommandService.class));
// then
Mockito.verify(managementMock).performLogout(sender);
src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java
+4 -3
View File
@@ -1,5 +1,6 @@
package fr.xephi.authme.command.executable.register;
import fr.xephi.authme.command.CommandService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
@@ -50,7 +51,7 @@ public class RegisterCommandTest {
ArgumentCaptor<String> messageCaptor = ArgumentCaptor.forClass(String.class);
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
verify(sender).sendMessage(messageCaptor.capture());
@@ -65,7 +66,7 @@ public class RegisterCommandTest {
RegisterCommand command = new RegisterCommand();
// when
command.executeCommand(sender, new ArrayList<String>());
command.executeCommand(sender, new ArrayList<String>(), mock(CommandService.class));
// then
verify(messagesMock).send(sender, MessageKey.USAGE_REGISTER);
@@ -79,7 +80,7 @@ public class RegisterCommandTest {
RegisterCommand command = new RegisterCommand();
// when
command.executeCommand(sender, Collections.singletonList("password"));
command.executeCommand(sender, Collections.singletonList("password"), mock(CommandService.class));
// then
verify(managementMock).performRegister(sender, "password", "");