Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-09-18 09:51:25 +02:00
Code Issues Projects Releases Wiki Activity

Use TestHelper.mockPlayerIp in tests

Browse Source
This commit is contained in:
Gabriele C 2017-09-02 12:47:26 +02:00
parent 97f580d9ec
commit c0a0a7e2a3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,8 @@ public class OnJoinVerifierTest {
*/ */
@Test @Test
public void shouldNotCheckCountry() throws FailedVerificationException { 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 // protection setting disabled
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(false);
@ -457,7 +458,8 @@ public class OnJoinVerifierTest {
public void shouldCheckAndAcceptUnregisteredPlayerCountry() throws FailedVerificationException { public void shouldCheckAndAcceptUnregisteredPlayerCountry() throws FailedVerificationException {
// given // given
String ip = "192.168.0.1"; 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(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(true);
given(validationService.isCountryAdmitted(ip)).willReturn(true); given(validationService.isCountryAdmitted(ip)).willReturn(true);
@ -472,7 +474,8 @@ public class OnJoinVerifierTest {
public void shouldCheckAndAcceptRegisteredPlayerCountry() throws FailedVerificationException { public void shouldCheckAndAcceptRegisteredPlayerCountry() throws FailedVerificationException {
// given // given
String ip = "192.168.10.24"; 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)).willReturn(true);
given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true); given(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION_REGISTERED)).willReturn(true);
given(validationService.isCountryAdmitted(ip)).willReturn(true); given(validationService.isCountryAdmitted(ip)).willReturn(true);
@ -488,7 +491,8 @@ public class OnJoinVerifierTest {
public void shouldThrowForBannedCountry() throws FailedVerificationException { public void shouldThrowForBannedCountry() throws FailedVerificationException {
// given // given
String ip = "192.168.40.0"; 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(settings.getProperty(ProtectionSettings.ENABLE_PROTECTION)).willReturn(true);
given(validationService.isCountryAdmitted(ip)).willReturn(false); given(validationService.isCountryAdmitted(ip)).willReturn(false);
@ -505,12 +509,6 @@ public class OnJoinVerifierTest {
return player; 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" }) @SuppressWarnings({ "unchecked", "rawtypes" })
private void returnOnlineListFromBukkitServer(Collection<Player> onlineList) { private void returnOnlineListFromBukkitServer(Collection<Player> onlineList) {
// Note ljacqu 20160529: The compiler gets lost in generics because Collection<? extends Player> is returned // Note ljacqu 20160529: The compiler gets lost in generics because Collection<? extends Player> is returned