mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-06-22 21:04:52 +02:00
Added Island Creation Panel Test.
Fixed bugs with slot management.
This commit is contained in:
tastybento
parent
40f0591f7a
commit
5a6b1862a0
|
|
@ -84,29 +84,11 @@ public class PanelBuilder {
|
|||
}
|
||||
|
||||
/**
|
||||
* Get the next free slot number after the largest slot. If larger than the size of the panel, the first free spot available
|
||||
* is used.
|
||||
* Get the next free slot number after the largest slot.
|
||||
* @return next slot number, or -1 in case none has been found.
|
||||
*/
|
||||
public int nextSlot() {
|
||||
int slot = items.isEmpty() ? 0 : items.lastKey() + 1;
|
||||
if (slot >= size) {
|
||||
return getFirstAvailableSlot();
|
||||
}
|
||||
return slot;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the first available slot
|
||||
* @return slot or -1 if panel is full
|
||||
*/
|
||||
public int getFirstAvailableSlot() {
|
||||
for (int i = 0; i < size; i++) {
|
||||
if (!slotOccupied(i)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
return items.isEmpty() ? 0 : items.lastKey() + 1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ public class BlueprintManagementPanel {
|
|||
// Clicking on a bundle opens up the bundle edit panel
|
||||
// Create the panel
|
||||
PanelBuilder pb = new PanelBuilder().name(t("title")).user(user).size(45);
|
||||
// Panel has New Blueprint Bundle button - clicking in creates a new bundle
|
||||
pb.item(36, getNewBundle(user, addon));
|
||||
// Get the bundles
|
||||
Comparator<BlueprintBundle> sortByDisplayName = (p, o) -> p.getDisplayName().compareToIgnoreCase(o.getDisplayName());
|
||||
plugin.getBlueprintsManager().getBlueprintBundles(addon).values().stream().limit(36)
|
||||
|
|
@ -109,23 +111,35 @@ public class BlueprintManagementPanel {
|
|||
bb.setSlot(0);
|
||||
}
|
||||
if (pb.slotOccupied(bb.getSlot())) {
|
||||
int slot = pb.getFirstAvailableSlot();
|
||||
int slot = getFirstAvailableSlot(pb);
|
||||
if (slot == -1) {
|
||||
// TODO add paging
|
||||
plugin.logError("Too many blueprint bundles to show!");
|
||||
pb.item(item);
|
||||
} else {
|
||||
pb.item(slot, item);
|
||||
}
|
||||
pb.item(slot, item);
|
||||
} else {
|
||||
pb.item(bb.getSlot(), item);
|
||||
}
|
||||
});
|
||||
|
||||
// Panel has New Blueprint Bundle button - clicking in creates a new bundle
|
||||
pb.item(36, getNewBundle(user, addon));
|
||||
|
||||
pb.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param pb - panel builder
|
||||
* @return first available slot, or -1 if none
|
||||
*/
|
||||
private static int getFirstAvailableSlot(PanelBuilder pb) {
|
||||
for (int i = 0; i < BlueprintManagementPanel.MAX_BP_SLOT; i++) {
|
||||
if (!pb.slotOccupied(i)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open the Blueprint Bundle panel
|
||||
* @param bb - blueprint bundle
|
||||
|
|
|
|||
|
|
@ -58,12 +58,14 @@ public class IslandCreationPanel {
|
|||
bb.setSlot(0);
|
||||
}
|
||||
if (pb.slotOccupied(bb.getSlot())) {
|
||||
int slot = pb.getFirstAvailableSlot();
|
||||
int slot = getFirstAvailableSlot(pb);
|
||||
if (slot == -1) {
|
||||
// TODO add paging
|
||||
plugin.logError("Too many blueprint bundles to show!");
|
||||
pb.item(item);
|
||||
} else {
|
||||
pb.item(slot, item);
|
||||
}
|
||||
pb.item(slot, item);
|
||||
} else {
|
||||
pb.item(bb.getSlot(), item);
|
||||
}
|
||||
|
|
@ -71,4 +73,17 @@ public class IslandCreationPanel {
|
|||
}
|
||||
pb.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param pb - panel builder
|
||||
* @return first available slot, or -1 if none
|
||||
*/
|
||||
private static int getFirstAvailableSlot(PanelBuilder pb) {
|
||||
for (int i = 0; i < BlueprintManagementPanel.MAX_BP_SLOT; i++) {
|
||||
if (!pb.slotOccupied(i)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,221 @@
|
|||
package world.bentobox.bentobox.panels;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemFactory;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.scheduler.BukkitScheduler;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
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;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.Settings;
|
||||
import world.bentobox.bentobox.api.addons.GameModeAddon;
|
||||
import world.bentobox.bentobox.api.commands.CompositeCommand;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle;
|
||||
import world.bentobox.bentobox.managers.BlueprintsManager;
|
||||
import world.bentobox.bentobox.managers.CommandsManager;
|
||||
import world.bentobox.bentobox.managers.IslandWorldManager;
|
||||
import world.bentobox.bentobox.managers.IslandsManager;
|
||||
import world.bentobox.bentobox.managers.PlayersManager;
|
||||
import world.bentobox.bentobox.managers.island.NewIsland.Builder;
|
||||
|
||||
/**
|
||||
* @author tastybento
|
||||
*
|
||||
*/
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest({Bukkit.class, BentoBox.class})
|
||||
public class IslandCreationPanelTest {
|
||||
|
||||
@Mock
|
||||
private User user;
|
||||
@Mock
|
||||
private IslandsManager im;
|
||||
@Mock
|
||||
private IslandWorldManager iwm;
|
||||
@Mock
|
||||
private Builder builder;
|
||||
@Mock
|
||||
private BentoBox plugin;
|
||||
@Mock
|
||||
private Settings settings;
|
||||
@Mock
|
||||
private CompositeCommand ic;
|
||||
@Mock
|
||||
private BlueprintsManager bpm;
|
||||
@Mock
|
||||
private Inventory inv;
|
||||
@Mock
|
||||
private ItemMeta meta;
|
||||
@Mock
|
||||
private BlueprintBundle bb2;
|
||||
@Mock
|
||||
private BlueprintBundle bb3;
|
||||
|
||||
|
||||
/**
|
||||
* @throws java.lang.Exception
|
||||
*/
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
// Set up plugin
|
||||
Whitebox.setInternalState(BentoBox.class, "instance", plugin);
|
||||
|
||||
// Command manager
|
||||
CommandsManager cm = mock(CommandsManager.class);
|
||||
when(plugin.getCommandsManager()).thenReturn(cm);
|
||||
|
||||
// Settings
|
||||
when(plugin.getSettings()).thenReturn(settings);
|
||||
|
||||
// Player
|
||||
Player player = mock(Player.class);
|
||||
when(user.isOp()).thenReturn(false);
|
||||
when(user.isPlayer()).thenReturn(true);
|
||||
UUID uuid = UUID.randomUUID();
|
||||
when(user.getUniqueId()).thenReturn(uuid);
|
||||
when(user.getPlayer()).thenReturn(player);
|
||||
when(user.hasPermission(Mockito.anyString())).thenReturn(true);
|
||||
when(user.getTranslation(Mockito.anyVararg())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
|
||||
User.setPlugin(plugin);
|
||||
// Set up user already
|
||||
User.getInstance(player);
|
||||
|
||||
// Addon
|
||||
GameModeAddon addon = mock(GameModeAddon.class);
|
||||
|
||||
|
||||
// Parent command has no aliases
|
||||
when(ic.getSubCommandAliases()).thenReturn(new HashMap<>());
|
||||
when(ic.getParameters()).thenReturn("parameters");
|
||||
when(ic.getDescription()).thenReturn("description");
|
||||
when(ic.getPermissionPrefix()).thenReturn("permission.");
|
||||
when(ic.getUsage()).thenReturn("");
|
||||
when(ic.getSubCommand(Mockito.anyString())).thenReturn(Optional.empty());
|
||||
when(ic.getAddon()).thenReturn(addon);
|
||||
|
||||
|
||||
// No island for player to begin with (set it later in the tests)
|
||||
when(im.hasIsland(any(), eq(uuid))).thenReturn(false);
|
||||
when(im.isOwner(any(), eq(uuid))).thenReturn(false);
|
||||
// Has team
|
||||
when(im.inTeam(any(), eq(uuid))).thenReturn(true);
|
||||
when(plugin.getIslands()).thenReturn(im);
|
||||
|
||||
|
||||
PlayersManager pm = mock(PlayersManager.class);
|
||||
when(plugin.getPlayers()).thenReturn(pm);
|
||||
|
||||
// Server & Scheduler
|
||||
BukkitScheduler sch = mock(BukkitScheduler.class);
|
||||
PowerMockito.mockStatic(Bukkit.class);
|
||||
when(Bukkit.getScheduler()).thenReturn(sch);
|
||||
|
||||
// IWM friendly name
|
||||
when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
|
||||
when(plugin.getIWM()).thenReturn(iwm);
|
||||
|
||||
// Panel inventory
|
||||
when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(inv);
|
||||
|
||||
// Item Factory (needed for ItemStack)
|
||||
ItemFactory itemF = mock(ItemFactory.class);
|
||||
when(itemF.getItemMeta(Mockito.any())).thenReturn(meta);
|
||||
when(Bukkit.getItemFactory()).thenReturn(itemF);
|
||||
|
||||
// Bundles manager
|
||||
when(plugin.getBlueprintsManager()).thenReturn(bpm);
|
||||
|
||||
|
||||
// Bundles
|
||||
Map<String, BlueprintBundle> map = new HashMap<>();
|
||||
BlueprintBundle bb = mock(BlueprintBundle.class);
|
||||
when(bb.getUniqueId()).thenReturn("test");
|
||||
when(bb.getDisplayName()).thenReturn("test");
|
||||
when(bb.getIcon()).thenReturn(Material.STONE);
|
||||
when(bb.getDescription()).thenReturn(Collections.singletonList("A description"));
|
||||
when(bb.getSlot()).thenReturn(5);
|
||||
// Too small slot for panel
|
||||
when(bb2.getUniqueId()).thenReturn("test2");
|
||||
when(bb2.getDisplayName()).thenReturn("test2");
|
||||
when(bb2.getIcon()).thenReturn(Material.ACACIA_BOAT);
|
||||
when(bb2.getDescription()).thenReturn(Collections.singletonList("A description 2"));
|
||||
when(bb2.getSlot()).thenReturn(-5);
|
||||
// Too large slot for panel
|
||||
when(bb3.getUniqueId()).thenReturn("test3");
|
||||
when(bb3.getDisplayName()).thenReturn("test3");
|
||||
when(bb3.getIcon()).thenReturn(Material.BAKED_POTATO);
|
||||
when(bb3.getDescription()).thenReturn(Collections.singletonList("A description 3"));
|
||||
when(bb3.getSlot()).thenReturn(65);
|
||||
|
||||
map.put("test", bb);
|
||||
map.put("test2", bb2);
|
||||
map.put("test3", bb3);
|
||||
when(bpm.getBlueprintBundles(any(GameModeAddon.class))).thenReturn(map);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.panels.IslandCreationPanel#openPanel(world.bentobox.bentobox.api.commands.CompositeCommand, world.bentobox.bentobox.api.user.User, java.lang.String)}.
|
||||
*/
|
||||
@Test
|
||||
public void testOpenPanel() {
|
||||
IslandCreationPanel.openPanel(ic, user, "");
|
||||
// Check for slot being set to 0
|
||||
verify(bb2).setSlot(eq(0));
|
||||
verify(bb3).setSlot(eq(0));
|
||||
// Set correctly
|
||||
verify(inv).setItem(eq(5), any());
|
||||
verify(meta).setDisplayName(eq("test"));
|
||||
verify(meta).setLocalizedName(eq("test"));
|
||||
verify(meta).setLore(eq(Collections.singletonList("A description")));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.panels.IslandCreationPanel#openPanel(world.bentobox.bentobox.api.commands.CompositeCommand, world.bentobox.bentobox.api.user.User, java.lang.String)}.
|
||||
*/
|
||||
@Test
|
||||
public void testOpenPanelSameSlot() {
|
||||
when(bb2.getSlot()).thenReturn(5);
|
||||
when(bb3.getSlot()).thenReturn(5);
|
||||
IslandCreationPanel.openPanel(ic, user, "");
|
||||
verify(inv).setItem(eq(5), any());
|
||||
verify(meta).setDisplayName(eq("test"));
|
||||
verify(meta).setLocalizedName(eq("test"));
|
||||
verify(meta).setLore(eq(Collections.singletonList("A description")));
|
||||
verify(inv).setItem(eq(0), any());
|
||||
verify(meta).setDisplayName(eq("test2"));
|
||||
verify(meta).setLocalizedName(eq("test2"));
|
||||
verify(meta).setLore(eq(Collections.singletonList("A description 2")));
|
||||
verify(inv).setItem(eq(1), any());
|
||||
verify(meta).setDisplayName(eq("test3"));
|
||||
verify(meta).setLocalizedName(eq("test3"));
|
||||
verify(meta).setLore(eq(Collections.singletonList("A description 3")));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user