From c0a0a7e2a3f93cfdcf01bc2858643394c496cf41 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 2 Sep 2017 12:47:26 +0200 Subject: [PATCH] Use TestHelper.mockPlayerIp in tests --- .../authme/listener/OnJoinVerifierTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java index 378c3de43..0cd8fa83b 100644 --- a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java +++ b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java @@ -439,7 +439,8 @@ public class OnJoinVerifierTest { */ @Test public void shouldNotCheckCountry() throws FailedVerificationException { - Player player = newPlayerWithAddress("127.0.0.1"); + Player player = newPlayerWithName("david"); + TestHelper.mockPlayerIp(player, "127.0.0.1"); // protection setting disabled given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false); @@ -457,7 +458,8 @@ public class OnJoinVerifierTest { public void shouldCheckAndAcceptUnregisteredPlayerCountry() throws FailedVerificationException { // given String ip = "192.168.0.1"; - Player player = newPlayerWithAddress(ip); + Player player = newPlayerWithName("lucas"); + TestHelper.mockPlayerIp(player, ip); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(true); given(validationService.isCountryAdmitted(ip)).willReturn(true); @@ -472,7 +474,8 @@ public class OnJoinVerifierTest { public void shouldCheckAndAcceptRegisteredPlayerCountry() throws FailedVerificationException { // given String ip = "192.168.10.24"; - Player player = newPlayerWithAddress(ip); + Player player = newPlayerWithName("gabriel"); + TestHelper.mockPlayerIp(player, ip); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(true); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true); given(validationService.isCountryAdmitted(ip)).willReturn(true); @@ -488,7 +491,8 @@ public class OnJoinVerifierTest { public void shouldThrowForBannedCountry() throws FailedVerificationException { // given String ip = "192.168.40.0"; - Player player = newPlayerWithAddress(ip); + Player player = newPlayerWithName("bob"); + TestHelper.mockPlayerIp(player, ip); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(true); given(validationService.isCountryAdmitted(ip)).willReturn(false); @@ -505,12 +509,6 @@ public class OnJoinVerifierTest { return player; } - private static Player newPlayerWithAddress(String ip) { - Player player = mock(Player.class); - given(player.getAddress()).willReturn(new InetSocketAddress(ip, 80)); - return player; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) private void returnOnlineListFromBukkitServer(Collection onlineList) { // Note ljacqu 20160529: The compiler gets lost in generics because Collection is returned