diff --git a/pom.xml b/pom.xml index 58b76328..71c21e40 100644 --- a/pom.xml +++ b/pom.xml @@ -351,12 +351,6 @@ 3.11.2 test - - org.easymock - easymock - 4.0.2 - test - commons-io commons-io diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java b/src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java index aa6bc92d..41a8cb0c 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java @@ -14,12 +14,9 @@ import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import java.io.File; diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java b/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java index cd718ab1..f45c3e01 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java @@ -7,28 +7,28 @@ import com.onarandombox.MultiverseCore.utils.MockWorldFactory; import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.World; import org.bukkit.WorldType; -import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Sheep; import org.bukkit.entity.Zombie; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import java.lang.reflect.Field; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestEntitySpawnRules { TestInstanceCreator creator; @@ -151,6 +151,6 @@ public class TestEntitySpawnRules { when(zombie.getType()).thenReturn(EntityType.ZOMBIE); when(zombie.getWorld()).thenReturn(this.cbworld); - when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie)); + when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie)); } } diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java b/src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java index b316f655..e222c83a 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java @@ -2,17 +2,16 @@ package com.onarandombox.MultiverseCore; import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.Material; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class TestEntryFeeConversion { diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java b/src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java index 0a57dd63..422f1ea9 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java @@ -6,14 +6,13 @@ import org.bukkit.Server; import org.bukkit.World.Environment; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java index 1b489114..3766e46a 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java @@ -13,8 +13,6 @@ import com.onarandombox.MultiverseCore.configuration.SpawnLocation; import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener; import com.onarandombox.MultiverseCore.utils.MockWorldFactory; import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; -import com.onarandombox.MultiverseCore.utils.WorldManager; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Difficulty; import org.bukkit.GameMode; @@ -36,22 +34,25 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent; -import org.bukkit.permissions.Permission; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.internal.verification.VerificationModeFactory; import java.io.File; -import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestWorldProperties { private TestInstanceCreator creator; @@ -112,7 +113,7 @@ public class TestWorldProperties { String[] netherArgs = new String[] { "import", "world_nether", "nether" }; core.onCommand(mockCommandSender, mockCommand, "", netherArgs); verify(mockCommandSender).sendMessage("Starting import of world 'world_nether'..."); - verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage( + verify(mockCommandSender, times(2)).sendMessage( ChatColor.GREEN + "Complete!"); assertEquals(core.getServer().getWorlds().size(), 2); @@ -212,7 +213,7 @@ public class TestWorldProperties { assertTrue(mvWorld.setColor("BLACK")); assertFalse(mvWorld.setColor("INVALID COLOR")); assertEquals(ChatColor.BLACK, mvWorld.getColor()); - assertEquals(ChatColor.BLACK.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString()); + assertEquals(ChatColor.BLACK + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString()); mvWorld.setPVPMode(false); assertEquals(false, mvWorld.isPVPEnabled()); assertTrue(mvWorld.setScaling(2D)); @@ -319,7 +320,7 @@ public class TestWorldProperties { assertEquals(true, mvWorld.isHidden()); assertEquals("alias", mvWorld.getAlias()); assertEquals(ChatColor.GREEN, mvWorld.getColor()); - assertEquals(ChatColor.GREEN.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString()); + assertEquals(ChatColor.GREEN + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString()); assertEquals(false, mvWorld.isPVPEnabled()); assertEquals(2D, mvWorld.getScaling(), 0); assertSame(worldManager.getMVWorld("world_nether").getCBWorld(), diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java index 028f1a05..5cf278c1 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java @@ -4,21 +4,20 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.api.WorldPurger; import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.World; -import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Sheep; import org.bukkit.entity.Zombie; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import java.util.Arrays; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestWorldPurger { TestInstanceCreator creator; @@ -115,6 +114,6 @@ public class TestWorldPurger { zombie = mock(Zombie.class); when(zombie.getType()).thenReturn(EntityType.ZOMBIE); when(zombie.getWorld()).thenReturn(world); - when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie)); + when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie)); } } diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java index eb0d9f29..51a5e418 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java @@ -12,31 +12,29 @@ import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException; import com.onarandombox.MultiverseCore.utils.MockWorldFactory; import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher; -import com.onarandombox.MultiverseCore.utils.WorldManager; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.Server; import org.bukkit.WorldCreator; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.permissions.Permission; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPluginLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; -import org.mockito.Matchers; import org.mockito.internal.verification.VerificationModeFactory; import java.io.File; -import static junit.framework.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestWorldStuff { diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java b/src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java index 16dea6b7..5dfb87f7 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java @@ -1,7 +1,8 @@ package com.onarandombox.MultiverseCore.utils; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import java.io.IOException; import java.nio.file.Files; @@ -10,10 +11,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.dumptruckman.minecraft.util.Logging; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class FileUtilsTest { @@ -137,7 +136,7 @@ public class FileUtilsTest { assertTrue(Files.isRegularFile(targetChildDirFile)); } - @Test() + @Test public void copyFolder_intoExistingFolder_whereFileExists() throws Exception { Path targetDir = Files.createDirectory(tempDir.resolve("target")); Path targetFile = Files.createFile(targetDir.resolve("parentDirFile.txt")); diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java b/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java index 7f470fe5..aecf9697 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java @@ -21,13 +21,17 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.WeakHashMap; -import java.util.LinkedHashMap; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class MockWorldFactory { diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java b/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java index b36f9366..c6c83705 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java @@ -27,7 +27,6 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.scheduler.BukkitScheduler; -import org.mockito.ArgumentMatchers; import org.mockito.internal.util.reflection.ReflectionMemberAccessor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -41,16 +40,16 @@ import java.util.logging.Level; import java.util.logging.Logger; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.when; public class TestInstanceCreator { private MultiverseCore core; @@ -147,7 +146,7 @@ public class TestInstanceCreator { when(mockServer.getPluginManager()).thenReturn(mockPluginManager); - when(mockServer.createWorld(ArgumentMatchers.isA(WorldCreator.class))).thenAnswer( + when(mockServer.createWorld(isA(WorldCreator.class))).thenAnswer( new Answer() { @Override public World answer(InvocationOnMock invocation) throws Throwable { @@ -254,9 +253,9 @@ public class TestInstanceCreator { when(commandSender.getServer()).thenReturn(mockServer); when(commandSender.getName()).thenReturn("MockCommandSender"); when(commandSender.isPermissionSet(anyString())).thenReturn(true); - when(commandSender.isPermissionSet(ArgumentMatchers.isA(Permission.class))).thenReturn(true); + when(commandSender.isPermissionSet(isA(Permission.class))).thenReturn(true); when(commandSender.hasPermission(anyString())).thenReturn(true); - when(commandSender.hasPermission(ArgumentMatchers.isA(Permission.class))).thenReturn(true); + when(commandSender.hasPermission(isA(Permission.class))).thenReturn(true); when(commandSender.addAttachment(core)).thenReturn(null); when(commandSender.isOp()).thenReturn(true); diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/Util.java b/src/test/java/com/onarandombox/MultiverseCore/utils/Util.java index dd00e021..974720d0 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/Util.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/Util.java @@ -10,8 +10,8 @@ package com.onarandombox.MultiverseCore.utils; import java.util.logging.ConsoleHandler; import java.util.logging.Handler; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; +import java.util.logging.LogRecord; public class Util { private Util() {} diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java b/src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java index 5aa21841..3a13bb36 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java @@ -11,7 +11,7 @@ import org.bukkit.WorldCreator; import org.mockito.ArgumentMatcher; public class WorldCreatorMatcher implements ArgumentMatcher { - private WorldCreator worldCreator; + private final WorldCreator worldCreator; private boolean careAboutSeeds = false; private boolean careAboutGenerators = false;