Now using the new listeners from ecb97fd5c1

This commit is contained in:
main() 2012-01-23 19:09:13 +01:00 committed by Eric Stokes
parent 0980e0a201
commit 33afa4d0d7
1 changed files with 11 additions and 17 deletions

View File

@ -8,7 +8,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Difficulty; import org.bukkit.Difficulty;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -22,10 +21,7 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.internal.verification.VerificationModeFactory; 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.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunner;
@ -43,7 +39,6 @@ import com.onarandombox.MultiverseCore.utils.WorldManager;
public class TestWorldProperties { public class TestWorldProperties {
private TestInstanceCreator creator; private TestInstanceCreator creator;
private Server mockServer;
private MultiverseCore core; private MultiverseCore core;
private CommandSender mockCommandSender; private CommandSender mockCommandSender;
@ -51,7 +46,6 @@ public class TestWorldProperties {
public void setUp() throws Exception { public void setUp() throws Exception {
creator = new TestInstanceCreator(); creator = new TestInstanceCreator();
assertTrue(creator.setUp()); assertTrue(creator.setUp());
mockServer = creator.getServer();
core = creator.getCore(); core = creator.getCore();
mockCommandSender = creator.getCommandSender(); mockCommandSender = creator.getCommandSender();
} }
@ -140,25 +134,25 @@ public class TestWorldProperties {
when(playerNewJoinEvent.getPlayer()).thenReturn(mockNewPlayer); when(playerNewJoinEvent.getPlayer()).thenReturn(mockNewPlayer);
// call both weather change events // call both weather change events
core.getWeatherListener().onWeatherChange(weatherChangeOffEvent); core.getWeatherListener().weatherChange(weatherChangeOffEvent);
assertFalse(weatherChangeOffEvent.isCancelled()); assertFalse(weatherChangeOffEvent.isCancelled());
core.getWeatherListener().onWeatherChange(weatherChangeOnEvent); core.getWeatherListener().weatherChange(weatherChangeOnEvent);
assertFalse(weatherChangeOnEvent.isCancelled()); assertFalse(weatherChangeOnEvent.isCancelled());
// call both thunder change events // call both thunder change events
core.getWeatherListener().onThunderChange(thunderChangeOffEvent); core.getWeatherListener().thunderChange(thunderChangeOffEvent);
assertFalse(thunderChangeOffEvent.isCancelled()); assertFalse(thunderChangeOffEvent.isCancelled());
core.getWeatherListener().onThunderChange(thunderChangeOnEvent); core.getWeatherListener().thunderChange(thunderChangeOnEvent);
assertFalse(thunderChangeOnEvent.isCancelled()); assertFalse(thunderChangeOnEvent.isCancelled());
// call player chat event // call player chat event
core.getPlayerListener().onPlayerChat(playerChatEvent); core.getPlayerListener().playerChat(playerChatEvent);
verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format"); verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
// call player join events // call player join events
core.getPlayerListener().onPlayerJoin(playerJoinEvent); core.getPlayerListener().playerJoin(playerJoinEvent);
verify(mockPlayer, never()).teleport(any(Location.class)); verify(mockPlayer, never()).teleport(any(Location.class));
core.getPlayerListener().onPlayerJoin(playerNewJoinEvent); core.getPlayerListener().playerJoin(playerNewJoinEvent);
verify(mockNewPlayer).teleport(worldManager.getFirstSpawnWorld().getSpawnLocation()); verify(mockNewPlayer).teleport(worldManager.getFirstSpawnWorld().getSpawnLocation());
/* ****************************************** * /* ****************************************** *
@ -216,15 +210,15 @@ public class TestWorldProperties {
* Call some events and verify behavior * Call some events and verify behavior
* ****************************************** */ * ****************************************** */
// call both weather change events // call both weather change events
core.getWeatherListener().onWeatherChange(weatherChangeOffEvent); core.getWeatherListener().weatherChange(weatherChangeOffEvent);
assertFalse(weatherChangeOffEvent.isCancelled()); assertFalse(weatherChangeOffEvent.isCancelled());
core.getWeatherListener().onWeatherChange(weatherChangeOnEvent); core.getWeatherListener().weatherChange(weatherChangeOnEvent);
assertTrue(weatherChangeOnEvent.isCancelled()); assertTrue(weatherChangeOnEvent.isCancelled());
// call both thunder change events // call both thunder change events
core.getWeatherListener().onThunderChange(thunderChangeOffEvent); core.getWeatherListener().thunderChange(thunderChangeOffEvent);
assertFalse(thunderChangeOffEvent.isCancelled()); assertFalse(thunderChangeOffEvent.isCancelled());
core.getWeatherListener().onThunderChange(thunderChangeOnEvent); core.getWeatherListener().thunderChange(thunderChangeOnEvent);
assertTrue(thunderChangeOnEvent.isCancelled()); assertTrue(thunderChangeOnEvent.isCancelled());
} }