From 7d4dfe3ee33ea327914aca38bf7610eec92cb6a0 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 3 Mar 2020 08:22:00 +0100 Subject: [PATCH] Fix failing tests after Mockito upgrade --- .../java/fr/xephi/authme/AuthMeInitializationTest.java | 3 +-- .../fr/xephi/authme/listener/OnJoinVerifierTest.java | 10 +++++----- .../fr/xephi/authme/listener/PlayerListenerTest.java | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java index 4a8bf4b2..5fa11f6d 100644 --- a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java +++ b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java @@ -90,8 +90,7 @@ public class AuthMeInitializationTest { @Test public void shouldInitializeAllServices() { // given - PropertyReader reader = mock(PropertyReader.class, RETURNS_DEEP_STUBS); - given(reader.getList(anyString())).willReturn(Collections.emptyList()); + PropertyReader reader = mock(PropertyReader.class); PropertyResource resource = mock(PropertyResource.class); given(resource.createReader()).willReturn(reader); Settings settings = new Settings(dataFolder, resource, null, buildConfigurationData()); diff --git a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java index 295bcacb..3667e1be 100644 --- a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java +++ b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java @@ -439,18 +439,18 @@ public class OnJoinVerifierTest { */ @Test public void shouldNotCheckCountry() throws FailedVerificationException { + // given String name = "david"; String ip = "127.0.0.1"; - // protection setting disabled given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true); - onJoinVerifier.checkPlayerCountry(name, ip, false); - verifyNoInteractions(validationService); - // protection for registered players disabled - given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(false); + // when + onJoinVerifier.checkPlayerCountry(name, ip, false); onJoinVerifier.checkPlayerCountry(name, ip, true); + + // then verifyNoInteractions(validationService); } diff --git a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java index e72d48be..c8310b7d 100644 --- a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java +++ b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java @@ -932,7 +932,6 @@ public class PlayerListenerTest { // given HumanEntity player = mock(Player.class); InventoryView transaction = mock(InventoryView.class); - given(transaction.getPlayer()).willReturn(player); InventoryOpenEvent event = new InventoryOpenEvent(transaction); given(event.getPlayer()).willReturn(player); given(listenerService.shouldCancelEvent(player)).willReturn(false); @@ -951,7 +950,6 @@ public class PlayerListenerTest { HumanEntity player = mock(Player.class); InventoryView transaction = mock(InventoryView.class); given(settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES)).willReturn(Collections.emptySet()); - given(transaction.getPlayer()).willReturn(player); InventoryOpenEvent event = new InventoryOpenEvent(transaction); given(event.getPlayer()).willReturn(player); given(listenerService.shouldCancelEvent(player)).willReturn(true);