From 3f1d6d16ffafd0a13dbcc846242f9c7ca462dd1e Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 6 Dec 2019 08:29:29 -0800 Subject: [PATCH] Added Mockito.framework().clearInlineMocks() to all test classes per https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2 This is just e defensive measure and may not have an affect on any particular class. --- .../world/bentobox/bentobox/TestBentoBox.java | 9 +++++++- .../bentobox/api/addons/AddonTest.java | 3 ++- .../api/commands/DefaultHelpCommandTest.java | 6 ++++++ .../commands/DelayedTeleportCommandTest.java | 8 +++++++ .../admin/AdminDeleteCommandTest.java | 6 ++++++ .../admin/AdminGetrankCommandTest.java | 4 +++- .../commands/admin/AdminInfoCommandTest.java | 6 ++++++ .../admin/AdminRegisterCommandTest.java | 11 ++++++++-- .../admin/AdminResetFlagsCommandTest.java | 4 +++- .../admin/AdminSetrankCommandTest.java | 4 +++- .../admin/AdminSetspawnCommandTest.java | 6 ++++++ .../admin/AdminTeleportCommandTest.java | 10 +++++++-- .../admin/AdminUnregisterCommandTest.java | 6 ++++++ .../AdminBlueprintsListCommandTest.java | 1 + .../admin/purge/AdminPurgeCommandTest.java | 7 ++++--- .../admin/range/AdminRangeCommandTest.java | 6 ++++++ .../range/AdminRangeDisplayCommandTest.java | 7 +++++++ .../range/AdminRangeResetCommandTest.java | 7 +++++++ .../admin/range/AdminRangeSetCommandTest.java | 7 +++++++ .../admin/team/AdminTeamAddCommandTest.java | 6 ++++++ .../team/AdminTeamDisbandCommandTest.java | 7 +++++++ .../admin/team/AdminTeamKickCommandTest.java | 7 +++++++ .../team/AdminTeamSetownerCommandTest.java | 7 +++++++ .../island/CustomIslandMultiHomeHelpTest.java | 7 ++++--- .../commands/island/IslandBanCommandTest.java | 1 + .../island/IslandBanlistCommandTest.java | 11 ++++++++-- .../island/IslandCreateCommandTest.java | 7 ++++--- .../island/IslandExpelCommandTest.java | 3 ++- .../commands/island/IslandGoCommandTest.java | 1 + .../island/IslandInfoCommandTest.java | 3 ++- .../island/IslandNearCommandTest.java | 3 ++- .../island/IslandResetCommandTest.java | 1 + .../island/IslandSethomeCommandTest.java | 6 ++++++ .../island/IslandSpawnCommandTest.java | 21 ++++++++++--------- .../island/IslandUnbanCommandTest.java | 6 ++++++ .../team/IslandTeamUncoopCommandTest.java | 2 +- .../team/IslandTeamUntrustCommandTest.java | 2 +- .../bentobox/bentobox/api/flags/FlagTest.java | 5 +++-- .../flags/clicklisteners/CycleClickTest.java | 12 ++++++++--- .../clicklisteners/IslandToggleClickTest.java | 10 +++++++-- .../clicklisteners/WorldToggleClickTest.java | 8 ++++++- .../api/localization/BentoBoxLocaleTest.java | 8 ++++++- .../bentobox/api/panels/PanelTest.java | 3 ++- .../api/panels/builders/PanelBuilderTest.java | 6 ++++++ .../panels/builders/PanelItemBuilderTest.java | 6 ++++++ .../bentobox/api/user/NotifierTest.java | 3 ++- .../bentobox/bentobox/api/user/UserTest.java | 4 +++- .../commands/BentoBoxReloadCommandTest.java | 3 ++- .../bentobox/database/DatabaseTest.java | 1 + .../json/adapters/FlagAdapterTest.java | 6 ++++++ .../adapters/ItemStackTypeAdapterTest.java | 14 +++++++++---- .../database/objects/IslandDeletionTest.java | 7 +++++++ .../database/objects/PlayersTest.java | 6 ++++++ .../adapters/LogEntryListAdapterTest.java | 7 +++++++ .../sql/mysql/MySQLDatabaseConnectorTest.java | 6 ++++-- .../sql/mysql/MySQLDatabaseHandlerTest.java | 10 +++++++-- .../yaml/YamlDatabaseHandlerTest.java | 1 + .../listeners/BannedCommandsTest.java | 13 +++++++++--- .../listeners/BlockEndDragonTest.java | 17 ++++++++------- .../bentobox/listeners/DeathListenerTest.java | 8 +++++++ .../listeners/JoinLeaveListenerTest.java | 4 +++- .../listeners/PanelListenerManagerTest.java | 4 +++- .../PortalTeleportationListenerTest.java | 7 +++++++ .../StandardSpawnProtectionListenerTest.java | 3 ++- .../BlockInteractionListenerTest.java | 4 +++- .../protection/BreakBlocksListenerTest.java | 3 ++- .../protection/BreedingListenerTest.java | 7 +++++++ .../flags/protection/BucketListenerTest.java | 3 ++- .../flags/protection/EggListenerTest.java | 9 ++++---- .../EntityInteractListenerTest.java | 4 +++- .../ExperiencePickupListenerTest.java | 10 ++++++++- .../flags/protection/FireListenerTest.java | 7 +++++++ .../flags/protection/HurtingListenerTest.java | 1 + .../protection/InventoryListenerTest.java | 3 ++- .../protection/LockAndBanListenerTest.java | 9 +++++++- .../PhysicalInteractionListenerTest.java | 6 ++++-- .../protection/PlaceBlocksListenerTest.java | 3 ++- .../flags/protection/TNTListenerTest.java | 7 +++++++ .../protection/ThrowingListenerTest.java | 3 ++- .../flags/settings/MobSpawnListenerTest.java | 20 ++++++++++++------ .../flags/settings/PVPListenerTest.java | 1 + .../ChestDamageListenerTest.java | 7 +++++++ .../CleanSuperFlatListenerTest.java | 8 +++++++ .../worldsettings/EnderChestListenerTest.java | 3 ++- .../worldsettings/EndermanListenerTest.java | 7 +++++++ .../worldsettings/EnterExitListenerTest.java | 2 ++ .../InvincibleVisitorsListenerTest.java | 15 +++++++++---- .../IslandRespawnListenerTest.java | 13 ++++++------ .../worldsettings/ItemFrameListenerTest.java | 10 ++++++++- .../LiquidsFlowingOutListenerTest.java | 8 +++++++ .../ObsidianScoopingListenerTest.java | 7 +++++++ .../OfflineGrowthListenerTest.java | 12 +++++++++-- .../OfflineRedstoneListenerTest.java | 12 +++++++++-- .../worldsettings/PistonPushListenerTest.java | 10 ++++++++- .../worldsettings/RemoveMobsListenerTest.java | 10 ++++++++- .../TreesGrowingOutsideRangeListenerTest.java | 8 +++++++ .../worldsettings/WitherListenerTest.java | 12 +++++++---- .../bentobox/managers/AddonsManagerTest.java | 2 ++ .../BlueprintClipboardManagerTest.java | 2 ++ .../managers/BlueprintsManagerTest.java | 5 +++-- .../bentobox/managers/FlagsManagerTest.java | 7 +++++++ .../managers/IslandDeletionManagerTest.java | 2 ++ .../managers/IslandWorldManagerTest.java | 6 ++++++ .../bentobox/managers/IslandsManagerTest.java | 5 +++-- .../bentobox/managers/LocalesManagerTest.java | 3 +++ .../managers/PlaceholdersManagerTest.java | 7 +++++++ .../bentobox/managers/PlayersManagerTest.java | 3 ++- .../bentobox/managers/RanksManagerTest.java | 7 +++++++ .../managers/island/IslandCacheTest.java | 8 ++++++- .../managers/island/NewIslandTest.java | 3 ++- .../panels/BlueprintManagementPanelTest.java | 21 ++++++++++--------- .../panels/IslandCreationPanelTest.java | 13 +++++++++--- .../bentobox/panels/LanguagePanelTest.java | 3 ++- .../bentobox/util/ItemParserTest.java | 6 ++++++ .../bentobox/bentobox/util/UtilTest.java | 6 ++++++ .../teleport/SafeSpotTeleportBuilderTest.java | 8 ++++++- .../util/teleport/SafeSpotTeleportTest.java | 6 ++++++ 117 files changed, 634 insertions(+), 134 deletions(-) diff --git a/src/test/java/world/bentobox/bentobox/TestBentoBox.java b/src/test/java/world/bentobox/bentobox/TestBentoBox.java index d042406d1..c875f2a92 100644 --- a/src/test/java/world/bentobox/bentobox/TestBentoBox.java +++ b/src/test/java/world/bentobox/bentobox/TestBentoBox.java @@ -37,6 +37,7 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -92,7 +93,7 @@ public class TestBentoBox { Mockito.when(server.getVersion()).thenReturn("BentoBox_Mocking"); PluginManager pluginManager = mock(PluginManager.class); - + ItemFactory itemFactory = mock(ItemFactory.class); when(server.getItemFactory()).thenReturn(itemFactory); @@ -170,6 +171,12 @@ public class TestBentoBox { Mockito.when(settings.getFakePlayers()).thenReturn(new HashSet<>()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testIslandEvent() { // Test island events diff --git a/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java index 807a575b6..d4e684c5b 100644 --- a/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java +++ b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java @@ -76,7 +76,7 @@ public class AddonTest { when(server.getVersion()).thenReturn("BSB_Mocking"); PluginManager pluginManager = mock(PluginManager.class); - + PowerMockito.mockStatic(Bukkit.class); when(Bukkit.getPluginManager()).thenReturn(pluginManager); @@ -137,6 +137,7 @@ public class AddonTest { .map(Path::toFile) .forEach(File::delete); } + Mockito.framework().clearInlineMocks(); } class TestClass extends Addon { diff --git a/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java index 855cbf536..3c4a43f39 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java @@ -13,6 +13,7 @@ import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -112,6 +113,11 @@ public class DefaultHelpCommandTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test for {@link DefaultHelpCommand} */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java index b04158b4c..702d90ff6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java @@ -20,10 +20,12 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.bukkit.util.Vector; +import org.junit.After; 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; @@ -148,6 +150,12 @@ public class DelayedTeleportCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.commands.DelayedTeleportCommand#onPlayerMove(org.bukkit.event.player.PlayerMoveEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java index f54dee04e..57eeb639b 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java @@ -16,6 +16,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -121,6 +122,11 @@ public class AdminDeleteCommandTest { when(plugin.getLocalesManager()).thenReturn(lm); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminDeleteCommand#execute(User, String, java.util.List) diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java index 5e18fa8b5..25c809362 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommandTest.java @@ -26,6 +26,7 @@ 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; @@ -115,8 +116,9 @@ public class AdminGetrankCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java index a3f6b24eb..d7aae8f30 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java @@ -17,6 +17,7 @@ import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -119,6 +120,11 @@ public class AdminInfoCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminInfoCommand#execute(User, String, List)}. diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java index 611b351be..60a9df0d7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java @@ -20,10 +20,12 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -58,9 +60,9 @@ public class AdminRegisterCommandTest { private IslandsManager im; @Mock private PlayersManager pm; - + private UUID notUUID; - + private IslandDeletionManager idm; /** @@ -131,6 +133,11 @@ public class AdminRegisterCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminRegisterCommand#execute(org.bukkit.command.CommandSender, String, String[])}. diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java index 56bda618e..ffeb84184 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java @@ -28,6 +28,7 @@ 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; @@ -142,8 +143,9 @@ public class AdminResetFlagsCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java index daa11c512..cd6ef4749 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java @@ -23,6 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -90,8 +91,9 @@ public class AdminSetrankCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java index c4d6024fb..4e2aabed7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java @@ -17,6 +17,7 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -116,6 +117,11 @@ public class AdminSetspawnCommandTest { when(settings.getConfirmationTime()).thenReturn(10); when(plugin.getSettings()).thenReturn(settings); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand#AdminSetspawnCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java index aa5a52e9d..205372cef 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.commands.admin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -20,6 +20,7 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -134,6 +135,11 @@ public class AdminTeleportCommandTest { when(im.getIslandAt(any())).thenReturn(nothing ); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test all the various commands diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java index 3fe6aa8b9..d2d55f0c1 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java @@ -16,6 +16,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -123,6 +124,11 @@ public class AdminUnregisterCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for . diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintsListCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintsListCommandTest.java index d477635aa..ccc75c968 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintsListCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintsListCommandTest.java @@ -106,6 +106,7 @@ public class AdminBlueprintsListCommandTest { .sorted(Comparator.reverseOrder()) .map(Path::toFile) .forEach(File::delete); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java index b06ff34a2..1748e6b87 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java @@ -6,8 +6,8 @@ package world.bentobox.bentobox.api.commands.admin.purge; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -104,7 +104,8 @@ public class AdminPurgeCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java index 163ee7922..cf2b06e37 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java @@ -13,6 +13,7 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -109,6 +110,11 @@ public class AdminRangeCommandTest { when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } @Test public void testExecuteConsoleNoArgs() { diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java index dec2e0f71..ad6f3459c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java @@ -13,6 +13,7 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -108,6 +109,12 @@ public class AdminRangeDisplayCommandTest { when(plugin.getLocalesManager()).thenReturn(lm); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java index e6d99dbeb..c20b81a5c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java @@ -18,6 +18,7 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -126,6 +127,12 @@ public class AdminRangeResetCommandTest { when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java index 0eb039d26..30e56ef42 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java @@ -18,6 +18,7 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -128,6 +129,12 @@ public class AdminRangeSetCommandTest { when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java index 0bbfea9db..54bcd955c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java @@ -16,6 +16,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -124,6 +125,11 @@ public class AdminTeamAddCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminTeamAddCommand#execute(User, String, List)}. diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java index d026c2798..89e04c22c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java @@ -18,6 +18,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -123,6 +124,12 @@ public class AdminTeamDisbandCommandTest { when(Bukkit.getPluginManager()).thenReturn(pim); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link AdminTeamDisbandCommand#execute(User, String, List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java index 7b9872759..d9d553cac 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java @@ -25,10 +25,12 @@ import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -132,6 +134,11 @@ public class AdminTeamKickCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminTeamKickCommand#canExecute(User, String, List)}. diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java index be91d3afd..83f9f2bdc 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java @@ -20,10 +20,12 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -122,6 +124,11 @@ public class AdminTeamSetownerCommandTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java index c53adbb9f..329e113e9 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java @@ -110,9 +110,9 @@ public class CustomIslandMultiHomeHelpTest { // IWM friendly name when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); when(plugin.getIWM()).thenReturn(iwm); - + // Locales - + // Command ch = new CustomIslandMultiHomeHelp(ic); @@ -124,6 +124,7 @@ public class CustomIslandMultiHomeHelpTest { @After public void tearDown() throws Exception { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** @@ -198,5 +199,5 @@ public class CustomIslandMultiHomeHelpTest { "description" ); } - + } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java index c0909ce15..7fe8954f0 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java @@ -168,6 +168,7 @@ public class IslandBanCommandTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java index f06b3aefe..2ceaf8ea7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java @@ -3,13 +3,13 @@ package world.bentobox.bentobox.api.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; 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 static org.mockito.Mockito.never; import java.util.Collections; import java.util.HashMap; @@ -21,10 +21,12 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; 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; @@ -120,6 +122,11 @@ public class IslandBanlistCommandTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link IslandBanlistCommand#canExecute(User, String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java index 0cd80108e..6fc8b7dfe 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.commands.island; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -163,8 +163,9 @@ public class IslandCreateCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java index b60ae849c..0f505d8e7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java @@ -155,8 +155,9 @@ public class IslandExpelCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java index f4fd52018..ce858a90c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java @@ -183,6 +183,7 @@ public class IslandGoCommandTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java index 79f23307b..ef19a03f0 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommandTest.java @@ -119,8 +119,9 @@ public class IslandInfoCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandNearCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandNearCommandTest.java index 9208f0d11..eebcc27f3 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandNearCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandNearCommandTest.java @@ -163,8 +163,9 @@ public class IslandNearCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java index ef85756a2..98fe6c268 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java @@ -262,6 +262,7 @@ public class IslandResetCommandTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java index 3fedf0f17..ede5d2401 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java @@ -15,6 +15,7 @@ import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -125,6 +126,11 @@ public class IslandSethomeCommandTest { when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(1); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSethomeCommand#IslandSethomeCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java index 021600c86..99ca16ef0 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSpawnCommandTest.java @@ -50,7 +50,7 @@ import world.bentobox.bentobox.managers.PlaceholdersManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class}) public class IslandSpawnCommandTest { - + @Mock private BentoBox plugin; @Mock @@ -81,7 +81,7 @@ public class IslandSpawnCommandTest { // Command manager CommandsManager cm = mock(CommandsManager.class); when(plugin.getCommandsManager()).thenReturn(cm); - + // Player when(player.isOp()).thenReturn(false); UUID uuid = UUID.randomUUID(); @@ -91,7 +91,7 @@ public class IslandSpawnCommandTest { User.setPlugin(plugin); // Set up user already user = User.getInstance(player); - + // Addon GameModeAddon addon = mock(GameModeAddon.class); @@ -110,10 +110,10 @@ public class IslandSpawnCommandTest { when(iwm.getWorldSettings(any())).thenReturn(ws); map = new HashMap<>(); when(ws.getWorldFlags()).thenReturn(map); - + // Island Manager when(plugin.getIslands()).thenReturn(im); - + LocalesManager lm = mock(LocalesManager.class); // Locales when(plugin.getLocalesManager()).thenReturn(lm); @@ -130,8 +130,9 @@ public class IslandSpawnCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** @@ -160,7 +161,7 @@ public class IslandSpawnCommandTest { assertTrue(isc.execute(user, "spawn", Collections.emptyList())); verify(im).spawnTeleport(any(), any()); } - + /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSpawnCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @@ -173,7 +174,7 @@ public class IslandSpawnCommandTest { verify(im, never()).spawnTeleport(any(), any()); verify(player).sendMessage(eq("protection.flags.PREVENT_TELEPORT_WHEN_FALLING.hint")); } - + /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSpawnCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @@ -186,7 +187,7 @@ public class IslandSpawnCommandTest { verify(im).spawnTeleport(any(), any()); verify(player, never()).sendMessage(eq("protection.flags.PREVENT_TELEPORT_WHEN_FALLING.hint")); } - + /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSpawnCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @@ -199,7 +200,7 @@ public class IslandSpawnCommandTest { verify(im).spawnTeleport(any(), any()); verify(player, never()).sendMessage(eq("protection.flags.PREVENT_TELEPORT_WHEN_FALLING.hint")); } - + /** * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandSpawnCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java index 214df5604..cb1ca5776 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java @@ -25,6 +25,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -129,6 +130,11 @@ public class IslandUnbanCommandTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link IslandUnbanCommand#canExecute(User, String, List)} */ diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java index 3f36cd45e..8e4a4b734 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java @@ -5,7 +5,7 @@ package world.bentobox.bentobox.api.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java index 80f28e806..156f67fd6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java @@ -5,7 +5,7 @@ package world.bentobox.bentobox.api.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java index 0baae40a2..47644f37b 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java @@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -107,7 +107,8 @@ public class FlagTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java index e1e087842..10622fcde 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java @@ -2,9 +2,9 @@ package world.bentobox.bentobox.api.flags.clicklisteners; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -23,6 +23,7 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -215,6 +216,11 @@ public class CycleClickTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testNoPremission() { when(user.hasPermission(anyString())).thenReturn(false); diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java index 5c2508fd8..587f2a6f1 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java @@ -1,7 +1,7 @@ package world.bentobox.bentobox.api.flags.clicklisteners; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -17,6 +17,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -116,6 +117,11 @@ public class IslandToggleClickTest { when(settingsTab.getIsland()).thenReturn(island); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnClickNoPermission() { when(user.hasPermission(Mockito.anyString())).thenReturn(false); diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java index c3a59bf07..e1247fc9c 100644 --- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java @@ -1,6 +1,6 @@ package world.bentobox.bentobox.api.flags.clicklisteners; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -14,6 +14,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -96,6 +97,11 @@ public class WorldToggleClickTest { when(Bukkit.getPluginManager()).thenReturn(pim); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnClickWrongWorld() { when(iwm.inWorld(any(World.class))).thenReturn(false); diff --git a/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java b/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java index c1a854eb4..e3ac92f54 100644 --- a/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java +++ b/src/test/java/world/bentobox/bentobox/api/localization/BentoBoxLocaleTest.java @@ -6,7 +6,7 @@ package world.bentobox.bentobox.api.localization; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -20,6 +20,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BannerMeta; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,6 +64,11 @@ public class BentoBoxLocaleTest { localeObject = new BentoBoxLocale(locale, config); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.localization.BentoBoxLocale#get(java.lang.String)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/panels/PanelTest.java b/src/test/java/world/bentobox/bentobox/api/panels/PanelTest.java index 9cf7536b8..af12e0bc7 100644 --- a/src/test/java/world/bentobox/bentobox/api/panels/PanelTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/PanelTest.java @@ -75,7 +75,8 @@ public class PanelTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java index 9d5ac490f..d1bed0081 100644 --- a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelBuilderTest.java @@ -11,6 +11,7 @@ import static org.mockito.Mockito.when; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,6 +44,11 @@ public class PanelBuilderTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.api.panels.builders.PanelBuilder#name(java.lang.String)}. */ diff --git a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java index 7cf1ec92e..a1c181c59 100644 --- a/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java @@ -24,6 +24,7 @@ import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,6 +73,11 @@ public class PanelItemBuilderTest { //when(Bukkit.getServer()).thenReturn(server); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testIconMaterial() { PanelItemBuilder builder = new PanelItemBuilder(); diff --git a/src/test/java/world/bentobox/bentobox/api/user/NotifierTest.java b/src/test/java/world/bentobox/bentobox/api/user/NotifierTest.java index 5ab7b20b7..3d8bcd10c 100644 --- a/src/test/java/world/bentobox/bentobox/api/user/NotifierTest.java +++ b/src/test/java/world/bentobox/bentobox/api/user/NotifierTest.java @@ -29,7 +29,8 @@ public class NotifierTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java index 7e8cb5144..2a1cf05e2 100644 --- a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java +++ b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java @@ -37,6 +37,7 @@ 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; @@ -112,8 +113,9 @@ public class UserTest { } @After - public void cleanUp() { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } @Test diff --git a/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java index 0cc5995cc..5b29007e2 100644 --- a/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java @@ -111,7 +111,8 @@ public class BentoBoxReloadCommandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java b/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java index fb74ac9f5..269558e86 100644 --- a/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java +++ b/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java @@ -85,6 +85,7 @@ public class DatabaseTest { @After public void tearDown() throws Exception { dbSetup = null; + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java b/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java index eeec95388..dc6ee3af3 100644 --- a/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java +++ b/src/test/java/world/bentobox/bentobox/database/json/adapters/FlagAdapterTest.java @@ -15,6 +15,7 @@ import org.bukkit.Server; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -65,6 +66,11 @@ public class FlagAdapterTest { when(plugin.getFlagsManager()).thenReturn(flagsManager); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testWriteJsonWriterFlag() throws IOException { FlagTypeAdapter fa = new FlagTypeAdapter(plugin); diff --git a/src/test/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapterTest.java b/src/test/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapterTest.java index c1b423cd1..91b2abf19 100644 --- a/src/test/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapterTest.java +++ b/src/test/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapterTest.java @@ -26,6 +26,7 @@ import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,7 +54,7 @@ import world.bentobox.bentobox.BentoBox; public class ItemStackTypeAdapterTest { @Mock private BentoBox plugin; - + private ItemStackTypeAdapter isa; @Mock private JsonWriter out; @@ -67,10 +68,10 @@ public class ItemStackTypeAdapterTest { */ @Before public void setUp() throws Exception { - // Set up plugin + // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); - + Server server = mock(Server.class); PluginManager pim = mock(PluginManager.class); @@ -97,6 +98,11 @@ public class ItemStackTypeAdapterTest { when(ItemStack.deserialize(any())).thenReturn(new ItemStack(Material.STONE, 4)); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter#write(com.google.gson.stream.JsonWriter, org.bukkit.inventory.ItemStack)}. * @throws IOException @@ -155,7 +161,7 @@ public class ItemStackTypeAdapterTest { // Delete temp file Files.deleteIfExists(tmp.toPath()); } - + /** * Test method for {@link world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter#read(com.google.gson.stream.JsonReader)}. * @throws IOException diff --git a/src/test/java/world/bentobox/bentobox/database/objects/IslandDeletionTest.java b/src/test/java/world/bentobox/bentobox/database/objects/IslandDeletionTest.java index 0dcd7c5bf..fb742afd0 100644 --- a/src/test/java/world/bentobox/bentobox/database/objects/IslandDeletionTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/IslandDeletionTest.java @@ -13,10 +13,12 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.eclipse.jdt.annotation.Nullable; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -92,6 +94,11 @@ public class IslandDeletionTest { id = new IslandDeletion(island); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.database.objects.IslandDeletion#getLocation()}. */ diff --git a/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java b/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java index a8b97b78a..e44cbf20b 100644 --- a/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java @@ -15,6 +15,7 @@ import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.Server; import org.bukkit.World; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -90,6 +91,11 @@ public class PlayersTest { p = new Players(plugin, uuid); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testPlayersBSkyBlockUUID() { assertNotNull(new Players(plugin, UUID.randomUUID())); diff --git a/src/test/java/world/bentobox/bentobox/database/objects/adapters/LogEntryListAdapterTest.java b/src/test/java/world/bentobox/bentobox/database/objects/adapters/LogEntryListAdapterTest.java index 27fca6397..6276d3d10 100644 --- a/src/test/java/world/bentobox/bentobox/database/objects/adapters/LogEntryListAdapterTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/adapters/LogEntryListAdapterTest.java @@ -12,8 +12,10 @@ import java.util.List; import java.util.UUID; import org.bukkit.configuration.file.YamlConfiguration; +import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import world.bentobox.bentobox.api.logs.LogEntry; @@ -47,6 +49,11 @@ public class LogEntryListAdapterTest { toLog.forEach(history::add); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter#serialize(java.lang.Object)} * and {@link world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter#deserialize(java.lang.Object)}. diff --git a/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java index 7d9463d28..fdec3e78c 100644 --- a/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java +++ b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java @@ -3,7 +3,7 @@ package world.bentobox.bentobox.database.sql.mysql; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; @@ -20,6 +20,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -68,7 +69,8 @@ public class MySQLDatabaseConnectorTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java index 4198543f9..121b95ea3 100644 --- a/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java +++ b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java @@ -5,8 +5,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -21,6 +21,7 @@ import java.util.List; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -112,6 +113,11 @@ public class MySQLDatabaseHandlerTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObjects()}. * @throws SQLException diff --git a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java index fe52cfe20..8d7064fc3 100644 --- a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java +++ b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java @@ -138,6 +138,7 @@ public class YamlDatabaseHandlerTest { .sorted(Comparator.reverseOrder()) .map(Path::toFile) .forEach(File::delete); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java b/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java index b1521c470..71d87891e 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java @@ -26,6 +26,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.eclipse.jdt.annotation.NonNull; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -123,6 +124,12 @@ public class BannedCommandsTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)} */ @@ -254,8 +261,8 @@ public class BannedCommandsTest { assertTrue(e.isCancelled()); } - - + + /** * Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)} */ @@ -272,7 +279,7 @@ public class BannedCommandsTest { assertTrue(e.isCancelled()); } - + /** * Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)} */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java index 01ffa9689..251db34a3 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java @@ -1,13 +1,14 @@ package world.bentobox.bentobox.listeners; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.eq; 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; @@ -36,6 +37,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -113,8 +115,9 @@ public class BlockEndDragonTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java index a38485bfd..c8a7e58f5 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java @@ -12,6 +12,7 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -22,6 +23,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.util.Util; @@ -69,6 +71,12 @@ public class DeathListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnPlayerDeathEventDeathsCounted() { // Test diff --git a/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java index d821f8dc2..2eb58323d 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/JoinLeaveListenerTest.java @@ -34,6 +34,7 @@ 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; @@ -205,8 +206,9 @@ public class JoinLeaveListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java index c26864977..bafc80337 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java @@ -164,7 +164,9 @@ public class PanelListenerManagerTest { } @After - public void cleanUp() { + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); PanelListenerManager.getOpenPanels().clear(); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java index b9a43c191..510b2b6dd 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java @@ -20,6 +20,7 @@ import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -139,6 +140,12 @@ public class PortalTeleportationListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + private void wrongWorld() { when(iwm.inWorld(any(World.class))).thenReturn(false); when(iwm.inWorld(any(Location.class))).thenReturn(false); diff --git a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java index 39f82d619..ee85f7d23 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java @@ -140,8 +140,9 @@ public class StandardSpawnProtectionListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java index 0b52aa1e7..c37b9fe92 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java @@ -43,6 +43,7 @@ import org.junit.Ignore; 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; @@ -292,8 +293,9 @@ public class BlockInteractionListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java index 682aac310..2cf7f830a 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java @@ -198,8 +198,9 @@ public class BreakBlocksListenerTest { } @After - public void cleanUp() { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java index 5afeb0fc9..0463dc200 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListenerTest.java @@ -37,6 +37,7 @@ import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; import org.bukkit.util.Vector; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -197,6 +198,12 @@ public class BreedingListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link BreedingListener#onPlayerInteract(org.bukkit.event.player.PlayerInteractAtEntityEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java index ee9a66514..142d257d7 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BucketListenerTest.java @@ -186,8 +186,9 @@ public class BucketListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java index 2711b465b..40d7c47dc 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EggListenerTest.java @@ -3,11 +3,11 @@ package world.bentobox.bentobox.listeners.flags.protection; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.HashMap; @@ -180,8 +180,9 @@ public class EggListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java index bdaca3c97..4ae5c2197 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListenerTest.java @@ -44,6 +44,7 @@ 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; @@ -168,8 +169,9 @@ public class EntityInteractListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java index eb9058bd5..d5f438925 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ExperiencePickupListenerTest.java @@ -5,8 +5,8 @@ package world.bentobox.bentobox.listeners.flags.protection; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -27,6 +27,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Zombie; import org.bukkit.event.entity.EntityTargetEvent.TargetReason; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,6 +42,7 @@ import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -150,6 +152,12 @@ public class ExperiencePickupListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link ExperiencePickupListener#onExperienceOrbTargetPlayer(org.bukkit.event.entity.EntityTargetLivingEntityEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java index 02d373c72..3764bde23 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java @@ -27,6 +27,7 @@ import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -143,6 +144,12 @@ public class FireListenerTest { when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class)); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testCheckFire() { // Island diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java index 6e575bdb7..453bd3696 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java @@ -190,6 +190,7 @@ public class HurtingListenerTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java index b7cb125d0..b37c23eff 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java @@ -197,8 +197,9 @@ public class InventoryListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java index c2a554662..876399f5f 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java @@ -2,7 +2,7 @@ package world.bentobox.bentobox.listeners.flags.protection; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -23,6 +23,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.vehicle.VehicleMoveEvent; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -181,6 +182,12 @@ public class LockAndBanListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testTeleportToNotBannedIsland() { // Setup location outside island, one inside banned island diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java index 4f816fd32..138a08557 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListenerTest.java @@ -44,6 +44,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -195,8 +196,9 @@ public class PhysicalInteractionListenerTest { } @After - public void cleanUp() { - User.removePlayer(player); + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java index 4c650efa7..68f342c74 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListenerTest.java @@ -186,8 +186,9 @@ public class PlaceBlocksListenerTest { } @After - public void cleanUp() { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java index 26aaee169..0300c1587 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java @@ -40,6 +40,7 @@ import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -178,6 +179,12 @@ public class TNTListenerTest { when(Util.stripSpaceAfterColorCodes(anyString())).thenCallRealMethod(); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnTNTPriming() { BlockFace clickedFace = BlockFace.DOWN; diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java index 0d7e76fa7..06ddaa9d6 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/ThrowingListenerTest.java @@ -176,8 +176,9 @@ public class ThrowingListenerTest { } @After - public void cleanUp() { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java index 51809dc7f..bdce28bd9 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java @@ -24,6 +24,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +38,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.FlagsManager; @@ -87,7 +89,7 @@ public class MobSpawnListenerTest { when(Bukkit.getItemFactory()).thenReturn(itemFactory); when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger()); when(Bukkit.getPluginManager()).thenReturn(pim); - + location = mock(Location.class); when(location.getWorld()).thenReturn(world); when(location.getBlockX()).thenReturn(0); @@ -130,6 +132,12 @@ public class MobSpawnListenerTest { when(livingEntity.getLocation()).thenReturn(location); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testNotLoaded() { when(plugin.isLoaded()).thenReturn(false); @@ -199,7 +207,7 @@ public class MobSpawnListenerTest { for (SpawnReason reason: SpawnReason.values()) { when(e.getSpawnReason()).thenReturn(reason); switch (reason) { - // Natural + // Natural case DEFAULT: case DROWNED: case JOCKEY: @@ -216,10 +224,10 @@ public class MobSpawnListenerTest { case TRAP: case VILLAGE_DEFENSE: case VILLAGE_INVASION: - // These should be blocked + // These should be blocked assertTrue("Should be blocked: " + reason.toString(), l.onNaturalMobSpawn(e)); - break; - // Unnatural - player involved + break; + // Unnatural - player involved case BREEDING: case BUILD_IRONGOLEM: case BUILD_SNOWMAN: @@ -239,7 +247,7 @@ public class MobSpawnListenerTest { break; default: break; - + } } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java index 686fca2ed..f66fdf279 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java @@ -236,6 +236,7 @@ public class PVPListenerTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } private void wrongWorld() { diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java index 3e3781c60..a42527b21 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java @@ -34,6 +34,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -164,6 +165,12 @@ public class ChestDamageListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link ChestDamageListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java index d35cb4147..c31ff3a7a 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java @@ -26,6 +26,7 @@ import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.scheduler.BukkitScheduler; import org.eclipse.jdt.annotation.Nullable; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +40,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.events.BentoBoxReadyEvent; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.AddonsManager; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -132,6 +134,12 @@ public class CleanSuperFlatListenerTest { when(am.getDefaultWorldGenerator(anyString(), anyString())).thenReturn(cg); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java index 2948f34a6..f32abcdab 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java @@ -158,8 +158,9 @@ public class EnderChestListenerTest { } @After - public void cleanUp() { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } @Test diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java index d7e8ff7d7..3717a96d6 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java @@ -28,6 +28,7 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +41,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.FlagsManager; @@ -139,6 +141,11 @@ public class EndermanListenerTest { Flags.ENDERMAN_GRIEFING.setSetting(world, false); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } /** * Test method for {@link EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java index d15225501..e599ffc38 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java @@ -28,6 +28,7 @@ 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; @@ -206,6 +207,7 @@ public class EnterExitListenerTest { @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java index 922d253ad..c6b370509 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java @@ -2,13 +2,13 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; @@ -33,6 +33,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.Nullable; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -153,6 +154,12 @@ public class InvincibleVisitorsListenerTest { when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(top); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnClickWrongWorld() { when(user.inWorld()).thenReturn(false); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java index 7d5d057d9..ec1a7192c 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java @@ -114,10 +114,11 @@ public class IslandRespawnListenerTest { User.setPlugin(plugin); User.getInstance(player); } - + @After public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** @@ -131,7 +132,7 @@ public class IslandRespawnListenerTest { new IslandRespawnListener().onPlayerDeath(e); verify(world, never()).getUID(); } - + /** * Test method for {@link IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ @@ -143,7 +144,7 @@ public class IslandRespawnListenerTest { new IslandRespawnListener().onPlayerDeath(e); verify(world, never()).getUID(); } - + /** * Test method for {@link IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ @@ -156,7 +157,7 @@ public class IslandRespawnListenerTest { new IslandRespawnListener().onPlayerDeath(e); verify(world, never()).getUID(); } - + /** * Test method for {@link IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ @@ -169,7 +170,7 @@ public class IslandRespawnListenerTest { new IslandRespawnListener().onPlayerDeath(e); verify(world).getUID(); } - + /** * Test method for {@link IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ @@ -182,7 +183,7 @@ public class IslandRespawnListenerTest { new IslandRespawnListener().onPlayerDeath(e); verify(world).getUID(); } - + /** * Test method for {@link IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java index 8a5707449..2533231d1 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java @@ -28,6 +28,7 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,6 +42,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.FlagsManager; @@ -82,7 +84,7 @@ public class ItemFrameListenerTest { when(Bukkit.getPluginManager()).thenReturn(pim); ItemFactory itemFactory = mock(ItemFactory.class); - when(server.getItemFactory()).thenReturn(itemFactory); + when(server.getItemFactory()).thenReturn(itemFactory); SkullMeta skullMeta = mock(SkullMeta.class); when(itemFactory.getItemMeta(any())).thenReturn(skullMeta); @@ -140,6 +142,12 @@ public class ItemFrameListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java index bb388b5b4..3fe2bcf73 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java @@ -15,6 +15,7 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.event.block.BlockFromToEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,6 +26,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -106,6 +108,12 @@ public class LiquidsFlowingOutListenerTest { when(islandsManager.getProtectedIslandAt(toLocation)).thenReturn(Optional.empty()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Asserts that the event is never cancelled when the 'from' block is not in the world. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java index 723370830..cf28f91e3 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListenerTest.java @@ -27,6 +27,7 @@ import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -150,6 +151,12 @@ public class ObsidianScoopingListenerTest { when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty()); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnPlayerInteract() { // Test incorrect items diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java index c663dec59..a1d2304a2 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java @@ -2,8 +2,8 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -19,6 +19,7 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockGrowEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +35,7 @@ import com.google.common.collect.ImmutableSet.Builder; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -102,6 +104,12 @@ public class OfflineGrowthListenerTest { PowerMockito.mockStatic(Bukkit.class); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link OfflineGrowthListener#OnCropGrow(BlockGrowEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java index edadc120a..6a4de9e8d 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java @@ -1,8 +1,8 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -17,6 +17,7 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockRedstoneEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +33,7 @@ import com.google.common.collect.ImmutableSet.Builder; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -100,6 +102,12 @@ public class OfflineRedstoneListenerTest { PowerMockito.mockStatic(Bukkit.class); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link OfflineRedstoneListener#onBlockRedstone(BlockRedstoneEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java index 6d8058a04..be02e9d8e 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java @@ -2,7 +2,7 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -18,6 +18,7 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.event.block.BlockPistonExtendEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +31,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -107,6 +109,12 @@ public class PistonPushListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + @Test public void testOnPistonExtendFlagNotSet() { Flags.PISTON_PUSH.setSetting(world, false); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java index 79a76bedf..ac828f0d4 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Map; @@ -17,6 +17,7 @@ import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +31,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -116,6 +118,12 @@ public class RemoveMobsListenerTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java index 396032552..0ca893840 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java @@ -21,6 +21,7 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.event.world.StructureGrowEvent; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +33,7 @@ import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -115,6 +117,12 @@ public class TreesGrowingOutsideRangeListenerTest { when(islandsManager.getProtectedIslandAt(any())).thenReturn(Optional.of(island)); } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * Populates {@link TreesGrowingOutsideRangeListenerTest#blockStates} with a tree schema. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java index 12aedf529..a81ee2da6 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java @@ -27,12 +27,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; 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.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.managers.IslandWorldManager; @@ -80,7 +82,7 @@ public class WitherListenerTest { when(location.getBlockX()).thenReturn(0); when(location.getBlockY()).thenReturn(0); when(location.getBlockZ()).thenReturn(0); - + when(location2.getWorld()).thenReturn(world2); when(location2.getBlockX()).thenReturn(0); when(location2.getBlockY()).thenReturn(0); @@ -105,7 +107,9 @@ public class WitherListenerTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** @@ -122,7 +126,7 @@ public class WitherListenerTest { assertTrue(blocks.isEmpty()); } - + /** * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @@ -198,7 +202,7 @@ public class WitherListenerTest { wl.onWitherChangeBlocks(e); assertTrue(e.isCancelled()); } - + /** * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#WitherChangeBlocks(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java index ac6f2cbd5..c91a29310 100644 --- a/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/AddonsManagerTest.java @@ -22,6 +22,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -75,6 +76,7 @@ public class AddonsManagerTest { // Delete the addons folder File f = new File(plugin.getDataFolder(), "addons"); Files.deleteIfExists(f.toPath()); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java index b6593031c..976a40b0f 100644 --- a/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -143,6 +144,7 @@ public class BlueprintClipboardManagerTest { .map(Path::toFile) .forEach(File::delete); } + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java index dca962e45..79dcf4124 100644 --- a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -174,6 +174,7 @@ public class BlueprintsManagerTest { // Delete addon.jar Files.deleteIfExists(jarFile.toPath()); + Mockito.framework().clearInlineMocks(); } private void deleteDir(Path path) throws Exception { diff --git a/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java index 5b545fc0e..53563fc8c 100644 --- a/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java @@ -24,10 +24,12 @@ import org.bukkit.event.Listener; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.PluginManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -81,6 +83,11 @@ public class FlagsManagerTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testFlagsManager() { assertNotNull(new FlagsManager(plugin)); diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java index 4d9f857a4..11a17f1b7 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java @@ -27,6 +27,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -109,6 +110,7 @@ public class IslandDeletionManagerTest { @After public void tearDown() throws Exception { clearDatabase(); + Mockito.framework().clearInlineMocks(); } diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java index 1bb9c639e..516a4ce5c 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java @@ -24,6 +24,7 @@ import org.bukkit.World; import org.bukkit.entity.EntityType; import org.bukkit.scheduler.BukkitScheduler; import org.eclipse.jdt.annotation.Nullable; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -103,6 +104,11 @@ public class IslandWorldManagerTest { iwm.addGameMode(gm); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.managers.IslandWorldManager#registerWorldsToMultiverse()}. */ diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java index 44099716a..6c64fe662 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java @@ -144,7 +144,7 @@ public class IslandsManagerTest { @Before public void setUp() throws Exception { // Clear any lingering database - clear(); + tearDown(); // Set up plugin plugin = mock(BentoBox.class); Whitebox.setInternalState(BentoBox.class, "instance", plugin); @@ -312,7 +312,7 @@ public class IslandsManagerTest { } @After - public void clear() throws IOException{ + public void tearDown() throws IOException{ //remove any database data File file = new File("database"); Path pathToBeDeleted = file.toPath(); @@ -322,6 +322,7 @@ public class IslandsManagerTest { .map(Path::toFile) .forEach(File::delete); } + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java index 35a95af77..e5ca878ac 100644 --- a/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/LocalesManagerTest.java @@ -104,6 +104,9 @@ public class LocalesManagerTest { .forEach(File::delete); } + + Mockito.framework().clearInlineMocks(); + } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java index b44eaf342..cf63d458f 100644 --- a/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java @@ -10,10 +10,12 @@ import static org.mockito.Mockito.when; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -68,6 +70,11 @@ public class PlaceholdersManagerTest { pm = new PlaceholdersManager(plugin); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.managers.PlaceholdersManager#registerDefaultPlaceholders(GameModeAddon)}. */ diff --git a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java index 518acd55e..965e9cb19 100644 --- a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -156,6 +156,7 @@ public class PlayersManagerTest { .map(Path::toFile) .forEach(File::delete); } + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java index 0ca0879a6..e292b55f2 100644 --- a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java @@ -6,8 +6,10 @@ import static org.junit.Assert.assertTrue; import java.util.Map; +import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; /** * @author tastybento @@ -25,6 +27,11 @@ public class RanksManagerTest { ranksManager = new RanksManager(); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.managers.RanksManager#addRank(java.lang.String, int)}. */ diff --git a/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java index 51b3feec2..f09c7adf0 100644 --- a/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java @@ -8,14 +8,15 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.Collections; import java.util.UUID; import org.bukkit.Location; import org.bukkit.World; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -100,6 +101,11 @@ public class IslandCacheTest { ic = new IslandCache(); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test for {@link IslandCache#addIsland(Island)} */ diff --git a/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java index 4e2d7a656..e4a0db6e4 100644 --- a/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java @@ -169,7 +169,8 @@ public class NewIslandTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java b/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java index fed97428c..b3729797b 100644 --- a/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/BlueprintManagementPanelTest.java @@ -59,7 +59,7 @@ public class BlueprintManagementPanelTest { BlueprintBundle bb2; @Mock BlueprintBundle bb3; - + private BlueprintManagementPanel bmp; @Mock private BlueprintsManager bpm; @@ -73,7 +73,7 @@ public class BlueprintManagementPanelTest { */ @Before public void setUp() throws Exception { - // Set up plugin + // Set up plugin Whitebox.setInternalState(BentoBox.class, "instance", plugin); // Bukkit PowerMockito.mockStatic(Bukkit.class); @@ -120,22 +120,23 @@ public class BlueprintManagementPanelTest { map.put("test2", bb2); map.put("test3", bb3); when(bpm.getBlueprintBundles(any())).thenReturn(map); - + // Blueprint when(blueprint.getName()).thenReturn("blueprint name"); - - + + // Set up bmp = new BlueprintManagementPanel(plugin, user, addon); - + } /** * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** @@ -155,7 +156,7 @@ public class BlueprintManagementPanelTest { bmp.openBB(bb); verify(bb).getDisplayName(); verify(bb, times(3)).getBlueprint(any()); - verify(inv, times(20)).setItem(anyInt(), any()); + verify(inv, times(20)).setItem(anyInt(), any()); } /** @@ -179,7 +180,7 @@ public class BlueprintManagementPanelTest { assertEquals(Material.PAPER, pi.getItem().getType()); assertEquals("commands.admin.blueprint.management.blueprint-instruction", pi.getDescription().get(0)); } - + /** * Test method for {@link world.bentobox.bentobox.panels.BlueprintManagementPanel#getBlueprintItem(world.bentobox.bentobox.api.addons.GameModeAddon, int, world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle, world.bentobox.bentobox.blueprints.Blueprint)}. */ @@ -192,7 +193,7 @@ public class BlueprintManagementPanelTest { assertEquals(Material.BEACON, pi.getItem().getType()); assertEquals("commands.admin.blueprint.management.blueprint-instruction", pi.getDescription().get(0)); } - + /** * Test method for {@link world.bentobox.bentobox.panels.BlueprintManagementPanel#getBlueprintItem(world.bentobox.bentobox.api.addons.GameModeAddon, int, world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle, world.bentobox.bentobox.blueprints.Blueprint)}. */ diff --git a/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java b/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java index 785989657..e88ee5aaf 100644 --- a/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java @@ -1,8 +1,8 @@ package world.bentobox.bentobox.panels; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -20,6 +20,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.scheduler.BukkitScheduler; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -180,6 +181,12 @@ public class IslandCreationPanelTest { } + @After + public void tearDown() { + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + } + /** * 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)}. */ diff --git a/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java b/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java index 2432200ea..b8962a044 100644 --- a/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java +++ b/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java @@ -119,8 +119,9 @@ public class LanguagePanelTest { * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { User.clearUsers(); + Mockito.framework().clearInlineMocks(); } /** diff --git a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java index 38e203058..a9dd12849 100644 --- a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java +++ b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java @@ -17,6 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,6 +64,11 @@ public class ItemParserTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void testParseNull() { assertNull(ItemParser.parse(null)); diff --git a/src/test/java/world/bentobox/bentobox/util/UtilTest.java b/src/test/java/world/bentobox/bentobox/util/UtilTest.java index 5be5fdb65..36ef1388d 100644 --- a/src/test/java/world/bentobox/bentobox/util/UtilTest.java +++ b/src/test/java/world/bentobox/bentobox/util/UtilTest.java @@ -14,6 +14,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,6 +70,11 @@ public class UtilTest { when(server.getWorld(Mockito.anyString())).thenReturn(world); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.util.Util#getServerVersion()}. */ diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java index 82392d8b4..bd1f3fe12 100644 --- a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java @@ -2,7 +2,7 @@ package world.bentobox.bentobox.util.teleport; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,6 +10,7 @@ import java.util.Optional; import org.bukkit.Location; import org.bukkit.entity.Player; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,6 +59,11 @@ public class SafeSpotTeleportBuilderTest { } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + @Test public void test() throws Exception { sstb = new SafeSpotTeleport.Builder(plugin); diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java index d2f45a5e2..7deb32dd7 100644 --- a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java @@ -17,6 +17,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -115,6 +116,11 @@ public class SafeSpotTeleportTest { when(loc.getBlock()).thenReturn(block); } + @After + public void tearDown() { + Mockito.framework().clearInlineMocks(); + } + /** * Test method for {@link world.bentobox.bentobox.util.teleport.SafeSpotTeleport#SafeSpotTeleport(world.bentobox.bentobox.BentoBox, org.bukkit.entity.Entity, org.bukkit.Location, java.lang.String, boolean, int)}. */