Mockito: Replace deprecated verifyZeroInteractions with verifyNoInteractions

This commit is contained in:
ljacqu 2019-10-26 21:56:54 +02:00
parent 776d1e5fa3
commit 2673eb0f8e
51 changed files with 205 additions and 206 deletions

View File

@ -24,11 +24,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.time.Instant;
import static fr.xephi.authme.IsEqualByReflectionMatcher.hasEqualValuesOnAllFields; import static fr.xephi.authme.IsEqualByReflectionMatcher.hasEqualValuesOnAllFields;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
@ -43,7 +43,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -478,7 +478,7 @@ public class AuthMeApiTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(dataSource, only()).isAuthAvailable(name); verify(dataSource, only()).isAuthAvailable(name);
verifyZeroInteractions(management, passwordSecurity); verifyNoInteractions(management, passwordSecurity);
} }
@Test @Test

View File

@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -64,7 +64,7 @@ public class HelpCommandTest {
// then // then
verify(sender).sendMessage(argThat(containsString("Could not get base command"))); verify(sender).sendMessage(argThat(containsString("Could not get base command")));
verifyZeroInteractions(helpProvider); verifyNoInteractions(helpProvider);
} }
@Test @Test
@ -102,7 +102,7 @@ public class HelpCommandTest {
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(sender).sendMessage(captor.capture()); verify(sender).sendMessage(captor.capture());
assertThat(removeColors(captor.getValue()), containsString("Unknown command")); assertThat(removeColors(captor.getValue()), containsString("Unknown command"));
verifyZeroInteractions(helpProvider); verifyNoInteractions(helpProvider);
} }
@Test @Test

View File

@ -17,7 +17,7 @@ import java.util.Arrays;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link ChangePasswordAdminCommand}. * Test for {@link ChangePasswordAdminCommand}.
@ -68,6 +68,6 @@ public class ChangePasswordAdminCommandTest {
// then // then
verify(validationService).validatePassword(pass, name); verify(validationService).validatePassword(pass, name);
verify(commonService).send(sender, MessageKey.INVALID_PASSWORD_LENGTH, "7"); verify(commonService).send(sender, MessageKey.INVALID_PASSWORD_LENGTH, "7");
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
} }

View File

@ -29,8 +29,8 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -67,7 +67,7 @@ public class ConverterCommandTest {
// then // then
String converters = String.join(", ", ConverterCommand.CONVERTERS.keySet()); String converters = String.join(", ", ConverterCommand.CONVERTERS.keySet());
verify(sender).sendMessage(argThat(containsString(converters))); verify(sender).sendMessage(argThat(containsString(converters)));
verifyZeroInteractions(commonService, converterFactory, bukkitService); verifyNoInteractions(commonService, converterFactory, bukkitService);
} }
@Test @Test
@ -81,7 +81,7 @@ public class ConverterCommandTest {
// then // then
String converters = String.join(", ", ConverterCommand.CONVERTERS.keySet()); String converters = String.join(", ", ConverterCommand.CONVERTERS.keySet());
verify(sender).sendMessage(argThat(containsString(converters))); verify(sender).sendMessage(argThat(containsString(converters)));
verifyZeroInteractions(commonService, converterFactory, bukkitService); verifyNoInteractions(commonService, converterFactory, bukkitService);
} }
@Test @Test

View File

@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -53,7 +53,7 @@ public class ForceLoginCommandTest {
// then // then
verify(bukkitService).getPlayerExact(playerName); verify(bukkitService).getPlayerExact(playerName);
verify(sender).sendMessage("Player needs to be online!"); verify(sender).sendMessage("Player needs to be online!");
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -69,7 +69,7 @@ public class ForceLoginCommandTest {
// then // then
verify(bukkitService).getPlayerExact(playerName); verify(bukkitService).getPlayerExact(playerName);
verify(sender).sendMessage("Player needs to be online!"); verify(sender).sendMessage("Player needs to be online!");
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -87,7 +87,7 @@ public class ForceLoginCommandTest {
// then // then
verify(bukkitService).getPlayerExact(playerName); verify(bukkitService).getPlayerExact(playerName);
verify(sender).sendMessage(argThat(containsString("You cannot force login the player"))); verify(sender).sendMessage(argThat(containsString("You cannot force login the player")));
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test

View File

@ -19,7 +19,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -45,7 +45,7 @@ public class PurgeCommandTest {
// then // then
verify(sender).sendMessage(argThat(containsString("The value you've entered is invalid"))); verify(sender).sendMessage(argThat(containsString("The value you've entered is invalid")));
verifyZeroInteractions(purgeService); verifyNoInteractions(purgeService);
} }
@Test @Test
@ -59,7 +59,7 @@ public class PurgeCommandTest {
// then // then
verify(sender).sendMessage(argThat(containsString("You can only purge data older than 30 days"))); verify(sender).sendMessage(argThat(containsString("You can only purge data older than 30 days")));
verifyZeroInteractions(purgeService); verifyNoInteractions(purgeService);
} }
@Test @Test

View File

@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -52,7 +52,7 @@ public class PurgePlayerCommandTest {
// then // then
verify(sender).sendMessage(argThat(containsString("This player is still registered"))); verify(sender).sendMessage(argThat(containsString("This player is still registered")));
verifyZeroInteractions(purgeExecutor); verifyNoInteractions(purgeExecutor);
} }
@Test @Test

View File

@ -22,8 +22,8 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link SetEmailCommand}. * Test for {@link SetEmailCommand}.
@ -63,7 +63,7 @@ public class SetEmailCommandTest {
// then // then
verify(validationService).validateEmail(email); verify(validationService).validateEmail(email);
verify(commandService).send(sender, MessageKey.INVALID_EMAIL); verify(commandService).send(sender, MessageKey.INVALID_EMAIL);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -107,7 +107,7 @@ public class SetEmailCommandTest {
verify(validationService).isEmailFreeForRegistration(email, sender); verify(validationService).isEmailFreeForRegistration(email, sender);
verify(commandService).send(sender, MessageKey.EMAIL_ALREADY_USED_ERROR); verify(commandService).send(sender, MessageKey.EMAIL_ALREADY_USED_ERROR);
verifyNoMoreInteractions(dataSource); verifyNoMoreInteractions(dataSource);
verifyZeroInteractions(auth); verifyNoInteractions(auth);
} }
@Test @Test

View File

@ -18,7 +18,7 @@ import java.util.Collections;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link UpdateHelpMessagesCommand}. * Test for {@link UpdateHelpMessagesCommand}.
@ -65,6 +65,6 @@ public class UpdateHelpMessagesCommandTest {
// then // then
verify(sender).sendMessage("Could not update help file: Couldn't do the thing"); verify(sender).sendMessage("Could not update help file: Couldn't do the thing");
verifyZeroInteractions(helpMessagesService); verifyNoInteractions(helpMessagesService);
} }
} }

View File

@ -19,7 +19,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AddEmailCommand}. * Test for {@link AddEmailCommand}.
@ -45,7 +45,7 @@ public class AddEmailCommandTest {
command.executeCommand(sender, Collections.emptyList()); command.executeCommand(sender, Collections.emptyList());
// then // then
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -71,7 +71,7 @@ public class AddEmailCommandTest {
command.executeCommand(sender, Arrays.asList(email, "wrongConf")); command.executeCommand(sender, Arrays.asList(email, "wrongConf"));
// then // then
verifyZeroInteractions(management); verifyNoInteractions(management);
verify(commandService).send(sender, MessageKey.CONFIRM_EMAIL_MESSAGE); verify(commandService).send(sender, MessageKey.CONFIRM_EMAIL_MESSAGE);
} }

View File

@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
/** /**
@ -52,7 +52,7 @@ public class ChangeEmailCommandTest {
command.executeCommand(sender, Collections.emptyList()); command.executeCommand(sender, Collections.emptyList());
// then // then
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -68,7 +68,7 @@ public class ChangeEmailCommandTest {
// then // then
verify(codeManager).codeExistOrGenerateNew(name); verify(codeManager).codeExistOrGenerateNew(name);
verify(commonService).send(player, MessageKey.VERIFICATION_CODE_REQUIRED); verify(commonService).send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test

View File

@ -21,7 +21,7 @@ import java.util.Collections;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Tests for {@link EmailSetPasswordCommand}. * Tests for {@link EmailSetPasswordCommand}.
@ -102,7 +102,7 @@ public class EmailSetPasswordCommandTest {
command.runCommand(player, Collections.singletonList("abc123")); command.runCommand(player, Collections.singletonList("abc123"));
// then // then
verifyZeroInteractions(validationService, dataSource); verifyNoInteractions(validationService, dataSource);
verify(commonService).send(player, MessageKey.CHANGE_PASSWORD_EXPIRED); verify(commonService).send(player, MessageKey.CHANGE_PASSWORD_EXPIRED);
} }
} }

View File

@ -30,8 +30,8 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link RecoverEmailCommand}. * Test for {@link RecoverEmailCommand}.
@ -89,7 +89,7 @@ public class RecoverEmailCommandTest {
// then // then
verify(commonService).send(sender, MessageKey.INCOMPLETE_EMAIL_SETTINGS); verify(commonService).send(sender, MessageKey.INCOMPLETE_EMAIL_SETTINGS);
verifyZeroInteractions(dataSource, passwordSecurity); verifyNoInteractions(dataSource, passwordSecurity);
} }
@Test @Test
@ -106,7 +106,7 @@ public class RecoverEmailCommandTest {
// then // then
verify(emailService).hasAllInformation(); verify(emailService).hasAllInformation();
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verify(commonService).send(sender, MessageKey.ALREADY_LOGGED_IN_ERROR); verify(commonService).send(sender, MessageKey.ALREADY_LOGGED_IN_ERROR);
} }

View File

@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -43,7 +43,7 @@ public class LoginCommandTest {
command.executeCommand(sender, Collections.emptyList()); command.executeCommand(sender, Collections.emptyList());
// then // then
verifyZeroInteractions(management); verifyNoInteractions(management);
verify(sender).sendMessage(argThat(containsString("/authme forcelogin <player>"))); verify(sender).sendMessage(argThat(containsString("/authme forcelogin <player>")));
} }

View File

@ -16,7 +16,7 @@ import java.util.Collections;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -41,7 +41,7 @@ public class LogoutCommandTest {
command.executeCommand(sender, new ArrayList<String>()); command.executeCommand(sender, new ArrayList<String>());
// then // then
verifyZeroInteractions(management); verifyNoInteractions(management);
verify(sender).sendMessage(argThat(containsString("only for players"))); verify(sender).sendMessage(argThat(containsString("only for players")));
} }

View File

@ -37,7 +37,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -86,7 +86,7 @@ public class RegisterCommandTest {
// then // then
verify(sender).sendMessage(argThat(containsString("Player only!"))); verify(sender).sendMessage(argThat(containsString("Player only!")));
verifyZeroInteractions(management, emailService); verifyNoInteractions(management, emailService);
} }
@Test @Test
@ -102,7 +102,7 @@ public class RegisterCommandTest {
verify(registrationCaptchaManager).isCaptchaRequired("test2"); verify(registrationCaptchaManager).isCaptchaRequired("test2");
verify(management).performRegister(eq(RegistrationMethod.TWO_FACTOR_REGISTRATION), verify(management).performRegister(eq(RegistrationMethod.TWO_FACTOR_REGISTRATION),
argThat(hasEqualValuesOnAllFields(TwoFactorRegisterParams.of(player)))); argThat(hasEqualValuesOnAllFields(TwoFactorRegisterParams.of(player))));
verifyZeroInteractions(emailService); verifyNoInteractions(emailService);
} }
@Test @Test
@ -115,7 +115,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.USAGE_REGISTER); verify(commonService).send(player, MessageKey.USAGE_REGISTER);
verifyZeroInteractions(management, emailService); verifyNoInteractions(management, emailService);
} }
@Test @Test
@ -130,7 +130,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.USAGE_REGISTER); verify(commonService).send(player, MessageKey.USAGE_REGISTER);
verifyZeroInteractions(management, emailService); verifyNoInteractions(management, emailService);
} }
@Test @Test
@ -147,7 +147,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.USAGE_REGISTER); verify(commonService).send(player, MessageKey.USAGE_REGISTER);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -163,7 +163,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.INCOMPLETE_EMAIL_SETTINGS); verify(commonService).send(player, MessageKey.INCOMPLETE_EMAIL_SETTINGS);
verify(emailService).hasAllInformation(); verify(emailService).hasAllInformation();
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -181,7 +181,7 @@ public class RegisterCommandTest {
// then // then
verify(validationService).validateEmail(playerMail); verify(validationService).validateEmail(playerMail);
verify(commonService).send(player, MessageKey.INVALID_EMAIL); verify(commonService).send(player, MessageKey.INVALID_EMAIL);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -200,7 +200,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.USAGE_REGISTER); verify(commonService).send(player, MessageKey.USAGE_REGISTER);
verify(emailService).hasAllInformation(); verify(emailService).hasAllInformation();
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -236,7 +236,7 @@ public class RegisterCommandTest {
// then // then
verify(commonService).send(player, MessageKey.PASSWORD_MATCH_ERROR); verify(commonService).send(player, MessageKey.PASSWORD_MATCH_ERROR);
verifyZeroInteractions(management, emailService); verifyNoInteractions(management, emailService);
} }
@Test @Test
@ -287,7 +287,7 @@ public class RegisterCommandTest {
verify(registrationCaptchaManager).isCaptchaRequired("Waaa"); verify(registrationCaptchaManager).isCaptchaRequired("Waaa");
verify(validationService).validateEmail(email); verify(validationService).validateEmail(email);
verify(commonService).send(player, MessageKey.INVALID_EMAIL); verify(commonService).send(player, MessageKey.INVALID_EMAIL);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -321,7 +321,7 @@ public class RegisterCommandTest {
// then // then
verify(registrationCaptchaManager).isCaptchaRequired(name); verify(registrationCaptchaManager).isCaptchaRequired(name);
verify(commonService).send(player, MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha); verify(commonService).send(player, MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha);
verifyZeroInteractions(management, validationService); verifyNoInteractions(management, validationService);
} }
private static Player mockPlayerWithName(String name) { private static Player mockPlayerWithName(String name) {

View File

@ -18,7 +18,7 @@ import java.util.Collections;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AddTotpCommand}. * Test for {@link AddTotpCommand}.
@ -47,7 +47,7 @@ public class AddTotpCommandTest {
// then // then
verify(messages).send(player, MessageKey.NOT_LOGGED_IN); verify(messages).send(player, MessageKey.NOT_LOGGED_IN);
verifyZeroInteractions(generateTotpService); verifyNoInteractions(generateTotpService);
} }
@Test @Test
@ -63,7 +63,7 @@ public class AddTotpCommandTest {
// then // then
verify(messages).send(player, MessageKey.TWO_FACTOR_ALREADY_ENABLED); verify(messages).send(player, MessageKey.TWO_FACTOR_ALREADY_ENABLED);
verifyZeroInteractions(generateTotpService); verifyNoInteractions(generateTotpService);
} }
@Test @Test

View File

@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link ConfirmTotpCommand}. * Test for {@link ConfirmTotpCommand}.
@ -98,7 +98,7 @@ public class ConfirmTotpCommandTest {
verify(generateTotpService, never()).removeGenerateTotpKey(any(Player.class)); verify(generateTotpService, never()).removeGenerateTotpKey(any(Player.class));
verify(playerCache, only()).getAuth(playerName); verify(playerCache, only()).getAuth(playerName);
verify(messages).send(player, MessageKey.TWO_FACTOR_ENABLE_ERROR_WRONG_CODE); verify(messages).send(player, MessageKey.TWO_FACTOR_ENABLE_ERROR_WRONG_CODE);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -118,7 +118,7 @@ public class ConfirmTotpCommandTest {
verify(generateTotpService, only()).getGeneratedTotpKey(player); verify(generateTotpService, only()).getGeneratedTotpKey(player);
verify(playerCache, only()).getAuth(playerName); verify(playerCache, only()).getAuth(playerName);
verify(messages).send(player, MessageKey.TWO_FACTOR_ENABLE_ERROR_NO_CODE); verify(messages).send(player, MessageKey.TWO_FACTOR_ENABLE_ERROR_NO_CODE);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -135,7 +135,7 @@ public class ConfirmTotpCommandTest {
// then // then
verify(playerCache, only()).getAuth(playerName); verify(playerCache, only()).getAuth(playerName);
verifyZeroInteractions(generateTotpService, dataSource); verifyNoInteractions(generateTotpService, dataSource);
verify(messages).send(player, MessageKey.TWO_FACTOR_ALREADY_ENABLED); verify(messages).send(player, MessageKey.TWO_FACTOR_ALREADY_ENABLED);
} }
@ -152,7 +152,7 @@ public class ConfirmTotpCommandTest {
// then // then
verify(playerCache, only()).getAuth(playerName); verify(playerCache, only()).getAuth(playerName);
verifyZeroInteractions(generateTotpService, dataSource); verifyNoInteractions(generateTotpService, dataSource);
verify(messages).send(player, MessageKey.NOT_LOGGED_IN); verify(messages).send(player, MessageKey.NOT_LOGGED_IN);
} }
} }

View File

@ -22,7 +22,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link RemoveTotpCommand}. * Test for {@link RemoveTotpCommand}.
@ -105,7 +105,7 @@ public class RemoveTotpCommandTest {
command.runCommand(player, singletonList(inputCode)); command.runCommand(player, singletonList(inputCode));
// then // then
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verify(messages, only()).send(player, MessageKey.TWO_FACTOR_INVALID_CODE); verify(messages, only()).send(player, MessageKey.TWO_FACTOR_INVALID_CODE);
verify(playerCache, only()).getAuth(name); verify(playerCache, only()).getAuth(name);
} }
@ -124,7 +124,7 @@ public class RemoveTotpCommandTest {
command.runCommand(player, singletonList(inputCode)); command.runCommand(player, singletonList(inputCode));
// then // then
verifyZeroInteractions(dataSource, totpAuthenticator); verifyNoInteractions(dataSource, totpAuthenticator);
verify(messages, only()).send(player, MessageKey.TWO_FACTOR_NOT_ENABLED_ERROR); verify(messages, only()).send(player, MessageKey.TWO_FACTOR_NOT_ENABLED_ERROR);
verify(playerCache, only()).getAuth(name); verify(playerCache, only()).getAuth(name);
} }
@ -142,7 +142,7 @@ public class RemoveTotpCommandTest {
command.runCommand(player, singletonList(inputCode)); command.runCommand(player, singletonList(inputCode));
// then // then
verifyZeroInteractions(dataSource, totpAuthenticator); verifyNoInteractions(dataSource, totpAuthenticator);
verify(messages, only()).send(player, MessageKey.NOT_LOGGED_IN); verify(messages, only()).send(player, MessageKey.NOT_LOGGED_IN);
verify(playerCache, only()).getAuth(name); verify(playerCache, only()).getAuth(name);
} }

View File

@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -60,7 +60,7 @@ public class UnregisterCommandTest {
// then // then
verify(playerCache).isAuthenticated(name); verify(playerCache).isAuthenticated(name);
verify(commonService).send(player, MessageKey.NOT_LOGGED_IN); verify(commonService).send(player, MessageKey.NOT_LOGGED_IN);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -79,7 +79,7 @@ public class UnregisterCommandTest {
verify(playerCache).isAuthenticated(name); verify(playerCache).isAuthenticated(name);
verify(codeManager).codeExistOrGenerateNew(name); verify(codeManager).codeExistOrGenerateNew(name);
verify(commonService).send(player, MessageKey.VERIFICATION_CODE_REQUIRED); verify(commonService).send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -110,7 +110,7 @@ public class UnregisterCommandTest {
command.executeCommand(sender, Collections.singletonList("password")); command.executeCommand(sender, Collections.singletonList("password"));
// then // then
verifyZeroInteractions(playerCache, management); verifyNoInteractions(playerCache, management);
verify(sender).sendMessage(argThat(containsString("/authme unregister <player>"))); verify(sender).sendMessage(argThat(containsString("/authme unregister <player>")));
} }

View File

@ -29,7 +29,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link TempbanManager}. * Test for {@link TempbanManager}.
@ -139,7 +139,7 @@ public class TempbanManagerTest {
manager.tempbanPlayer(player); manager.tempbanPlayer(player);
// then // then
verifyZeroInteractions(player, bukkitService); verifyNoInteractions(player, bukkitService);
} }
@Test @Test

View File

@ -20,7 +20,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link VerificationCodeManager}. * Test for {@link VerificationCodeManager}.
@ -82,7 +82,7 @@ public class VerificationCodeManagerTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verifyZeroInteractions(permissionsManager, dataSource); verifyNoInteractions(permissionsManager, dataSource);
} }
@Test @Test
@ -98,7 +98,7 @@ public class VerificationCodeManagerTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(permissionsManager).hasPermission(player, PlayerPermission.VERIFICATION_CODE); verify(permissionsManager).hasPermission(player, PlayerPermission.VERIFICATION_CODE);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test

View File

@ -6,7 +6,7 @@ import org.junit.Test;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AllowFlightRestoreType}. * Test for {@link AllowFlightRestoreType}.
@ -78,7 +78,7 @@ public class AllowFlightRestoreTypeTest {
AllowFlightRestoreType.NOTHING.restoreAllowFlight(player2, limboWithoutFly); AllowFlightRestoreType.NOTHING.restoreAllowFlight(player2, limboWithoutFly);
// then // then
verifyZeroInteractions(player1, player2); verifyNoInteractions(player1, player2);
} }
@Test @Test
@ -94,7 +94,7 @@ public class AllowFlightRestoreTypeTest {
// then // then
if (type == noInteractionType) { if (type == noInteractionType) {
verifyZeroInteractions(player); verifyNoInteractions(player);
} else { } else {
verify(player).setAllowFlight(false); verify(player).setAllowFlight(false);
} }

View File

@ -34,7 +34,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link LimboPlayerTaskManager}. * Test for {@link LimboPlayerTaskManager}.
@ -97,7 +97,7 @@ public class LimboPlayerTaskManagerTest {
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, LimboMessageType.LOG_IN); limboPlayerTaskManager.registerMessageTask(player, limboPlayer, LimboMessageType.LOG_IN);
// then // then
verifyZeroInteractions(limboPlayer, bukkitService); verifyNoInteractions(limboPlayer, bukkitService);
} }
@Test @Test
@ -173,7 +173,7 @@ public class LimboPlayerTaskManagerTest {
limboPlayerTaskManager.registerTimeoutTask(player, limboPlayer); limboPlayerTaskManager.registerTimeoutTask(player, limboPlayer);
// then // then
verifyZeroInteractions(limboPlayer, bukkitService); verifyNoInteractions(limboPlayer, bukkitService);
} }
@Test @Test

View File

@ -15,7 +15,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link LimboServiceHelper}. * Test for {@link LimboServiceHelper}.
@ -83,7 +83,7 @@ public class LimboServiceHelperTest {
LimboPlayer result3 = limboServiceHelper.merge(null, null); LimboPlayer result3 = limboServiceHelper.merge(null, null);
// then // then
verifyZeroInteractions(limbo); verifyNoInteractions(limbo);
assertThat(result1, equalTo(limbo)); assertThat(result1, equalTo(limbo));
assertThat(result2, equalTo(limbo)); assertThat(result2, equalTo(limbo));
assertThat(result3, nullValue()); assertThat(result3, nullValue());

View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link LimboService}, and {@link LimboServiceHelper}. * Test for {@link LimboService}, and {@link LimboServiceHelper}.
@ -222,7 +222,7 @@ public class LimboServiceTest {
limboService.replaceTasksAfterRegistration(player); limboService.replaceTasksAfterRegistration(player);
// then // then
verifyZeroInteractions(taskManager); verifyNoInteractions(taskManager);
verify(authGroupHandler).setGroup(player, null, AuthGroupType.REGISTERED_UNAUTHENTICATED); verify(authGroupHandler).setGroup(player, null, AuthGroupType.REGISTERED_UNAUTHENTICATED);
} }

View File

@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -51,7 +51,7 @@ public class AbstractDataSourceConverterTest {
// then // then
verify(sender).sendMessage(argThat(containsString("Please configure your connection to SQLITE"))); verify(sender).sendMessage(argThat(containsString("Please configure your connection to SQLITE")));
verify(destination, only()).getType(); verify(destination, only()).getType();
verifyZeroInteractions(source); verifyNoInteractions(source);
} }
@Test @Test
@ -72,7 +72,7 @@ public class AbstractDataSourceConverterTest {
// then // then
verify(sender).sendMessage("The data source to convert from could not be initialized"); verify(sender).sendMessage("The data source to convert from could not be initialized");
verify(destination, only()).getType(); verify(destination, only()).getType();
verifyZeroInteractions(source); verifyNoInteractions(source);
} }
@Test @Test

View File

@ -26,7 +26,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -81,7 +81,7 @@ public class CrazyLoginConverterTest {
crazyLoginConverter.execute(sender); crazyLoginConverter.execute(sender);
// then // then
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verify(sender).sendMessage(argThat(containsString("file not found"))); verify(sender).sendMessage(argThat(containsString("file not found")));
} }

View File

@ -14,7 +14,7 @@ import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link NoOpExtension}. * Test for {@link NoOpExtension}.
@ -49,6 +49,6 @@ public class NoOpExtensionTest {
extension.saveAuth(auth, connection); extension.saveAuth(auth, connection);
// then // then
verifyZeroInteractions(connection, auth); verifyNoInteractions(connection, auth);
} }
} }

View File

@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link EntityListener}. * Test for {@link EntityListener}.
@ -76,7 +76,7 @@ public class EntityListenerTest {
// then // then
verify(listenerService).shouldCancelEvent(event); verify(listenerService).shouldCancelEvent(event);
verifyZeroInteractions(event); verifyNoInteractions(event);
} }
@Test @Test
@ -140,7 +140,7 @@ public class EntityListenerTest {
// then // then
verify(listenerService).shouldCancelEvent(event); verify(listenerService).shouldCancelEvent(event);
verifyZeroInteractions(event); verifyNoInteractions(event);
} }
@Test @Test
@ -156,7 +156,7 @@ public class EntityListenerTest {
listener.onProjectileLaunch(event); listener.onProjectileLaunch(event);
// then // then
verifyZeroInteractions(listenerService); verifyNoInteractions(listenerService);
verify(event, never()).setCancelled(anyBoolean()); verify(event, never()).setCancelled(anyBoolean());
} }

View File

@ -10,7 +10,7 @@ import java.util.function.Consumer;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Tests simple listener methods that should cancel an event when the listener service says so. * Tests simple listener methods that should cancel an event when the listener service says so.
@ -54,7 +54,7 @@ public final class EventCancelVerifier {
event = mock(clazz); event = mock(clazz);
mockShouldCancel(false, listenerService, event); mockShouldCancel(false, listenerService, event);
listenerMethod.accept(event); listenerMethod.accept(event);
verifyZeroInteractions(event); verifyNoInteractions(event);
return this; return this;
} }

View File

@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link ListenerService}. * Test for {@link ListenerService}.
@ -91,7 +91,7 @@ public class ListenerServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(playerCache).isAuthenticated(playerName); verify(playerCache).isAuthenticated(playerName);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -110,7 +110,7 @@ public class ListenerServiceTest {
assertThat(result, equalTo(true)); assertThat(result, equalTo(true));
verify(playerCache).isAuthenticated(playerName); verify(playerCache).isAuthenticated(playerName);
// makes sure the setting is checked first = avoid unnecessary DB operation // makes sure the setting is checked first = avoid unnecessary DB operation
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -147,7 +147,7 @@ public class ListenerServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -182,7 +182,7 @@ public class ListenerServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(playerCache).isAuthenticated(playerName); verify(playerCache).isAuthenticated(playerName);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -210,7 +210,7 @@ public class ListenerServiceTest {
// then // then
assertThat(result, equalTo(true)); assertThat(result, equalTo(true));
verify(playerCache).isAuthenticated(playerName); verify(playerCache).isAuthenticated(playerName);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
private static Player mockPlayerWithName(String name) { private static Player mockPlayerWithName(String name) {

View File

@ -39,8 +39,8 @@ import static org.junit.Assert.fail;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link OnJoinVerifier}. * Test for {@link OnJoinVerifier}.
@ -89,7 +89,7 @@ public class OnJoinVerifierTest {
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(event).getResult(); verify(event).getResult();
verifyNoMoreInteractions(event); verifyNoMoreInteractions(event);
verifyZeroInteractions(bukkitService, dataSource, permissionsManager); verifyNoInteractions(bukkitService, dataSource, permissionsManager);
} }
@Test @Test
@ -109,7 +109,7 @@ public class OnJoinVerifierTest {
assertThat(result, equalTo(true)); assertThat(result, equalTo(true));
assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.KICK_FULL)); assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.KICK_FULL));
assertThat(event.getKickMessage(), equalTo(serverFullMessage)); assertThat(event.getKickMessage(), equalTo(serverFullMessage));
verifyZeroInteractions(bukkitService, dataSource); verifyNoInteractions(bukkitService, dataSource);
} }
@Test @Test
@ -133,7 +133,7 @@ public class OnJoinVerifierTest {
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.ALLOWED)); assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.ALLOWED));
// First player is VIP, so expect no interactions there and second player to have been kicked // First player is VIP, so expect no interactions there and second player to have been kicked
verifyZeroInteractions(onlinePlayers.get(0)); verifyNoInteractions(onlinePlayers.get(0));
verify(onlinePlayers.get(1)).kickPlayer("kick for vip"); verify(onlinePlayers.get(1)).kickPlayer("kick for vip");
} }
@ -157,7 +157,7 @@ public class OnJoinVerifierTest {
assertThat(result, equalTo(true)); assertThat(result, equalTo(true));
assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.KICK_FULL)); assertThat(event.getResult(), equalTo(PlayerLoginEvent.Result.KICK_FULL));
assertThat(event.getKickMessage(), equalTo("kick full server")); assertThat(event.getKickMessage(), equalTo("kick full server"));
verifyZeroInteractions(onlinePlayers.get(0)); verifyNoInteractions(onlinePlayers.get(0));
} }
@Test @Test
@ -254,7 +254,7 @@ public class OnJoinVerifierTest {
onJoinVerifier.checkNameCasing(name, auth); onJoinVerifier.checkNameCasing(name, auth);
// then // then
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -269,7 +269,7 @@ public class OnJoinVerifierTest {
// when / then // when / then
onJoinVerifier.checkNameCasing(name, auth); onJoinVerifier.checkNameCasing(name, auth);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -311,7 +311,7 @@ public class OnJoinVerifierTest {
onJoinVerifier.checkNameCasing(name, auth); onJoinVerifier.checkNameCasing(name, auth);
// then // then
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -324,7 +324,7 @@ public class OnJoinVerifierTest {
onJoinVerifier.checkNameCasing(name, auth); onJoinVerifier.checkNameCasing(name, auth);
// then // then
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -368,7 +368,7 @@ public class OnJoinVerifierTest {
onJoinVerifier.checkSingleSession(name); onJoinVerifier.checkSingleSession(name);
// then // then
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -397,7 +397,7 @@ public class OnJoinVerifierTest {
onJoinVerifier.checkAntibot(name, isAuthAvailable); onJoinVerifier.checkAntibot(name, isAuthAvailable);
// then // then
verifyZeroInteractions(permissionsManager, antiBotService); verifyNoInteractions(permissionsManager, antiBotService);
} }
@Test @Test
@ -412,7 +412,7 @@ public class OnJoinVerifierTest {
// then // then
verify(permissionsManager).hasPermissionOffline(name, PlayerStatePermission.BYPASS_ANTIBOT); verify(permissionsManager).hasPermissionOffline(name, PlayerStatePermission.BYPASS_ANTIBOT);
verifyZeroInteractions(antiBotService); verifyNoInteractions(antiBotService);
} }
@Test @Test
@ -446,12 +446,12 @@ public class OnJoinVerifierTest {
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false);
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true);
onJoinVerifier.checkPlayerCountry(name, ip, false); onJoinVerifier.checkPlayerCountry(name, ip, false);
verifyZeroInteractions(validationService); verifyNoInteractions(validationService);
// protection for registered players disabled // protection for registered players disabled
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(false); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(false);
onJoinVerifier.checkPlayerCountry(name, ip, true); onJoinVerifier.checkPlayerCountry(name, ip, true);
verifyZeroInteractions(validationService); verifyNoInteractions(validationService);
} }
@Test @Test

View File

@ -83,8 +83,8 @@ import static org.mockito.Mockito.only;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link PlayerListener}. * Test for {@link PlayerListener}.
@ -140,7 +140,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.isCancelled(), equalTo(true)); assertThat(event.isCancelled(), equalTo(true));
verifyZeroInteractions(player, management, antiBotService); verifyNoInteractions(player, management, antiBotService);
} }
@Test @Test
@ -176,7 +176,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.isCancelled(), equalTo(false)); assertThat(event.isCancelled(), equalTo(false));
verify(antiBotService).wasPlayerKicked(name); verify(antiBotService).wasPlayerKicked(name);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -205,7 +205,7 @@ public class PlayerListenerTest {
// then // then
verify(event, only()).getMessage(); verify(event, only()).getMessage();
verifyZeroInteractions(listenerService, messages); verifyNoInteractions(listenerService, messages);
} }
@Test @Test
@ -220,7 +220,7 @@ public class PlayerListenerTest {
// then // then
verify(event, only()).getMessage(); verify(event, only()).getMessage();
verifyZeroInteractions(listenerService, messages); verifyNoInteractions(listenerService, messages);
} }
@Test @Test
@ -241,7 +241,7 @@ public class PlayerListenerTest {
verify(event).getMessage(); verify(event).getMessage();
verifyNoMoreInteractions(event); verifyNoMoreInteractions(event);
verify(listenerService).shouldCancelEvent(player); verify(listenerService).shouldCancelEvent(player);
verifyZeroInteractions(messages); verifyNoInteractions(messages);
} }
@Test @Test
@ -290,7 +290,7 @@ public class PlayerListenerTest {
listener.onPlayerChat(event); listener.onPlayerChat(event);
// then // then
verifyZeroInteractions(event, listenerService, messages); verifyNoInteractions(event, listenerService, messages);
} }
@Test @Test
@ -324,7 +324,7 @@ public class PlayerListenerTest {
// then // then
verify(listenerService).shouldCancelEvent(event.getPlayer()); verify(listenerService).shouldCancelEvent(event.getPlayer());
verifyZeroInteractions(event, messages); verifyNoInteractions(event, messages);
} }
@Test @Test
@ -400,7 +400,7 @@ public class PlayerListenerTest {
listener.onPlayerMove(event); listener.onPlayerMove(event);
// then // then
verifyZeroInteractions(event); verifyNoInteractions(event);
} }
@Test @Test
@ -551,7 +551,7 @@ public class PlayerListenerTest {
listener.onPlayerRespawn(event); listener.onPlayerRespawn(event);
// then // then
verifyZeroInteractions(listenerService); verifyNoInteractions(listenerService);
verify(event, never()).setRespawnLocation(any()); verify(event, never()).setRespawnLocation(any());
} }
@ -568,7 +568,7 @@ public class PlayerListenerTest {
listener.onPlayerRespawn(event); listener.onPlayerRespawn(event);
// then // then
verifyZeroInteractions(spawnLoader); verifyNoInteractions(spawnLoader);
verify(event, never()).setRespawnLocation(any()); verify(event, never()).setRespawnLocation(any());
} }
@ -659,7 +659,7 @@ public class PlayerListenerTest {
// then // then
verify(validationService).isUnrestricted(name); verify(validationService).isUnrestricted(name);
verifyNoModifyingCalls(event); verifyNoModifyingCalls(event);
verifyZeroInteractions(onJoinVerifier); verifyNoInteractions(onJoinVerifier);
} }
@Test @Test
@ -717,7 +717,7 @@ public class PlayerListenerTest {
verify(validationService).isUnrestricted(name); verify(validationService).isUnrestricted(name);
verify(onJoinVerifier).checkSingleSession(name); verify(onJoinVerifier).checkSingleSession(name);
verify(onJoinVerifier).checkIsValidName(name); verify(onJoinVerifier).checkIsValidName(name);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verifyNoModifyingCalls(preLoginEvent); verifyNoModifyingCalls(preLoginEvent);
} }
@ -780,7 +780,7 @@ public class PlayerListenerTest {
// then // then
verify(validationService).isUnrestricted(name); verify(validationService).isUnrestricted(name);
verify(onJoinVerifier).refusePlayerForFullServer(loginEvent); verify(onJoinVerifier).refusePlayerForFullServer(loginEvent);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verifyNoModifyingCalls(loginEvent); verifyNoModifyingCalls(loginEvent);
} }
@ -805,7 +805,7 @@ public class PlayerListenerTest {
verify(validationService).isUnrestricted(name); verify(validationService).isUnrestricted(name);
verify(onJoinVerifier).checkIsValidName(name); verify(onJoinVerifier).checkIsValidName(name);
// Check that we don't talk with the data source before performing checks that don't require it // Check that we don't talk with the data source before performing checks that don't require it
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
verify(event).setKickMessage(message); verify(event).setKickMessage(message);
verify(event).setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER); verify(event).setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
} }
@ -844,7 +844,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.getQuitMessage(), nullValue()); assertThat(event.getQuitMessage(), nullValue());
verify(antiBotService).wasPlayerKicked(name); verify(antiBotService).wasPlayerKicked(name);
verifyZeroInteractions(management); verifyNoInteractions(management);
} }
@Test @Test
@ -942,7 +942,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.isCancelled(), equalTo(false)); assertThat(event.isCancelled(), equalTo(false));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -980,7 +980,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.getJoinMessage(), equalTo(joinMsg)); assertThat(event.getJoinMessage(), equalTo(joinMsg));
verifyZeroInteractions(joinMessageService); verifyNoInteractions(joinMessageService);
} }
@Test @Test
@ -996,7 +996,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.getJoinMessage(), nullValue()); assertThat(event.getJoinMessage(), nullValue());
verifyZeroInteractions(joinMessageService); verifyNoInteractions(joinMessageService);
} }
@Test @Test
@ -1017,7 +1017,7 @@ public class PlayerListenerTest {
// then // then
assertThat(event.getJoinMessage(), equalTo("Hello doooew (aka Displ)")); assertThat(event.getJoinMessage(), equalTo("Hello doooew (aka Displ)"));
verifyZeroInteractions(joinMessageService); verifyNoInteractions(joinMessageService);
} }
@Test @Test

View File

@ -1,9 +1,9 @@
package fr.xephi.authme.listener; package fr.xephi.authme.listener;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.listener.protocollib.ProtocolLibService; import fr.xephi.authme.listener.protocollib.ProtocolLibService;
import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.settings.SpawnLoader; import fr.xephi.authme.settings.SpawnLoader;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
@ -20,8 +20,8 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link ServerListener}. * Test for {@link ServerListener}.
@ -65,7 +65,7 @@ public class ServerListenerTest {
}); });
checkEnableHandling(MULTIVERSE, () -> verify(pluginHookService).tryHookToMultiverse()); checkEnableHandling(MULTIVERSE, () -> verify(pluginHookService).tryHookToMultiverse());
checkEnableHandling(PROTOCOL_LIB, () -> verify(protocolLibService).setup()); checkEnableHandling(PROTOCOL_LIB, () -> verify(protocolLibService).setup());
checkEnableHandling("UnknownPlugin", () -> verifyZeroInteractions(pluginHookService, spawnLoader)); checkEnableHandling("UnknownPlugin", () -> verifyNoInteractions(pluginHookService, spawnLoader));
} }
@Test @Test
@ -78,7 +78,7 @@ public class ServerListenerTest {
}); });
checkDisableHandling(MULTIVERSE, () -> verify(pluginHookService).unhookMultiverse()); checkDisableHandling(MULTIVERSE, () -> verify(pluginHookService).unhookMultiverse());
checkDisableHandling(PROTOCOL_LIB, () -> verify(protocolLibService).disable()); checkDisableHandling(PROTOCOL_LIB, () -> verify(protocolLibService).disable());
checkDisableHandling("UnknownPlugin", () -> verifyZeroInteractions(pluginHookService, spawnLoader)); checkDisableHandling("UnknownPlugin", () -> verifyNoInteractions(pluginHookService, spawnLoader));
} }
private void checkEnableHandling(String pluginName, Runnable verifier) { private void checkEnableHandling(String pluginName, Runnable verifier) {

View File

@ -36,7 +36,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.internal.verification.VerificationModeFactory.only; import static org.mockito.internal.verification.VerificationModeFactory.only;
/** /**
@ -78,7 +78,7 @@ public class AsynchronousLoginTest {
// then // then
verify(playerCache, only()).isAuthenticated(name); verify(playerCache, only()).isAuthenticated(name);
verify(commonService).send(player, MessageKey.ALREADY_LOGGED_IN_ERROR); verify(commonService).send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test
@ -198,7 +198,7 @@ public class AsynchronousLoginTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -214,7 +214,7 @@ public class AsynchronousLoginTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(commonService).hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS); verify(commonService).hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS);
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test

View File

@ -28,7 +28,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AsyncRegister}. * Test for {@link AsyncRegister}.
@ -64,7 +64,7 @@ public class AsyncRegisterTest {
// then // then
verify(commonService).send(player, MessageKey.ALREADY_LOGGED_IN_ERROR); verify(commonService).send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
verifyZeroInteractions(dataSource, executor); verifyNoInteractions(dataSource, executor);
} }
@Test @Test
@ -82,7 +82,7 @@ public class AsyncRegisterTest {
// then // then
verify(commonService).send(player, MessageKey.REGISTRATION_DISABLED); verify(commonService).send(player, MessageKey.REGISTRATION_DISABLED);
verifyZeroInteractions(dataSource, executor); verifyNoInteractions(dataSource, executor);
} }
@Test @Test
@ -102,7 +102,7 @@ public class AsyncRegisterTest {
// then // then
verify(commonService).send(player, MessageKey.NAME_ALREADY_REGISTERED); verify(commonService).send(player, MessageKey.NAME_ALREADY_REGISTERED);
verify(dataSource, only()).isAuthAvailable(name); verify(dataSource, only()).isAuthAvailable(name);
verifyZeroInteractions(executor); verifyNoInteractions(executor);
} }
@Test @Test

View File

@ -28,7 +28,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link EmailRegisterExecutor}. * Test for {@link EmailRegisterExecutor}.
@ -158,7 +158,7 @@ public class EmailRegisterExecutorTest {
// then // then
verify(emailService).sendPasswordMail("Laleh", "test@example.com", password); verify(emailService).sendPasswordMail("Laleh", "test@example.com", password);
verify(commonService).send(player, MessageKey.EMAIL_SEND_FAILURE); verify(commonService).send(player, MessageKey.EMAIL_SEND_FAILURE);
verifyZeroInteractions(syncProcessManager); verifyNoInteractions(syncProcessManager);
} }
private static void assertIsCloseTo(long value1, long value2, long tolerance) { private static void assertIsCloseTo(long value1, long value2, long tolerance) {

View File

@ -31,7 +31,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link PasswordRegisterExecutor}. * Test for {@link PasswordRegisterExecutor}.
@ -138,7 +138,7 @@ public class PasswordRegisterExecutorTest {
executor.executePostPersistAction(params); executor.executePostPersistAction(params);
// then // then
verifyZeroInteractions(bukkitService, asynchronousLogin); verifyNoInteractions(bukkitService, asynchronousLogin);
verify(syncProcessManager).processSyncPasswordRegister(player); verify(syncProcessManager).processSyncPasswordRegister(player);
} }

View File

@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AsynchronousUnregister}. * Test for {@link AsynchronousUnregister}.
@ -94,7 +94,7 @@ public class AsynchronousUnregisterTest {
// then // then
verify(service).send(player, MessageKey.WRONG_PASSWORD); verify(service).send(player, MessageKey.WRONG_PASSWORD);
verify(passwordSecurity).comparePassword(userPassword, password, name); verify(passwordSecurity).comparePassword(userPassword, password, name);
verifyZeroInteractions(dataSource, limboService, teleportationService, bukkitService, bungeeSender); verifyNoInteractions(dataSource, limboService, teleportationService, bukkitService, bungeeSender);
verify(player, only()).getName(); verify(player, only()).getName();
} }
@ -189,7 +189,7 @@ public class AsynchronousUnregisterTest {
verify(passwordSecurity).comparePassword(userPassword, password, name); verify(passwordSecurity).comparePassword(userPassword, password, name);
verify(dataSource).removeAuth(name); verify(dataSource).removeAuth(name);
verify(playerCache).removePlayer(name); verify(playerCache).removePlayer(name);
verifyZeroInteractions(teleportationService, limboService); verifyNoInteractions(teleportationService, limboService);
verifyCalledUnregisterEventFor(player); verifyCalledUnregisterEventFor(player);
verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name); verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name);
verify(commandManager).runCommandsOnUnregister(player); verify(commandManager).runCommandsOnUnregister(player);
@ -216,7 +216,7 @@ public class AsynchronousUnregisterTest {
verify(passwordSecurity).comparePassword(userPassword, password, name); verify(passwordSecurity).comparePassword(userPassword, password, name);
verify(dataSource).removeAuth(name); verify(dataSource).removeAuth(name);
verify(service).send(player, MessageKey.ERROR); verify(service).send(player, MessageKey.ERROR);
verifyZeroInteractions(teleportationService, bukkitService, bungeeSender); verifyNoInteractions(teleportationService, bukkitService, bungeeSender);
} }
@Test @Test
@ -241,7 +241,7 @@ public class AsynchronousUnregisterTest {
verify(passwordSecurity).comparePassword(userPassword, password, name); verify(passwordSecurity).comparePassword(userPassword, password, name);
verify(dataSource).removeAuth(name); verify(dataSource).removeAuth(name);
verify(playerCache).removePlayer(name); verify(playerCache).removePlayer(name);
verifyZeroInteractions(teleportationService); verifyNoInteractions(teleportationService);
verifyCalledUnregisterEventFor(player); verifyCalledUnregisterEventFor(player);
verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name); verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name);
} }
@ -285,7 +285,7 @@ public class AsynchronousUnregisterTest {
// then // then
verify(dataSource).removeAuth(name); verify(dataSource).removeAuth(name);
verify(playerCache).removePlayer(name); verify(playerCache).removePlayer(name);
verifyZeroInteractions(teleportationService); verifyNoInteractions(teleportationService);
verifyCalledUnregisterEventFor(null); verifyCalledUnregisterEventFor(null);
verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name); verify(bungeeSender).sendAuthMeBungeecordMessage(MessageType.UNREGISTER, name);
} }
@ -303,7 +303,7 @@ public class AsynchronousUnregisterTest {
// then // then
verify(dataSource).removeAuth(name); verify(dataSource).removeAuth(name);
verify(service).send(initiator, MessageKey.ERROR); verify(service).send(initiator, MessageKey.ERROR);
verifyZeroInteractions(playerCache, teleportationService, bukkitService, bungeeSender); verifyNoInteractions(playerCache, teleportationService, bukkitService, bungeeSender);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

View File

@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link TotpAuthenticator}. * Test for {@link TotpAuthenticator}.
@ -92,7 +92,7 @@ public class TotpAuthenticatorTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verifyZeroInteractions(googleAuthenticator); verifyNoInteractions(googleAuthenticator);
} }
@Test @Test

View File

@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link AntiBotService}. * Test for {@link AntiBotService}.
@ -76,7 +76,7 @@ public class AntiBotServiceTest {
// then // then
assertThat(antiBotService.getAntiBotStatus(), equalTo(AntiBotService.AntiBotStatus.DISABLED)); assertThat(antiBotService.getAntiBotStatus(), equalTo(AntiBotService.AntiBotStatus.DISABLED));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test

View File

@ -29,7 +29,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link BukkitService}. * Test for {@link BukkitService}.
@ -127,7 +127,7 @@ public class BukkitServiceTest {
// then // then
verify(spy).scheduleSyncDelayedTask(task); verify(spy).scheduleSyncDelayedTask(task);
verifyZeroInteractions(task); verifyNoInteractions(task);
} }
@Test @Test
@ -188,7 +188,7 @@ public class BukkitServiceTest {
spy.runTaskOptionallyAsync(task); spy.runTaskOptionallyAsync(task);
// then // then
verifyZeroInteractions(task); verifyNoInteractions(task);
verify(spy).runTaskAsynchronously(task); verify(spy).runTaskAsynchronously(task);
} }

View File

@ -25,8 +25,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link SessionService}. * Test for {@link SessionService}.
@ -66,7 +66,7 @@ public class SessionServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verifyZeroInteractions(dataSource); verifyNoInteractions(dataSource);
} }
@Test @Test

View File

@ -32,7 +32,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link TeleportationService}. * Test for {@link TeleportationService}.
@ -77,8 +77,8 @@ public class TeleportationServiceTest {
teleportationService.teleportOnJoin(player); teleportationService.teleportOnJoin(player);
// then // then
verifyZeroInteractions(player); verifyNoInteractions(player);
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -134,7 +134,7 @@ public class TeleportationServiceTest {
verify(player, never()).teleport(any(Location.class)); verify(player, never()).teleport(any(Location.class));
verify(spawnLoader).getFirstSpawn(); verify(spawnLoader).getFirstSpawn();
verify(spawnLoader, never()).getSpawnLocation(any(Player.class)); verify(spawnLoader, never()).getSpawnLocation(any(Player.class));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -148,7 +148,7 @@ public class TeleportationServiceTest {
// then // then
verify(player, never()).teleport(any(Location.class)); verify(player, never()).teleport(any(Location.class));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -162,7 +162,7 @@ public class TeleportationServiceTest {
// then // then
verify(player, never()).teleport(any(Location.class)); verify(player, never()).teleport(any(Location.class));
verifyZeroInteractions(bukkitService); verifyNoInteractions(bukkitService);
} }
@Test @Test
@ -226,7 +226,7 @@ public class TeleportationServiceTest {
teleportationService.teleportOnLogin(player, auth, limbo); teleportationService.teleportOnLogin(player, auth, limbo);
// then // then
verifyZeroInteractions(player, auth, limbo, bukkitService, spawnLoader); verifyNoInteractions(player, auth, limbo, bukkitService, spawnLoader);
} }
@Test @Test
@ -270,7 +270,7 @@ public class TeleportationServiceTest {
// then // then
verify(player, never()).teleport(spawn); verify(player, never()).teleport(spawn);
verifyZeroInteractions(bukkitService, spawnLoader); verifyNoInteractions(bukkitService, spawnLoader);
} }
@Test @Test
@ -387,7 +387,7 @@ public class TeleportationServiceTest {
teleportationService.teleportOnLogin(player, auth, limbo); teleportationService.teleportOnLogin(player, auth, limbo);
// then // then
verifyZeroInteractions(player); verifyNoInteractions(player);
verify(limbo, times(2)).getLocation(); verify(limbo, times(2)).getLocation();
} }

View File

@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link ValidationService}. * Test for {@link ValidationService}.
@ -277,7 +277,7 @@ public class ValidationServiceTest {
// then // then
assertThat(result, equalTo(true)); assertThat(result, equalTo(true));
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test

View File

@ -21,7 +21,7 @@ import java.util.logging.Logger;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.internal.verification.VerificationModeFactory.times; import static org.mockito.internal.verification.VerificationModeFactory.times;
/** /**
@ -76,6 +76,6 @@ public class SettingsWarnerTest {
settingsWarner.logWarningsForMisconfigurations(); settingsWarner.logWarningsForMisconfigurations();
// then // then
verifyZeroInteractions(logger); verifyNoInteractions(logger);
} }
} }

View File

@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link WelcomeMessageConfiguration}. * Test for {@link WelcomeMessageConfiguration}.
@ -81,7 +81,7 @@ public class WelcomeMessageConfigurationTest {
// then // then
assertThat(result, hasSize(2)); assertThat(result, hasSize(2));
assertThat(result, contains(welcomeMessage.split("\\n"))); assertThat(result, contains(welcomeMessage.split("\\n")));
verifyZeroInteractions(player, playerCache, geoIpService, bukkitService, server); verifyNoInteractions(player, playerCache, geoIpService, bukkitService, server);
} }
@Test @Test
@ -104,7 +104,7 @@ public class WelcomeMessageConfigurationTest {
assertThat(result.get(0), equalTo("Hello Bobby, your IP is 123.45.66.77")); assertThat(result.get(0), equalTo("Hello Bobby, your IP is 123.45.66.77"));
assertThat(result.get(1), equalTo("Your country is Syldavia.")); assertThat(result.get(1), equalTo("Your country is Syldavia."));
assertThat(result.get(2), equalTo("Welcome to CrazyServer!")); assertThat(result.get(2), equalTo("Welcome to CrazyServer!"));
verifyZeroInteractions(server, playerCache); verifyNoInteractions(server, playerCache);
} }
@Test @Test

View File

@ -28,8 +28,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.only; import static org.mockito.Mockito.only;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test for {@link CommandManager}. * Test for {@link CommandManager}.
@ -80,7 +80,7 @@ public class CommandManagerTest {
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(60L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(60L));
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L));
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -101,7 +101,7 @@ public class CommandManagerTest {
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L));
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L));
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -124,7 +124,7 @@ public class CommandManagerTest {
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L));
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(240L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(240L));
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -145,7 +145,7 @@ public class CommandManagerTest {
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(120L));
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(180L));
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -163,7 +163,7 @@ public class CommandManagerTest {
verify(bukkitService).dispatchCommand(any(Player.class), eq("list")); verify(bukkitService).dispatchCommand(any(Player.class), eq("list"));
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(100L)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(100L));
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -178,7 +178,7 @@ public class CommandManagerTest {
// then // then
verify(bukkitService).dispatchConsoleCommand("msg Bobby Session login!"); verify(bukkitService).dispatchConsoleCommand("msg Bobby Session login!");
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -193,7 +193,7 @@ public class CommandManagerTest {
// then // then
verify(bukkitService).dispatchConsoleCommand("pay Bobby 30"); verify(bukkitService).dispatchConsoleCommand("pay Bobby 30");
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -206,7 +206,7 @@ public class CommandManagerTest {
manager.runCommandsOnFirstLogin(player, Arrays.asList("u", "wot", "m8")); manager.runCommandsOnFirstLogin(player, Arrays.asList("u", "wot", "m8"));
// then // then
verifyZeroInteractions(bukkitService, geoIpService); verifyNoInteractions(bukkitService, geoIpService);
} }
@Test @Test
@ -220,7 +220,7 @@ public class CommandManagerTest {
// then // then
verify(bukkitService, only()).dispatchConsoleCommand("broadcast bob has joined"); verify(bukkitService, only()).dispatchConsoleCommand("broadcast bob has joined");
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -234,7 +234,7 @@ public class CommandManagerTest {
// then // then
verify(bukkitService, only()).dispatchConsoleCommand("broadcast Bobby has joined"); verify(bukkitService, only()).dispatchConsoleCommand("broadcast Bobby has joined");
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -265,7 +265,7 @@ public class CommandManagerTest {
// then // then
verify(bukkitService).dispatchConsoleCommand("broadcast Bobby (127.0.0.3) logged out"); verify(bukkitService).dispatchConsoleCommand("broadcast Bobby (127.0.0.3) logged out");
verifyNoMoreInteractions(bukkitService); verifyNoMoreInteractions(bukkitService);
verifyZeroInteractions(geoIpService); verifyNoInteractions(geoIpService);
} }
@Test @Test
@ -278,7 +278,7 @@ public class CommandManagerTest {
manager.runCommandsOnRegister(player); manager.runCommandsOnRegister(player);
// then // then
verifyZeroInteractions(bukkitService, geoIpService); verifyNoInteractions(bukkitService, geoIpService);
} }
@Test @Test

View File

@ -39,7 +39,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/** /**
@ -77,7 +77,7 @@ public class PurgeServiceTest {
purgeService.runAutoPurge(); purgeService.runAutoPurge();
// then // then
verifyZeroInteractions(bukkitService, dataSource); verifyNoInteractions(bukkitService, dataSource);
} }
@Test @Test
@ -90,7 +90,7 @@ public class PurgeServiceTest {
purgeService.runAutoPurge(); purgeService.runAutoPurge();
// then // then
verifyZeroInteractions(bukkitService, dataSource); verifyNoInteractions(bukkitService, dataSource);
} }
@Test @Test
@ -127,7 +127,7 @@ public class PurgeServiceTest {
verify(dataSource).getRecordsToPurge(delay); verify(dataSource).getRecordsToPurge(delay);
verify(dataSource, never()).purgeRecords(anyCollection()); verify(dataSource, never()).purgeRecords(anyCollection());
verify(sender).sendMessage("No players to purge"); verify(sender).sendMessage("No players to purge");
verifyZeroInteractions(bukkitService, permissionsManager); verifyNoInteractions(bukkitService, permissionsManager);
} }
@Test @Test
@ -160,7 +160,7 @@ public class PurgeServiceTest {
// then // then
verify(sender).sendMessage(argThat(containsString("Purge is already in progress"))); verify(sender).sendMessage(argThat(containsString("Purge is already in progress")));
verifyZeroInteractions(bukkitService, dataSource, permissionsManager); verifyNoInteractions(bukkitService, dataSource, permissionsManager);
} }
@Test @Test

View File

@ -16,11 +16,10 @@ import java.util.logging.Logger;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test for {@link Utils}. * Test for {@link Utils}.
@ -102,7 +101,7 @@ public class UtilsTest {
// then // then
verify(logger).info(message); verify(logger).info(message);
verifyZeroInteractions(sender); verifyNoInteractions(sender);
} }
@Test @Test
@ -144,7 +143,7 @@ public class UtilsTest {
// then // then
verify(logger).warning(message); verify(logger).warning(message);
verifyZeroInteractions(sender); verifyNoInteractions(sender);
} }
@Test @Test