From 33afa4d0d7a13fa71fb0890262d1bcebd45c5ae9 Mon Sep 17 00:00:00 2001 From: "main()" Date: Mon, 23 Jan 2012 19:09:13 +0100 Subject: [PATCH] Now using the new listeners from ecb97fd5c1b2d40cd67568a242d38de3fdf087b1 --- .../test/TestWorldProperties.java | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java index 97aaf8d1..60b47cdb 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java +++ b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java @@ -8,7 +8,6 @@ import org.bukkit.ChatColor; import org.bukkit.Difficulty; import org.bukkit.GameMode; import org.bukkit.Location; -import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,10 +21,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.internal.verification.VerificationModeFactory; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -43,7 +39,6 @@ import com.onarandombox.MultiverseCore.utils.WorldManager; public class TestWorldProperties { private TestInstanceCreator creator; - private Server mockServer; private MultiverseCore core; private CommandSender mockCommandSender; @@ -51,7 +46,6 @@ public class TestWorldProperties { public void setUp() throws Exception { creator = new TestInstanceCreator(); assertTrue(creator.setUp()); - mockServer = creator.getServer(); core = creator.getCore(); mockCommandSender = creator.getCommandSender(); } @@ -140,25 +134,25 @@ public class TestWorldProperties { when(playerNewJoinEvent.getPlayer()).thenReturn(mockNewPlayer); // call both weather change events - core.getWeatherListener().onWeatherChange(weatherChangeOffEvent); + core.getWeatherListener().weatherChange(weatherChangeOffEvent); assertFalse(weatherChangeOffEvent.isCancelled()); - core.getWeatherListener().onWeatherChange(weatherChangeOnEvent); + core.getWeatherListener().weatherChange(weatherChangeOnEvent); assertFalse(weatherChangeOnEvent.isCancelled()); // call both thunder change events - core.getWeatherListener().onThunderChange(thunderChangeOffEvent); + core.getWeatherListener().thunderChange(thunderChangeOffEvent); assertFalse(thunderChangeOffEvent.isCancelled()); - core.getWeatherListener().onThunderChange(thunderChangeOnEvent); + core.getWeatherListener().thunderChange(thunderChangeOnEvent); assertFalse(thunderChangeOnEvent.isCancelled()); // call player chat event - core.getPlayerListener().onPlayerChat(playerChatEvent); + core.getPlayerListener().playerChat(playerChatEvent); verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format"); // call player join events - core.getPlayerListener().onPlayerJoin(playerJoinEvent); + core.getPlayerListener().playerJoin(playerJoinEvent); verify(mockPlayer, never()).teleport(any(Location.class)); - core.getPlayerListener().onPlayerJoin(playerNewJoinEvent); + core.getPlayerListener().playerJoin(playerNewJoinEvent); verify(mockNewPlayer).teleport(worldManager.getFirstSpawnWorld().getSpawnLocation()); /* ****************************************** * @@ -216,15 +210,15 @@ public class TestWorldProperties { * Call some events and verify behavior * ****************************************** */ // call both weather change events - core.getWeatherListener().onWeatherChange(weatherChangeOffEvent); + core.getWeatherListener().weatherChange(weatherChangeOffEvent); assertFalse(weatherChangeOffEvent.isCancelled()); - core.getWeatherListener().onWeatherChange(weatherChangeOnEvent); + core.getWeatherListener().weatherChange(weatherChangeOnEvent); assertTrue(weatherChangeOnEvent.isCancelled()); // call both thunder change events - core.getWeatherListener().onThunderChange(thunderChangeOffEvent); + core.getWeatherListener().thunderChange(thunderChangeOffEvent); assertFalse(thunderChangeOffEvent.isCancelled()); - core.getWeatherListener().onThunderChange(thunderChangeOnEvent); + core.getWeatherListener().thunderChange(thunderChangeOnEvent); assertTrue(thunderChangeOnEvent.isCancelled()); }