From: Astrid S. <ast...@us...> - 2007-12-13 22:52:23
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26695/tests/games/stendhal/server/actions Modified Files: CommandCenterTest.java LookActionTest.java AwayActionTest.java AdministrationActionTest.java OutfitActionTest.java FaceActionTest.java StopActionTest.java Log Message: code format and minor changes Index: FaceActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/FaceActionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FaceActionTest.java 10 Dec 2007 22:40:29 -0000 1.1 --- FaceActionTest.java 13 Dec 2007 22:52:18 -0000 1.2 *************** *** 21,27 **** } ! boolean stopCalled; ! Direction directionSet; ! boolean notifyCalled; @Test --- 21,27 ---- } ! private boolean stopCalled; ! private Direction directionSet; ! private boolean notifyCalled; @Test *************** *** 37,41 **** @Override ! public void setDirection(Direction dir) { directionSet = dir; } --- 37,41 ---- @Override ! public void setDirection(final Direction dir) { directionSet = dir; } Index: LookActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/LookActionTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LookActionTest.java 9 Dec 2007 22:08:50 -0000 1.2 --- LookActionTest.java 13 Dec 2007 22:52:18 -0000 1.3 *************** *** 19,23 **** /** ! * Test server actions * @author Martin Fuchs */ --- 19,24 ---- /** ! * Test server actions. ! * * @author Martin Fuchs */ *************** *** 32,36 **** @Before public void setup() { ! MockStendhalRPRuleProcessor processor = MockStendhalRPRuleProcessor.get(); StendhalRPZone zone = new StendhalRPZone("testzone"); --- 33,38 ---- @Before public void setup() { ! MockStendhalRPRuleProcessor processor = MockStendhalRPRuleProcessor ! .get(); StendhalRPZone zone = new StendhalRPZone("testzone"); *************** *** 58,77 **** assertNotNull(player2); ! // test "/look <name>" syntax RPAction action = new RPAction(); action.put("type", "look"); action.put("target", "player1"); CommandCenter.execute(player1, action); ! assertEquals("You see player1.\n"+ ! "player1 is level 0 and has been playing 0 hours and 0 minutes.", player1.getPrivateText()); player1.clearEvents(); ! // test "/look #id" syntax action = new RPAction(); action.put("type", "look"); ! action.put("target", "#" + Integer.toString(player2.getID().getObjectID())); CommandCenter.execute(player1, action); ! assertEquals("You see player2.\n"+ ! "player2 is level 0 and has been playing 0 hours and 0 minutes.", player1.getPrivateText()); player1.clearEvents(); --- 60,82 ---- assertNotNull(player2); ! // test "/look <name>" syntax RPAction action = new RPAction(); action.put("type", "look"); action.put("target", "player1"); CommandCenter.execute(player1, action); ! assertEquals( ! "You see player1.\nplayer1 is level 0 and has been playing 0 hours and 0 minutes.", ! player1.getPrivateText()); player1.clearEvents(); ! // test "/look #id" syntax action = new RPAction(); action.put("type", "look"); ! action.put("target", "#" ! + Integer.toString(player2.getID().getObjectID())); CommandCenter.execute(player1, action); ! assertEquals( ! "You see player2.\nplayer2 is level 0 and has been playing 0 hours and 0 minutes.", ! player1.getPrivateText()); player1.clearEvents(); Index: StopActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/StopActionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StopActionTest.java 10 Dec 2007 18:27:30 -0000 1.1 --- StopActionTest.java 13 Dec 2007 22:52:18 -0000 1.2 *************** *** 45,49 **** notify = false; stopattack = false; ! sa.onAction(player, action); --- 45,49 ---- notify = false; stopattack = false; ! sa.onAction(player, action); *************** *** 53,58 **** } ! boolean stopattack; ! boolean notify; } --- 53,58 ---- } ! private boolean stopattack; ! private boolean notify; } Index: AwayActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/AwayActionTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AwayActionTest.java 12 Dec 2007 16:49:57 -0000 1.2 --- AwayActionTest.java 13 Dec 2007 22:52:18 -0000 1.3 *************** *** 13,24 **** @Test public void testPlayerIsNull() { ! RPAction action = new RPAction(); action.put("type", "away"); ! AwayAction aa = new AwayAction(); aa.onAction(null, action); - - } --- 13,22 ---- @Test public void testPlayerIsNull() { ! RPAction action = new RPAction(); action.put("type", "away"); ! AwayAction aa = new AwayAction(); aa.onAction(null, action); } *************** *** 28,39 **** RPAction action = new RPAction(); action.put("type", "away"); ! AwayAction aa = new AwayAction(); aa.onAction(bob, action); ! assertEquals(null,bob.getAwayMessage()); action.put("message", "bla"); aa.onAction(bob, action); ! assertEquals("bla",bob.getAwayMessage()); } ! @Test public void testOnInvalidAction() { --- 26,37 ---- RPAction action = new RPAction(); action.put("type", "away"); ! AwayAction aa = new AwayAction(); aa.onAction(bob, action); ! assertEquals(null, bob.getAwayMessage()); action.put("message", "bla"); aa.onAction(bob, action); ! assertEquals("bla", bob.getAwayMessage()); } ! @Test public void testOnInvalidAction() { *************** *** 43,51 **** action.put("type", "bla"); action.put("message", "bla"); ! AwayAction aa = new AwayAction(); aa.onAction(bob, action); ! assertEquals(null,bob.getAwayMessage()); ! ! } --- 41,48 ---- action.put("type", "bla"); action.put("message", "bla"); ! AwayAction aa = new AwayAction(); aa.onAction(bob, action); ! assertEquals(null, bob.getAwayMessage()); ! } Index: OutfitActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/OutfitActionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OutfitActionTest.java 10 Dec 2007 14:04:06 -0000 1.1 --- OutfitActionTest.java 13 Dec 2007 22:52:18 -0000 1.2 *************** *** 18,36 **** } ! @Test (expected = NullPointerException.class ) public void testOnActionNullNull() { OutfitAction oa = new OutfitAction(); ! oa.onAction(null,null); } ! ! @Test public void testOnWrongAction() { OutfitAction oa = new OutfitAction(); Player player = PlayerTestHelper.createPlayer(); RPAction action = new RPAction(); ! oa.onAction(player,action); ! assertTrue("no exception thrown",true); } ! @Test (expected= NumberFormatException.class) public void testOnActionWrongValue() { OutfitAction oa = new OutfitAction(); --- 18,37 ---- } ! @Test(expected = NullPointerException.class) public void testOnActionNullNull() { OutfitAction oa = new OutfitAction(); ! oa.onAction(null, null); } ! ! @Test public void testOnWrongAction() { OutfitAction oa = new OutfitAction(); Player player = PlayerTestHelper.createPlayer(); RPAction action = new RPAction(); ! oa.onAction(player, action); ! assertTrue("no exception thrown", true); } ! ! @Test(expected = NumberFormatException.class) public void testOnActionWrongValue() { OutfitAction oa = new OutfitAction(); *************** *** 38,45 **** RPAction action = new RPAction(); action.put("value", "schnick"); ! oa.onAction(player,action); ! } ! @Test public void testOnAction() { OutfitAction oa = new OutfitAction(); --- 39,47 ---- RPAction action = new RPAction(); action.put("value", "schnick"); ! oa.onAction(player, action); ! } ! ! @Test public void testOnAction() { OutfitAction oa = new OutfitAction(); *************** *** 48,59 **** assertNull(player.get("outfit")); action.put("value", 1); ! oa.onAction(player,action); assertTrue(player.has("outfit")); ! assertEquals("1",player.get("outfit")); ! action.put("value", 51515151); ! oa.onAction(player,action); assertTrue(player.has("outfit")); ! assertEquals("invalid player outfit","1",player.get("outfit")); } --- 50,61 ---- assertNull(player.get("outfit")); action.put("value", 1); ! oa.onAction(player, action); assertTrue(player.has("outfit")); ! assertEquals("1", player.get("outfit")); ! action.put("value", 51515151); ! oa.onAction(player, action); assertTrue(player.has("outfit")); ! assertEquals("invalid player outfit", "1", player.get("outfit")); } Index: AdministrationActionTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/AdministrationActionTest.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** AdministrationActionTest.java 9 Dec 2007 23:20:15 -0000 1.30 --- AdministrationActionTest.java 13 Dec 2007 22:52:18 -0000 1.31 *************** *** 1,5 **** package games.stendhal.server.actions; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; --- 1,4 ---- *************** *** 49,74 **** @Test public final void testGetLevelForCommand() { ! assertEquals(-1,AdministrationAction.getLevelForCommand("unkown").intValue()); ! assertEquals(0, AdministrationAction.getLevelForCommand("adminlevel").intValue()); ! assertEquals(100, AdministrationAction.getLevelForCommand("support").intValue()); ! assertEquals(50, AdministrationAction ! .getLevelForCommand("supportanswer").intValue()); ! assertEquals(200, AdministrationAction.getLevelForCommand("tellall").intValue()); ! assertEquals(300, AdministrationAction.getLevelForCommand("teleportto").intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("teleport").intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("jail").intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("gag").intValue()); ! assertEquals(500, AdministrationAction.getLevelForCommand("invisible").intValue()); ! assertEquals(500, AdministrationAction.getLevelForCommand("ghostmode").intValue()); ! assertEquals(500, AdministrationAction ! .getLevelForCommand("teleclickmode").intValue()); ! assertEquals(600, AdministrationAction.getLevelForCommand("inspect").intValue()); ! assertEquals(700, AdministrationAction.getLevelForCommand("destroy").intValue()); ! assertEquals(800, AdministrationAction.getLevelForCommand("summon").intValue()); ! assertEquals(800, AdministrationAction.getLevelForCommand("summonat").intValue()); ! assertEquals(900, AdministrationAction.getLevelForCommand("alter").intValue()); ! assertEquals(900, AdministrationAction ! .getLevelForCommand("altercreature").intValue()); ! assertEquals(5000, AdministrationAction.getLevelForCommand("super").intValue()); } --- 48,89 ---- @Test public final void testGetLevelForCommand() { ! assertEquals(-1, AdministrationAction.getLevelForCommand("unkown") ! .intValue()); ! assertEquals(0, AdministrationAction.getLevelForCommand("adminlevel") ! .intValue()); ! assertEquals(100, AdministrationAction.getLevelForCommand("support") ! .intValue()); ! assertEquals(50, AdministrationAction.getLevelForCommand( ! "supportanswer").intValue()); ! assertEquals(200, AdministrationAction.getLevelForCommand("tellall") ! .intValue()); ! assertEquals(300, AdministrationAction.getLevelForCommand("teleportto") ! .intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("teleport") ! .intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("jail") ! .intValue()); ! assertEquals(400, AdministrationAction.getLevelForCommand("gag") ! .intValue()); ! assertEquals(500, AdministrationAction.getLevelForCommand("invisible") ! .intValue()); ! assertEquals(500, AdministrationAction.getLevelForCommand("ghostmode") ! .intValue()); ! assertEquals(500, AdministrationAction.getLevelForCommand( ! "teleclickmode").intValue()); ! assertEquals(600, AdministrationAction.getLevelForCommand("inspect") ! .intValue()); ! assertEquals(700, AdministrationAction.getLevelForCommand("destroy") ! .intValue()); ! assertEquals(800, AdministrationAction.getLevelForCommand("summon") ! .intValue()); ! assertEquals(800, AdministrationAction.getLevelForCommand("summonat") ! .intValue()); ! assertEquals(900, AdministrationAction.getLevelForCommand("alter") ! .intValue()); ! assertEquals(900, AdministrationAction.getLevelForCommand( ! "altercreature").intValue()); ! assertEquals(5000, AdministrationAction.getLevelForCommand("super") ! .intValue()); } *************** *** 78,82 **** assertFalse(AdministrationAction.isPlayerAllowedToExecuteAdminCommand( pl, "", true)); ! //assertEquals("Sorry, command \"\" is unknown.", pl.getPrivateText()); assertTrue(AdministrationAction.isPlayerAllowedToExecuteAdminCommand( pl, "adminlevel", true)); --- 93,97 ---- assertFalse(AdministrationAction.isPlayerAllowedToExecuteAdminCommand( pl, "", true)); ! // assertEquals("Sorry, command \"\" is unknown.", pl.getPrivateText()); assertTrue(AdministrationAction.isPlayerAllowedToExecuteAdminCommand( pl, "adminlevel", true)); *************** *** 108,112 **** MockStendhalRPRuleProcessor.get().getPlayers().add(pl); ! CommandCenter.execute(pl, new RPAction()); assertEquals("Unknown command null", pl.getPrivateText()); --- 123,127 ---- MockStendhalRPRuleProcessor.get().getPlayers().add(pl); ! CommandCenter.execute(pl, new RPAction()); assertEquals("Unknown command null", pl.getPrivateText()); *************** *** 134,146 **** action.put("target", "bob"); CommandCenter.execute(pl, action); ! assertEquals("Support (player) tells you: huhu", bob ! .getPrivateText()); bob.clearEvents(); pl.clearEvents(); pl.put("adminlevel", 0); ! assertEquals("0",pl.get("adminlevel")); CommandCenter.execute(pl, action); ! assertEquals("Sorry, you need to be an admin to run \"supportanswer\".", pl ! .getPrivateText()); } --- 149,161 ---- action.put("target", "bob"); CommandCenter.execute(pl, action); ! assertEquals("Support (player) tells you: huhu", bob.getPrivateText()); bob.clearEvents(); pl.clearEvents(); pl.put("adminlevel", 0); ! assertEquals("0", pl.get("adminlevel")); CommandCenter.execute(pl, action); ! assertEquals( ! "Sorry, you need to be an admin to run \"supportanswer\".", pl ! .getPrivateText()); } *************** *** 178,182 **** public final void testTeleportActionToValidZone() { - StendhalRPZone zoneTo = new StendhalRPZone("zoneTo"); Player pl = PlayerTestHelper.createPlayer(); --- 193,196 ---- *************** *** 245,250 **** } - - @Test public final void testOnAlterActionWrongAttribute() { --- 259,262 ---- *************** *** 617,621 **** RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target","hugo" ); CommandCenter.execute(pl, action); --- 629,633 ---- RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target", "hugo"); CommandCenter.execute(pl, action); *************** *** 632,636 **** testzone.add(pl); ! assertEquals(1,npc.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); --- 644,648 ---- testzone.add(pl); ! assertEquals(1, npc.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); *************** *** 639,658 **** RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target","#1" ); CommandCenter.execute(pl, action); assertEquals("You can't remove SpeakerNPCs", pl.getPrivateText()); } @Test public final void testOnDestroyRat() { Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1,rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); --- 651,671 ---- RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target", "#1"); CommandCenter.execute(pl, action); assertEquals("You can't remove SpeakerNPCs", pl.getPrivateText()); } + @Test public final void testOnDestroyRat() { Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1, rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); *************** *** 661,665 **** RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target","#1" ); CommandCenter.execute(pl, action); --- 674,678 ---- RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("target", "#1"); CommandCenter.execute(pl, action); *************** *** 671,681 **** Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1,rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); --- 684,694 ---- Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1, rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); *************** *** 684,688 **** RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("targetid",1 ); CommandCenter.execute(pl, action); --- 697,701 ---- RPAction action = new RPAction(); action.put("type", "destroy"); ! action.put("targetid", 1); CommandCenter.execute(pl, action); *************** *** 693,703 **** public final void testOnInspectRatWithTargetID() { Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1,rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); --- 706,716 ---- public final void testOnInspectRatWithTargetID() { Player pl = PlayerTestHelper.createPlayer("hugo"); ! Creature rat = new RaidCreature(StendhalRPWorld.get().getRuleManager() ! .getEntityManager().getCreature("rat")); StendhalRPZone testzone = new StendhalRPZone("Testzone"); testzone.add(rat); testzone.add(pl); ! assertEquals(1, rat.getID().getObjectID()); pl.put("adminlevel", 5000); pl.clearEvents(); *************** *** 706,713 **** RPAction action = new RPAction(); action.put("type", "inspect"); ! action.put("targetid",1 ); CommandCenter.execute(pl, action); ! assertTrue( pl.getPrivateText().startsWith("Inspected creature is called \"rat\" and has the following attributes:")); } --- 719,729 ---- RPAction action = new RPAction(); action.put("type", "inspect"); ! action.put("targetid", 1); CommandCenter.execute(pl, action); ! assertTrue(pl ! .getPrivateText() ! .startsWith( ! "Inspected creature is called \"rat\" and has the following attributes:")); } *************** *** 724,740 **** RPAction action = new RPAction(); action.put("type", "summonat"); ! action.put("target","hugo"); ! action.put("slot","hugo"); ! action.put("item","hugo"); CommandCenter.execute(pl, action); ! assertEquals("Player \"hugo\" does not have an RPSlot named \"hugo\".", pl.getPrivateText()); pl.clearEvents(); action = new RPAction(); action.put("type", "summonat"); ! action.put("target","hugo" ); ! action.put("slot","bag"); ! action.put("item","hugo"); CommandCenter.execute(pl, action); --- 740,757 ---- RPAction action = new RPAction(); action.put("type", "summonat"); ! action.put("target", "hugo"); ! action.put("slot", "hugo"); ! action.put("item", "hugo"); CommandCenter.execute(pl, action); ! assertEquals("Player \"hugo\" does not have an RPSlot named \"hugo\".", ! pl.getPrivateText()); pl.clearEvents(); action = new RPAction(); action.put("type", "summonat"); ! action.put("target", "hugo"); ! action.put("slot", "bag"); ! action.put("item", "hugo"); CommandCenter.execute(pl, action); *************** *** 744,750 **** action = new RPAction(); action.put("type", "summonat"); ! action.put("target","hugo" ); ! action.put("slot","bag" ); ! action.put("item","dagger" ); assertFalse(pl.isEquipped("dagger")); CommandCenter.execute(pl, action); --- 761,767 ---- action = new RPAction(); action.put("type", "summonat"); ! action.put("target", "hugo"); ! action.put("slot", "bag"); ! action.put("item", "dagger"); assertFalse(pl.isEquipped("dagger")); CommandCenter.execute(pl, action); *************** *** 754,760 **** action = new RPAction(); action.put("type", "summonat"); ! action.put("target","noone"); ! action.put("slot","bag"); ! action.put("item","dagger"); CommandCenter.execute(pl, action); --- 771,777 ---- action = new RPAction(); action.put("type", "summonat"); ! action.put("target", "noone"); ! action.put("slot", "bag"); ! action.put("item", "dagger"); CommandCenter.execute(pl, action); Index: CommandCenterTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/CommandCenterTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CommandCenterTest.java 8 Dec 2007 17:12:28 -0000 1.3 --- CommandCenterTest.java 13 Dec 2007 22:52:18 -0000 1.4 *************** *** 26,30 **** public void testRegister() { ActionListener listener = new ActionListener() { ! public void onAction(Player player, RPAction action) { player.put("success", "true"); }; --- 26,30 ---- public void testRegister() { ActionListener listener = new ActionListener() { ! public void onAction(final Player player, final RPAction action) { player.put("success", "true"); }; |