Added test classes for new commands and fixed bugs with them

src/main/java/world/bentobox/parkour/commands/RemoveWarpCommand.java

@@ -26,18 +26,23 @@ public void setup() {
 
     @Override
     public boolean canExecute(User user, String label, List<String> args) {
-        Island island = getIslands().getIsland(getWorld(), user);
-        ParkourManager pm = ((Parkour)getAddon()).getPm();
-        if (pm.getWarpSpot(island).isEmpty()) {
-            user.sendMessage("parkour.errors.no-warp");
+        if (!args.isEmpty()) {
+            this.showHelp(this, user);
             return false;
         }
+        Island island = getIslands().getIsland(getWorld(), user);
         // Check rank to use command
         int rank = Objects.requireNonNull(island).getRank(user);
         if (rank < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.insufficient-rank", TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)));
             return false;
         }
+
+        ParkourManager pm = ((Parkour)getAddon()).getPm();
+        if (pm.getWarpSpot(island).isEmpty()) {
+            user.sendMessage("parkour.errors.no-warp");
+            return false;
+        }
         return true;
     }
 

src/main/java/world/bentobox/parkour/commands/SetWarpCommand.java

@@ -28,6 +28,10 @@ public void setup() {
 
     @Override
     public boolean canExecute(User user, String label, List<String> args) {
+        if (!args.isEmpty()) {
+            this.showHelp(this, user);
+            return false;
+        }
         if (!getIslands().userIsOnIsland(getWorld(), user)) {
             user.sendMessage("parkour.errors.not-on-island");
             return false;

src/test/java/world/bentobox/parkour/commands/RemoveWarpCommandTest.java

@@ -0,0 +1,221 @@
+package world.bentobox.parkour.commands;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.CommandsManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.LocalesManager;
+import world.bentobox.bentobox.managers.RanksManager;
+import world.bentobox.parkour.Parkour;
+import world.bentobox.parkour.ParkourManager;
+import world.bentobox.parkour.Settings;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
+public class RemoveWarpCommandTest {
+    @Mock
+    private BentoBox plugin;
+    @Mock
+    private CompositeCommand ac;
+    @Mock
+    private User user;
+    @Mock
+    private LocalesManager lm;
+    @Mock
+    private Parkour addon;
+    private UUID uuid;
+    @Mock
+    private World world;
+    @Mock
+    private IslandsManager im;
+    @Mock
+    private @Nullable Island island;
+    @Mock
+    private IslandWorldManager iwm;
+    private RemoveWarpCommand cmd;
+    @Mock
+    private ParkourManager parkourManager;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        BentoBox plugin = mock(BentoBox.class);
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+
+        // Command manager
+        CommandsManager cm = mock(CommandsManager.class);
+        when(plugin.getCommandsManager()).thenReturn(cm);
+
+        // Player
+        Player p = mock(Player.class);
+        // Sometimes use Mockito.withSettings().verboseLogging()
+        when(user.isOp()).thenReturn(false);
+        when(user.getPermissionValue(anyString(), anyInt())).thenReturn(4);
+        when(user.getWorld()).thenReturn(world);
+        uuid = UUID.randomUUID();
+        when(user.getUniqueId()).thenReturn(uuid);
+        when(user.getPlayer()).thenReturn(p);
+        when(user.getName()).thenReturn("tastybento");
+        when(user.getTranslation(any())).thenAnswer(invocation -> invocation.getArgument(0, String.class));
+        User.setPlugin(plugin);
+
+        // Parent command has no aliases
+        when(ac.getSubCommandAliases()).thenReturn(new HashMap<>());
+        when(ac.getWorld()).thenReturn(world);
+        when(ac.getAddon()).thenReturn(addon);
+
+        // Islands
+        when(plugin.getIslands()).thenReturn(im);
+        when(im.getIsland(world, user)).thenReturn(island);
+        when(im.hasIsland(world, user)).thenReturn(true);
+        when(im.inTeam(world, uuid)).thenReturn(true);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
+        when(island.getRank(user)).thenReturn(RanksManager.MEMBER_RANK);
+        when(im.userIsOnIsland(any(), any())).thenReturn(true);
+
+        // Parkour Manager
+        // Warp spot available by default
+        when(parkourManager.getWarpSpot(island)).thenReturn(Optional.of(mock(Location.class)));
+        when(addon.getPm()).thenReturn(parkourManager);
+
+        // IWM
+        when(plugin.getIWM()).thenReturn(iwm);
+        when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
+
+        // Settings
+        Settings settings = new Settings();
+        when(addon.getSettings()).thenReturn(settings);
+
+        // RanksManager
+        RanksManager rm = new RanksManager();
+        when(plugin.getRanksManager()).thenReturn(rm);
+
+        // DUT
+        cmd = new RemoveWarpCommand(ac);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#RemoveWarpCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}.
+     */
+    @Test
+    public void testRemoveWarpCommand() {
+        assertNotNull(cmd);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#setup()}.
+     */
+    @Test
+    public void testSetup() {
+        assertEquals("parkour.removewarp", cmd.getPermission());
+        assertEquals("parkour.commands.parkour.removewarp.description", cmd.getDescription());
+        assertTrue(cmd.isConfigurableRankCommand());
+        assertTrue(cmd.isOnlyPlayer());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteFailHelp() {
+        // Help
+        assertFalse(cmd.canExecute(user, "", List.of("something")));
+        verify(user).sendMessage("commands.help.header","[label]",null);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteFailNoRank() {
+        // Insufficient rank
+        assertFalse(cmd.canExecute(user, "", List.of()));
+        verify(user).sendMessage("general.errors.insufficient-rank", TextVariables.RANK, RanksManager.MEMBER_RANK_REF);
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteFailNoWarpSpot() {
+        // Has rank
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.MEMBER_RANK);
+        when(parkourManager.getWarpSpot(island)).thenReturn(Optional.empty());
+        assertFalse(cmd.canExecute(user, "", List.of()));
+        verify(user).sendMessage("parkour.errors.no-warp");
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecutePass() {
+        // Has rank
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.MEMBER_RANK);
+        assertTrue(cmd.canExecute(user, "", List.of()));
+        verify(user, never()).sendMessage(any());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfString() {
+        assertTrue(cmd.execute(user, "", List.of()));
+        verify(user).sendMessage("parkour.warp.removed");
+        verify(parkourManager).setWarpSpot(island, null);
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.parkour.commands.RemoveWarpCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringWarpRemove() {
+        when(parkourManager.getWarpSpot(island)).thenReturn(Optional.of(mock(Location.class)));
+        assertTrue(cmd.execute(user, "", List.of()));
+        verify(user).sendMessage("parkour.warp.removed");
+        verify(parkourManager).setWarpSpot(island, null);
+    }
+
+}