Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-26 19:17:40 +01:00
Code Issues Projects Releases Wiki Activity

Fixed tests for Invincible visitors.

Browse Source
This commit is contained in:
tastybento 2018-10-05 17:34:21 -07:00
parent 5039980693
commit b83e5d4a56
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListener.java
View File

@ -115,7 +115,7 @@ public class InvincibleVisitorsListener extends AbstractFlagListener implements
// Will be set back after the teleport
p.setGameMode(GameMode.SPECTATOR);
getIslands().getIslandAt(p.getLocation()).ifPresent(i -> new SafeSpotTeleport.Builder(getPlugin()).entity(p).island(i).build());
} else if (getIslands().hasIsland(p.getWorld(), User.getInstance(p))) {
} else if (getIslands().hasIsland(p.getWorld(), p.getUniqueId())) {
// No island in this location - if the player has an island try to teleport them back
getIslands().homeTeleport(p.getWorld(), p);
} else {

34
src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java
View File

@ -54,6 +54,7 @@ public class InvincibleVisitorsListenerTest {
private IslandsManager im;
private List<String> ivSettings;
private Player player;
private Optional<Island> optionalIsland;
/**
* @throws java.lang.Exception
@ -104,6 +105,7 @@ public class InvincibleVisitorsListenerTest {
Island island = mock(Island.class);
when(island.getOwner()).thenReturn(uuid);
when(im.getIsland(Mockito.any(World.class), Mockito.any(User.class))).thenReturn(island);
optionalIsland = Optional.of(island);
// Visitor
when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
when(plugin.getIslands()).thenReturn(im);
@ -220,15 +222,39 @@ public class InvincibleVisitorsListenerTest {
Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
}
@Test
public void testOnVisitorGetDamageVoid() {
// For testing, have no island to teleport to
when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
public void testOnVisitorGetDamageVoidIslandHere() {
when(im.getIslandAt(Mockito.any())).thenReturn(optionalIsland);
EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
// Player should be teleported to this island
listener.onVisitorGetDamage(e);
assertTrue(e.isCancelled());
Mockito.verify(player).setGameMode(Mockito.eq(GameMode.SPECTATOR));
Mockito.verify(im).getIslandAt(Mockito.any());
}
@Test
public void testOnVisitorGetDamageVoidNoIslandHerePlayerHasNoIsland() {
when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
// Player should die
listener.onVisitorGetDamage(e);
assertFalse(e.isCancelled());
Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
}
@Test
public void testOnVisitorGetDamageVoidPlayerHasIsland() {
when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
// Player should be teleported to their island
listener.onVisitorGetDamage(e);
assertTrue(e.isCancelled());
Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
Mockito.verify(im).homeTeleport(Mockito.any(), Mockito.eq(player));
}
}