Compare commits
4 Commits
2c75939bc3
...
3de0ff236e
Author | SHA1 | Date |
---|---|---|
tastybento | 3de0ff236e | |
tastybento | c86eb6a19c | |
tastybento | e7055c6cba | |
tastybento | 5834dcbb59 |
|
@ -95,7 +95,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
User target = User.getInstance(targetUUID);
|
User target = User.getInstance(targetUUID);
|
||||||
Island oldIsland = Objects.requireNonNull(getIslands().getIsland(getWorld(), targetUUID)); // Should never be
|
Island oldIsland = Objects.requireNonNull(getIslands().getIsland(getWorld(), user)); // Should never be
|
||||||
// null because of
|
// null because of
|
||||||
// checks above
|
// checks above
|
||||||
// Fire event
|
// Fire event
|
||||||
|
@ -108,7 +108,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
|
||||||
getAddon().getDescription().getName(), TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME,
|
getAddon().getDescription().getName(), TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME,
|
||||||
user.getDisplayName());
|
user.getDisplayName());
|
||||||
|
|
||||||
getIslands().removePlayer(getWorld(), targetUUID);
|
getIslands().removePlayer(oldIsland, targetUUID);
|
||||||
// Clean the target player
|
// Clean the target player
|
||||||
getPlayers().cleanLeavingPlayer(getWorld(), target, true, oldIsland);
|
getPlayers().cleanLeavingPlayer(getWorld(), target, true, oldIsland);
|
||||||
|
|
||||||
|
|
|
@ -250,7 +250,7 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest {
|
||||||
|
|
||||||
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
||||||
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
||||||
verify(im).removePlayer(any(World.class), eq(notUUID));
|
verify(im).removePlayer(any(Island.class), eq(notUUID));
|
||||||
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -343,7 +343,7 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest {
|
||||||
|
|
||||||
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
||||||
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
||||||
verify(im).removePlayer(any(World.class), eq(notUUID));
|
verify(im).removePlayer(any(Island.class), eq(notUUID));
|
||||||
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -363,7 +363,7 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest {
|
||||||
|
|
||||||
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
||||||
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
||||||
verify(im).removePlayer(any(World.class), eq(notUUID));
|
verify(im).removePlayer(any(Island.class), eq(notUUID));
|
||||||
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
||||||
verify(target, never()).getInventory();
|
verify(target, never()).getInventory();
|
||||||
|
|
||||||
|
@ -389,7 +389,7 @@ public class IslandTeamKickCommandTest extends RanksManagerBeforeClassTest {
|
||||||
|
|
||||||
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
|
||||||
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
|
||||||
verify(im).removePlayer(any(World.class), eq(notUUID));
|
verify(im).removePlayer(any(Island.class), eq(notUUID));
|
||||||
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
verify(user).sendMessage("commands.island.team.kick.success", TextVariables.NAME, "poslovitch", TextVariables.DISPLAY_NAME, "&Cposlovich");
|
||||||
verify(target, Mockito.never()).getInventory();
|
verify(target, Mockito.never()).getInventory();
|
||||||
verify(pm).cleanLeavingPlayer(any(), any(User.class), eq(true), eq(island));
|
verify(pm).cleanLeavingPlayer(any(), any(User.class), eq(true), eq(island));
|
||||||
|
|
|
@ -18,10 +18,14 @@ import org.mockito.Mock;
|
||||||
import org.mockito.Mockito;
|
import org.mockito.Mockito;
|
||||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||||
import org.powermock.modules.junit4.PowerMockRunner;
|
import org.powermock.modules.junit4.PowerMockRunner;
|
||||||
|
import org.powermock.reflect.Whitebox;
|
||||||
|
|
||||||
import world.bentobox.bentobox.BentoBox;
|
import world.bentobox.bentobox.BentoBox;
|
||||||
|
import world.bentobox.bentobox.Settings;
|
||||||
|
import world.bentobox.bentobox.TestWorldSettings;
|
||||||
import world.bentobox.bentobox.api.addons.AddonDescription;
|
import world.bentobox.bentobox.api.addons.AddonDescription;
|
||||||
import world.bentobox.bentobox.api.addons.GameModeAddon;
|
import world.bentobox.bentobox.api.addons.GameModeAddon;
|
||||||
|
import world.bentobox.bentobox.api.configuration.WorldSettings;
|
||||||
import world.bentobox.bentobox.api.hooks.Hook;
|
import world.bentobox.bentobox.api.hooks.Hook;
|
||||||
import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
|
import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
|
||||||
import world.bentobox.bentobox.lists.GameModePlaceholder;
|
import world.bentobox.bentobox.lists.GameModePlaceholder;
|
||||||
|
@ -43,9 +47,17 @@ public class PlaceholdersManagerTest {
|
||||||
private HooksManager hm;
|
private HooksManager hm;
|
||||||
@Mock
|
@Mock
|
||||||
private PlaceholderAPIHook hook;
|
private PlaceholderAPIHook hook;
|
||||||
|
@Mock
|
||||||
|
private IslandWorldManager iwm;
|
||||||
|
private Settings settings;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
|
// Set up plugin
|
||||||
|
Whitebox.setInternalState(BentoBox.class, "instance", plugin);
|
||||||
|
settings = new Settings();
|
||||||
|
when(plugin.getSettings()).thenReturn(settings);
|
||||||
|
|
||||||
// Addon
|
// Addon
|
||||||
@NonNull
|
@NonNull
|
||||||
AddonDescription desc = new AddonDescription.Builder("main", "bskyblock", "1.0").build();
|
AddonDescription desc = new AddonDescription.Builder("main", "bskyblock", "1.0").build();
|
||||||
|
@ -61,6 +73,13 @@ public class PlaceholdersManagerTest {
|
||||||
when(hm.getHook(eq("PlaceholderAPI"))).thenReturn(optionalHook);
|
when(hm.getHook(eq("PlaceholderAPI"))).thenReturn(optionalHook);
|
||||||
when(hook.isPlaceholder(any(), any())).thenReturn(false);
|
when(hook.isPlaceholder(any(), any())).thenReturn(false);
|
||||||
|
|
||||||
|
// World settings
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
WorldSettings ws = new TestWorldSettings();
|
||||||
|
when(iwm.getWorldSettings(any())).thenReturn(ws);
|
||||||
|
when(plugin.getIWM()).thenReturn(iwm);
|
||||||
|
|
||||||
// Placeholder manager
|
// Placeholder manager
|
||||||
pm = new PlaceholdersManager(plugin);
|
pm = new PlaceholdersManager(plugin);
|
||||||
}
|
}
|
||||||
|
@ -77,7 +96,7 @@ public class PlaceholdersManagerTest {
|
||||||
public void testRegisterGameModePlaceholdersAllDefaults() {
|
public void testRegisterGameModePlaceholdersAllDefaults() {
|
||||||
pm.registerDefaultPlaceholders(addon);
|
pm.registerDefaultPlaceholders(addon);
|
||||||
// + 300 because we register team member placeholders up to 50 members
|
// + 300 because we register team member placeholders up to 50 members
|
||||||
verify(hook, times(GameModePlaceholder.values().length + 302)).registerPlaceholder(any(), anyString(), any());
|
verify(hook, times(GameModePlaceholder.values().length + 304)).registerPlaceholder(any(), anyString(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -91,7 +110,7 @@ public class PlaceholdersManagerTest {
|
||||||
pm.registerDefaultPlaceholders(addon);
|
pm.registerDefaultPlaceholders(addon);
|
||||||
|
|
||||||
// 3 less registrations for this addon
|
// 3 less registrations for this addon
|
||||||
verify(hook, times(GameModePlaceholder.values().length - 3 + 302)).registerPlaceholder(any(), anyString(),
|
verify(hook, times(GameModePlaceholder.values().length - 3 + 304)).registerPlaceholder(any(), anyString(),
|
||||||
any());
|
any());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue