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

Fix failing tests after Mockito upgrade

Browse Source
This commit is contained in:
ljacqu 2020-03-03 08:22:00 +01:00
parent f3cb8af809
commit 7d4dfe3ee3
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
View File

@ -90,8 +90,7 @@ public class AuthMeInitializationTest {
@Test @Test
public void shouldInitializeAllServices() { public void shouldInitializeAllServices() {
// given // given
PropertyReader reader = mock(PropertyReader.class, RETURNS_DEEP_STUBS); PropertyReader reader = mock(PropertyReader.class);
given(reader.getList(anyString())).willReturn(Collections.emptyList());
PropertyResource resource = mock(PropertyResource.class); PropertyResource resource = mock(PropertyResource.class);
given(resource.createReader()).willReturn(reader); given(resource.createReader()).willReturn(reader);
Settings settings = new Settings(dataFolder, resource, null, buildConfigurationData()); Settings settings = new Settings(dataFolder, resource, null, buildConfigurationData());

10
src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
View File

@ -439,18 +439,18 @@ public class OnJoinVerifierTest {
*/ */
@Test @Test
public void shouldNotCheckCountry() throws FailedVerificationException { public void shouldNotCheckCountry() throws FailedVerificationException {
// given
String name = "david"; String name = "david";
String ip = "127.0.0.1"; String ip = "127.0.0.1";
// protection setting disabled
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);
verifyNoInteractions(validationService);
// protection for registered players disabled // when
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(false); onJoinVerifier.checkPlayerCountry(name, ip, false);
onJoinVerifier.checkPlayerCountry(name, ip, true); onJoinVerifier.checkPlayerCountry(name, ip, true);
// then
verifyNoInteractions(validationService); verifyNoInteractions(validationService);
} }

2
src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
View File

@ -932,7 +932,6 @@ public class PlayerListenerTest {
// given // given
HumanEntity player = mock(Player.class); HumanEntity player = mock(Player.class);
InventoryView transaction = mock(InventoryView.class); InventoryView transaction = mock(InventoryView.class);
given(transaction.getPlayer()).willReturn(player);
InventoryOpenEvent event = new InventoryOpenEvent(transaction); InventoryOpenEvent event = new InventoryOpenEvent(transaction);
given(event.getPlayer()).willReturn(player); given(event.getPlayer()).willReturn(player);
given(listenerService.shouldCancelEvent(player)).willReturn(false); given(listenerService.shouldCancelEvent(player)).willReturn(false);
@ -951,7 +950,6 @@ public class PlayerListenerTest {
HumanEntity player = mock(Player.class); HumanEntity player = mock(Player.class);
InventoryView transaction = mock(InventoryView.class); InventoryView transaction = mock(InventoryView.class);
given(settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES)).willReturn(Collections.emptySet()); given(settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES)).willReturn(Collections.emptySet());
given(transaction.getPlayer()).willReturn(player);
InventoryOpenEvent event = new InventoryOpenEvent(transaction); InventoryOpenEvent event = new InventoryOpenEvent(transaction);
given(event.getPlayer()).willReturn(player); given(event.getPlayer()).willReturn(player);
given(listenerService.shouldCancelEvent(player)).willReturn(true); given(listenerService.shouldCancelEvent(player)).willReturn(true);