From cbd9add1b79dbcec4ccf3ede4c2d883051bf082e Mon Sep 17 00:00:00 2001 From: DNx5 Date: Tue, 18 Oct 2016 03:46:15 +0700 Subject: [PATCH] Removed a test for antibot service. --- .../xephi/authme/service/AntiBotService.java | 2 +- .../authme/listener/PlayerListenerTest.java | 1 - .../authme/service/AntiBotServiceTest.java | 26 +++---------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/main/java/fr/xephi/authme/service/AntiBotService.java b/src/main/java/fr/xephi/authme/service/AntiBotService.java index 9a0db2e8d..a329e5de3 100644 --- a/src/main/java/fr/xephi/authme/service/AntiBotService.java +++ b/src/main/java/fr/xephi/authme/service/AntiBotService.java @@ -161,7 +161,7 @@ public class AntiBotService implements SettingsDependent { if (lastFlaggedJoin == null) { lastFlaggedJoin = Instant.now(); } - if (ChronoUnit.SECONDS.between(Instant.now(), lastFlaggedJoin) <= 5) { + if (ChronoUnit.SECONDS.between(lastFlaggedJoin, Instant.now()) <= 5) { flagged++; } else { // reset to 1 because this player is also count as not registered diff --git a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java index 15bf4c6ee..992752f95 100644 --- a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java +++ b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java @@ -565,7 +565,6 @@ public class PlayerListenerTest { verify(onJoinVerifier).checkKickNonRegistered(true); verify(onJoinVerifier).checkNameCasing(player, auth); verify(onJoinVerifier).checkPlayerCountry(true, ip); - verify(antiBotService).handlePlayerJoin(); verify(teleportationService).teleportOnJoin(player); verifyNoModifyingCalls(event); } diff --git a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java index e40d5ca79..a39c7a6e2 100644 --- a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java @@ -3,7 +3,6 @@ package fr.xephi.authme.service; import ch.jalu.injector.testing.BeforeInjecting; import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; -import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.AdminPermission; @@ -152,22 +151,6 @@ public class AntiBotServiceTest { assertThat(kickWithAuth, equalTo(false)); } - @Test - public void shouldIncreaseCountAndDecreaseAfterDelay() { - // given - listening antibot - runSyncDelayedTaskWithDelay(bukkitService); - reset(bukkitService); - assertThat(getAntiBotCount(antiBotService), equalTo(0)); - - // when - antiBotService.handlePlayerJoin(); - - // then - assertThat(getAntiBotCount(antiBotService), equalTo(1)); - runSyncDelayedTaskWithDelay(bukkitService); - assertThat(getAntiBotCount(antiBotService), equalTo(0)); - } - @Test public void shouldActivateAntibotAfterThreshold() { // given @@ -178,19 +161,19 @@ public class AntiBotServiceTest { runSyncDelayedTaskWithDelay(bukkitService); for (int i = 0; i < sensitivity; ++i) { - antiBotService.handlePlayerJoin(); + antiBotService.shouldKick(false); } assertThat(antiBotService.getAntiBotStatus(), equalTo(AntiBotService.AntiBotStatus.LISTENING)); // when - antiBotService.handlePlayerJoin(); + antiBotService.shouldKick(false); // then assertThat(antiBotService.getAntiBotStatus(), equalTo(AntiBotService.AntiBotStatus.ACTIVE)); } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void shouldInformPlayersOnActivation() { // given - listening antibot runSyncDelayedTaskWithDelay(bukkitService); @@ -222,7 +205,4 @@ public class AntiBotServiceTest { assertThat(antiBotService.getAntiBotStatus(), equalTo(AntiBotService.AntiBotStatus.LISTENING)); } - private static int getAntiBotCount(AntiBotService antiBotService) { - return ReflectionTestUtils.getFieldValue(AntiBotService.class, antiBotService, "antibotPlayers"); - } }