Minor code householding
This commit is contained in:
@@ -19,6 +19,7 @@ import org.mockito.Mock;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static fr.xephi.authme.service.BukkitServiceTestHelper.returnGivenOnlinePlayers;
|
||||
import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToScheduleSyncDelayedTaskWithDelay;
|
||||
import static org.hamcrest.Matchers.equalTo;
|
||||
import static org.junit.Assert.assertThat;
|
||||
@@ -154,11 +155,10 @@ public class AntiBotServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
public void shouldInformPlayersOnActivation() {
|
||||
// given - listening antibot
|
||||
List<Player> players = Arrays.asList(mock(Player.class), mock(Player.class));
|
||||
given(bukkitService.getOnlinePlayers()).willReturn((List) players);
|
||||
returnGivenOnlinePlayers(bukkitService, players);
|
||||
given(permissionsManager.hasPermission(players.get(0), AdminPermission.ANTIBOT_MESSAGES)).willReturn(false);
|
||||
given(permissionsManager.hasPermission(players.get(1), AdminPermission.ANTIBOT_MESSAGES)).willReturn(true);
|
||||
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
package fr.xephi.authme.service;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
|
||||
/**
|
||||
@@ -81,4 +86,17 @@ public final class BukkitServiceTestHelper {
|
||||
return null;
|
||||
}).when(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), anyLong());
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a BukkitService mock to return the given players when its method
|
||||
* {@link BukkitService#getOnlinePlayers()} is invoked.
|
||||
*
|
||||
* @param bukkitService the mock to set behavior on
|
||||
* @param players the players to return
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public static void returnGivenOnlinePlayers(BukkitService bukkitService, Collection<Player> players) {
|
||||
// The compiler gets lost in generics because Collection<? extends Player> is returned from getOnlinePlayers()
|
||||
given(bukkitService.getOnlinePlayers()).willReturn((Collection) players);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user