From ef398dc098f4e2e26de6c65affd9d182abe65eca Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Sun, 13 Sep 2015 01:25:00 +0100 Subject: [PATCH] Add a test around ChatMessageHandler, update imports Update the previous ItemOnItemVerificationHandler test to use static imports of PowerMockito and Assert. --- .../handler/ChatMessageHandlerTest.java | 34 +++++++++++++++++++ .../ItemOnItemVerificationHandlerTest.java | 17 +++++----- 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 game/src/test/org/apollo/game/message/handler/ChatMessageHandlerTest.java diff --git a/game/src/test/org/apollo/game/message/handler/ChatMessageHandlerTest.java b/game/src/test/org/apollo/game/message/handler/ChatMessageHandlerTest.java new file mode 100644 index 00000000..2cb25f47 --- /dev/null +++ b/game/src/test/org/apollo/game/message/handler/ChatMessageHandlerTest.java @@ -0,0 +1,34 @@ +package org.apollo.game.message.handler; + +import org.apollo.game.message.impl.ChatMessage; +import org.apollo.game.model.World; +import org.apollo.game.model.entity.Player; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import static org.junit.Assert.*; +import static org.powermock.api.mockito.PowerMockito.*; + + +@RunWith(PowerMockRunner.class) +@PrepareForTest({Player.class}) +public class ChatMessageHandlerTest { + + private final World world = new World(); + private final ChatMessageHandler chatMessageHandler = new ChatMessageHandler(world); + + @Test + public void testTerminatedIfMuted() throws Exception { + Player player = PowerMockito.mock(Player.class); + + when(player.isMuted()).thenReturn(true); + + ChatMessage chatMessage = new ChatMessage("Test", "Test".getBytes(), 0, 0); + chatMessageHandler.handle(player, chatMessage); + + assertTrue("ChatMessageHandler: player can send messages when muted", chatMessage.terminated()); + } +} \ No newline at end of file diff --git a/game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTest.java b/game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTest.java index 8098ca94..3542c858 100644 --- a/game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTest.java +++ b/game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTest.java @@ -10,12 +10,11 @@ import org.apollo.game.model.inv.Inventory; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; +import static org.powermock.api.mockito.PowerMockito.*; @RunWith(PowerMockRunner.class) @PrepareForTest({Player.class, ItemDefinition.class}) @@ -28,17 +27,17 @@ public class ItemOnItemVerificationHandlerTest { @BeforeClass public static void setupTestItemDefinitions() { - PowerMockito.mockStatic(ItemDefinition.class); - Mockito.when(ItemDefinition.lookup(4151)).thenReturn(new ItemDefinition(4151)); + mockStatic(ItemDefinition.class); + when(ItemDefinition.lookup(4151)).thenReturn(new ItemDefinition(4151)); } @Test public void testTerminateWithNoSourceItem() throws Exception { - Player player = PowerMockito.mock(Player.class); + Player player = mock(Player.class); Inventory inventory = new Inventory(28); inventory.set(1, new Item(4151, 1)); - Mockito.when(player.getInventory()).thenReturn(inventory); + when(player.getInventory()).thenReturn(inventory); ItemOnItemMessage itemOnItemMessage = new ItemOnItemMessage(BankConstants.SIDEBAR_INVENTORY_ID, 500, 1, BankConstants.SIDEBAR_INVENTORY_ID, 4151, 1); @@ -51,11 +50,11 @@ public class ItemOnItemVerificationHandlerTest { @Test public void testTerminateWithNoTargetItem() throws Exception { - Player player = PowerMockito.mock(Player.class); + Player player = mock(Player.class); Inventory inventory = new Inventory(28); inventory.set(1, new Item(4151, 1)); - Mockito.when(player.getInventory()).thenReturn(inventory); + when(player.getInventory()).thenReturn(inventory); ItemOnItemMessage itemOnItemMessage = new ItemOnItemMessage(BankConstants.SIDEBAR_INVENTORY_ID, 4151, 1, BankConstants.SIDEBAR_INVENTORY_ID, 4152, 2);