Skip to content

Commit

Permalink
Fix tests, add a test to CourseRunnerListener
Browse files Browse the repository at this point in the history
  • Loading branch information
@tastybento
tastybento committed Aug 11, 2023
1 parent e89df1d commit 936695d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/main/java/world/bentobox/parkour/listeners/CourseRunnerListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void onVisitorFall(EntityDamageEvent e) {
checkpointLocation = checkpointLocation.clone().add(0.5, 0, 0.5);
parkourRunManager.currentlyTeleporting().add(player.getUniqueId());
Util.teleportAsync(player, checkpointLocation, PlayerTeleportEvent.TeleportCause.PLUGIN)
.thenAccept(b -> parkourRunManager.currentlyTeleporting().remove(player.getUniqueId()));
.thenAccept(b -> parkourRunManager.currentlyTeleporting().remove(player.getUniqueId()));
}

@EventHandler
Expand Down Expand Up @@ -182,8 +182,8 @@ public void onTeleport(PlayerTeleportEvent e) {
Optional<Island> toIsland = addon.getIslands().getIslandAt(e.getTo());

boolean shouldAlterGamemode = switch (e.getCause()) {
case COMMAND, PLUGIN, UNKNOWN -> true;
default -> false;
case COMMAND, PLUGIN, UNKNOWN -> true;
default -> false;
};
if (shouldAlterGamemode && fromIsland.isPresent() && toIsland.isPresent() && fromIsland.get().equals(toIsland.get())) {
// same island teleport
Expand Down
40 changes: 32 additions & 8 deletions src/test/java/world/bentobox/parkour/listeners/CourseRunnerListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
Expand All @@ -53,6 +54,7 @@
import world.bentobox.bentobox.managers.LocalesManager;
import world.bentobox.bentobox.managers.PlaceholdersManager;
import world.bentobox.bentobox.managers.RanksManager;
import world.bentobox.bentobox.util.Util;
import world.bentobox.parkour.Parkour;
import world.bentobox.parkour.ParkourManager;
import world.bentobox.parkour.ParkourRunRecord;
Expand All @@ -66,7 +68,7 @@
* @author tastybento
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({Bukkit.class, BentoBox.class, User.class})
@PrepareForTest({Bukkit.class, BentoBox.class, User.class, Util.class})
public class CourseRunnerListenerTest {

@Mock
Expand Down Expand Up @@ -199,6 +201,7 @@ public void setUp() throws Exception {
// Block
when(block.getType()).thenReturn(Material.LIGHT_WEIGHTED_PRESSURE_PLATE);
when(block.getLocation()).thenReturn(location);

// DUT
crl = new CourseRunnerListener(addon);
}
Expand Down Expand Up @@ -311,14 +314,16 @@ public void testOnPlayerQuit() {
*/
@Test
public void testOnVisitorFall() {
PowerMockito.mockStatic(Util.class, RETURNS_MOCKS);
prm.timers().put(uuid, System.currentTimeMillis() - 20000); // ~ 20 seconds ago
prm.checkpoints().put(uuid, location);
EntityDamageEvent e = new EntityDamageEvent(player, DamageCause.VOID, 1D);
crl.onVisitorFall(e);
verify(player).playEffect(EntityEffect.ENTITY_POOF);
verify(player).setVelocity(new Vector(0, 0, 0));
verify(player).setFallDistance(0);
verify(player).teleport(location);
PowerMockito.verifyStatic(Util.class);
Util.teleportAsync(player, location, PlayerTeleportEvent.TeleportCause.PLUGIN);
}

/**
Expand Down Expand Up @@ -560,9 +565,10 @@ public void testOnTeleport() {
// Fire event
crl.onTeleport(e);
}
// Should fire 7 times: COMMAND, PLUGIN, NETHER_PORTAL, END_PORTAL, SPECTATE, END_GATEWAY, UNKNOWN
verify(notifier, times(7)).notify(any(), eq("parkour.session-ended"));
verify(player, times(7)).setGameMode(GameMode.CREATIVE);
// Should fire 5 times: COMMAND, PLUGIN, SPECTATE, END_GATEWAY, UNKNOWN
verify(notifier, times(5)).notify(any(), eq("parkour.session-ended"));
// Should happen just 3 times: COMMAND, PLUGIN, UNKNOWN
verify(player, times(3)).setGameMode(GameMode.CREATIVE);
verify(player, never()).setGameMode(GameMode.SURVIVAL);
}

Expand All @@ -587,7 +593,7 @@ public void testOnTeleportToNoFlagActionNotInParkourWorld() {
// Make the event
Location l = mock(Location.class);
when(l.getWorld()).thenReturn(mock(World.class));
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, l, TeleportCause.CHORUS_FRUIT);
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, l, TeleportCause.PLUGIN);
// Fire event
crl.onTeleport(e);
verify(player, never()).setGameMode(GameMode.CREATIVE);
Expand All @@ -604,7 +610,7 @@ public void testOnTeleportToNoFlagActionDifferentIsland() {
when(l.getWorld()).thenReturn(world);
Island i = mock(Island.class);
when(im.getIslandAt(l)).thenReturn(Optional.of(i));
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, l, TeleportCause.CHORUS_FRUIT);
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, l, TeleportCause.PLUGIN);
// Fire event
crl.onTeleport(e);
verify(player, never()).setGameMode(GameMode.CREATIVE);
Expand All @@ -618,14 +624,32 @@ public void testOnTeleportToNoFlagActionDifferentIsland() {
public void testOnTeleportToFlagActionVisitors() {
when(island.getFlag(any())).thenReturn(RanksManager.MEMBER_RANK);
when(island.getRank(any(User.class))).thenReturn(RanksManager.VISITOR_RANK);

// Make the event
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location, TeleportCause.CHORUS_FRUIT);
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location, TeleportCause.PLUGIN);
// Fire event
crl.onTeleport(e);
verify(player, never()).setGameMode(GameMode.CREATIVE);
// Visitors should be set to survival when they teleport to the island.
verify(player).setGameMode(GameMode.SURVIVAL);
}

/**
* Test method for {@link world.bentobox.parkour.listeners.CourseRunnerListener#onTeleport(org.bukkit.event.player.PlayerTeleportEvent)}.
*/
@Test
public void testOnTeleportToFlagActionVisitorsChorusFruit() {
when(island.getFlag(any())).thenReturn(RanksManager.MEMBER_RANK);
when(island.getRank(any(User.class))).thenReturn(RanksManager.VISITOR_RANK);

// Make the event
PlayerTeleportEvent e = new PlayerTeleportEvent(player, location, location, TeleportCause.CHORUS_FRUIT);
// Fire event
crl.onTeleport(e);
// Never alter the game mode
verify(player, never()).setGameMode(GameMode.CREATIVE);
verify(player, never()).setGameMode(GameMode.SURVIVAL);
}


}

0 comments on commit 936695d

Please sign in to comment.