From: Martin F. <mar...@us...> - 2011-03-19 18:26:58
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests In directory vz-cvs-4.sog:/tmp/cvs-serv11641/tests/games/stendhal/server/maps/quests Modified Files: KillEnemyArmyTest.java Log Message: sorry, fix nullpointer issue Index: KillEnemyArmyTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/KillEnemyArmyTest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** KillEnemyArmyTest.java 19 Mar 2011 18:23:47 -0000 1.15 --- KillEnemyArmyTest.java 19 Mar 2011 18:26:55 -0000 1.16 *************** *** 270,274 **** assertEquals("Bye.", getReply(npc)); } ! @Test public void TestRequestQuestAgain() { --- 270,274 ---- assertEquals("Bye.", getReply(npc)); } ! @Test public void TestRequestQuestAgain() { *************** *** 279,284 **** assertEquals("Well state what you want then!", getReply(npc)); en.step(player, "quest"); ! assertTrue(getReply(npc).equals("You have to check again in 7 days.") || ! getReply(npc).equals("You have to check again in 1 week.")); en.step(player, "bye"); assertEquals("Bye.", getReply(npc)); --- 279,285 ---- assertEquals("Well state what you want then!", getReply(npc)); en.step(player, "quest"); ! String reply = getReply(npc); ! assertTrue(reply.equals("You have to check again in 7 days.") || ! reply.equals("You have to check again in 1 week.")); en.step(player, "bye"); assertEquals("Bye.", getReply(npc)); |