Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 11:45:31 +01:00
Code Issues Projects Releases Wiki Activity

Fixed random test failures.

Browse Source 
Note: If using the User class in a test, you MUST set the mock plugin object using the User.setPlugin() method otherwise each test will use the wrong plugin object and verifications will not work.
This commit is contained in:
tastybento 2019-01-13 14:19:23 -08:00
parent 5f990b9103
commit 96639792b8
6 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/world/bentobox/bentobox/api/user/User.java
View File

@ -7,13 +7,19 @@ import java.util.Set;
import java.util.UUID;
import org.apache.commons.lang.math.NumberUtils;
import org.bukkit.*;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.Particle;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.util.Vector;
import world.bentobox.bentobox.BentoBox;
/**

4
src/main/java/world/bentobox/bentobox/listeners/flags/EnderChestListener.java
View File

@ -29,11 +29,11 @@ public class EnderChestListener extends FlagListener {
*/
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEnderChestOpen(PlayerInteractEvent e) {
if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
e.setCancelled(checkEnderChest(e.getPlayer(), e.getClickedBlock().getType()));
}
}
/**
* Prevents crafting of EnderChest unless the player has permission
*

1
src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java
View File

@ -65,6 +65,7 @@ public class IslandBanCommandTest {
// Set up plugin
BentoBox plugin = mock(BentoBox.class);
Whitebox.setInternalState(BentoBox.class, "instance", plugin);
User.setPlugin(plugin);
// Command manager
CommandsManager cm = mock(CommandsManager.class);

1
src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java
View File

@ -65,6 +65,7 @@ public class IslandUnbanCommandTest {
// Set up plugin
BentoBox plugin = mock(BentoBox.class);
Whitebox.setInternalState(BentoBox.class, "instance", plugin);
User.setPlugin(plugin);
// Command manager
CommandsManager cm = mock(CommandsManager.class);

47
src/test/java/world/bentobox/bentobox/listeners/flags/EnderChestListenerTest.java
View File

@ -27,6 +27,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -49,13 +50,16 @@ import world.bentobox.bentobox.managers.LocalesManager;
import world.bentobox.bentobox.util.Util;
@RunWith(PowerMockRunner.class)
@PrepareForTest({BentoBox.class, Util.class, User.class })
@PrepareForTest({BentoBox.class, Util.class })
public class EnderChestListenerTest {
private World world;
private Player player;
private IslandWorldManager iwm;
private Notifier notifier;
private ItemStack item;
private Block clickedBlock;
private Action action;
@Before
public void setUp() throws Exception {
@ -110,6 +114,8 @@ public class EnderChestListenerTest {
// No special perms
when(player.hasPermission(Mockito.anyString())).thenReturn(false);
when(player.getWorld()).thenReturn(world);
User.setPlugin(plugin);
User.getInstance(player);
// Locales - this returns the string that was requested for translation
LocalesManager lm = mock(LocalesManager.class);
@ -119,13 +125,22 @@ public class EnderChestListenerTest {
// Notifier
notifier = mock(Notifier.class);
when(plugin.getNotifier()).thenReturn(notifier);
// Acition, Item and clicked block
action = Action.RIGHT_CLICK_BLOCK;
item = mock(ItemStack.class);
clickedBlock = mock(Block.class);
}
@After
public void cleanUp() {
User.clearUsers();
}
@Test
public void testOnEnderChestOpenNotRightClick() {
Action action = Action.LEFT_CLICK_AIR;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
action = Action.LEFT_CLICK_AIR;
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
new EnderChestListener().onEnderChestOpen(e);
@ -134,9 +149,6 @@ public class EnderChestListenerTest {
@Test
public void testOnEnderChestOpenNotEnderChest() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.STONE);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
@ -146,9 +158,6 @@ public class EnderChestListenerTest {
@Test
public void testOnEnderChestOpenEnderChestNotInWorld() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
@ -161,9 +170,6 @@ public class EnderChestListenerTest {
@Test
public void testOnEnderChestOpenEnderChestOpPlayer() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
@ -175,9 +181,6 @@ public class EnderChestListenerTest {
@Test
public void testOnEnderChestOpenEnderChestHasBypassPerm() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
@ -189,9 +192,6 @@ public class EnderChestListenerTest {
@Test
public void testOnEnderChestOpenEnderChestOkay() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
@ -199,21 +199,20 @@ public class EnderChestListenerTest {
Flags.ENDER_CHEST.setSetting(world, true);
new EnderChestListener().onEnderChestOpen(e);
assertFalse(e.isCancelled());
Mockito.verify(notifier, Mockito.never()).notify(Mockito.anyObject(), Mockito.anyString());
}
@Test
public void testOnEnderChestOpenEnderChestBlocked() {
Action action = Action.RIGHT_CLICK_BLOCK;
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
BlockFace clickedBlockFace = BlockFace.EAST;
PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
// Enderchest use is okay
// Enderchest use is blocked
Flags.ENDER_CHEST.setSetting(world, false);
new EnderChestListener().onEnderChestOpen(e);
assertTrue(e.isCancelled());
Mockito.verify(notifier).notify(Mockito.anyObject(), Mockito.eq("protection.protected"));
Mockito.verify(notifier).notify(Mockito.any(User.class), Mockito.eq("protection.protected"));
}
@Test

2
src/test/java/world/bentobox/bentobox/listeners/flags/PhysicalInteractionListenerTest.java
View File

@ -136,8 +136,6 @@ public class PhysicalInteractionListenerTest {
Mockito.when(settings.getFakePlayers()).thenReturn(new HashSet<>());
// Users
//User user = mock(User.class);
///user.setPlugin(plugin);
User.setPlugin(plugin);