From: Astrid S. <ast...@us...> - 2007-11-20 20:20:28
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv538/tests/games/stendhal/server/maps/quests Modified Files: LookBookforCerylTest.java Log Message: refined test to raise coverage Index: LookBookforCerylTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/LookBookforCerylTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LookBookforCerylTest.java 20 Nov 2007 18:49:47 -0000 1.2 --- LookBookforCerylTest.java 20 Nov 2007 20:20:29 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- import games.stendhal.server.entity.npc.fsm.Engine; import games.stendhal.server.entity.player.Player; + import games.stendhal.server.maps.orril.magician_house.WitchNPC; import games.stendhal.server.maps.semos.library.LibrarianNPC; *************** *** 25,30 **** import org.junit.Test; import utilities.PlayerTestHelper; - import utilities.SpeakerNPCTestHelper; public class LookBookforCerylTest { --- 26,31 ---- import org.junit.Test; + import utilities.PlayerHelper; import utilities.PlayerTestHelper; public class LookBookforCerylTest { *************** *** 37,48 **** SpeakerNPC jynath; @Before public void setUp() throws Exception { ! jynath = SpeakerNPCTestHelper.createSpeakerNPC("Jynath"); ! jynath.addGoodbye(); ! NPCList.get().add(jynath); new LibrarianNPC().configureZone(new StendhalRPZone("testzone"), null); ! } --- 38,50 ---- SpeakerNPC jynath; + private SpeakerNPC ceryl; @Before public void setUp() throws Exception { ! PlayerHelper.generateNPCRPClasses(); ! new WitchNPC().configureZone(new StendhalRPZone("testzone"),null); new LibrarianNPC().configureZone(new StendhalRPZone("testzone"), null); ! jynath= NPCList.get().get("jynath"); ! ceryl= NPCList.get().get("ceryl"); } *************** *** 53,56 **** --- 55,102 ---- } + + @Test + public final void askJynathWithoutQuest() { + LookBookforCeryl quest = new LookBookforCeryl(); + quest.init("Ceryl needs a book"); + quest.addToWorld(); + Player pl = PlayerTestHelper.createPlayer("joe"); + assertFalse(quest.isStarted(pl)); + assertFalse(quest.isCompleted(pl)); + + Engine jynathEngine = jynath.getEngine(); + jynathEngine.step(pl, "Hi"); + assertTrue(jynath.isTalking()); + assertEquals("Greetings! How may I help you?", + jynath.get("text")); + + jynathEngine.step(pl, "book"); + assertTrue(jynath.isTalking()); + assertEquals("Sssh! I'm concentrating on this potion recipe... it's a tricky one.", + jynath.get("text")); + + jynathEngine.step(pl, "bye"); + assertFalse(jynath.isTalking()); + } + + @Test + public final void comeBackFromJynathWithoutBook() { + LookBookforCeryl quest = new LookBookforCeryl(); + quest.init("Ceryl needs a book"); + quest.addToWorld(); + Player pl = PlayerTestHelper.createPlayer("joe"); + pl.setQuest(CERYL_BOOK, "jynath"); + + + Engine cerylEngine = ceryl.getEngine(); + cerylEngine.step(pl, "Hi"); + assertTrue(ceryl.isTalking()); + assertEquals("Haven't you got that #book back from #Jynath? Please go look for it, quickly!", + ceryl.get("text")); + + assertFalse(pl.hasQuest(CERYL_BOOK)); + } + + @Test public void doQuest() throws Exception { *************** *** 81,84 **** --- 127,135 ---- ceryl.get("text")); assertEquals("start", pl.getQuest(LookBookforCerylTest.CERYL_BOOK)); + cerylEngine.step(pl, "book"); + assertTrue(ceryl.isTalking()); + assertEquals( + "I really need that book now! Go to talk with #Jynath.", + ceryl.get("text")); cerylEngine.step(pl, ConversationPhrases.GOODBYE_MESSAGES.get(0)); assertFalse(ceryl.isTalking()); *************** *** 93,96 **** --- 144,163 ---- assertFalse(jynath.isTalking()); + jynathEngine.step(pl, "Hi"); + assertTrue(jynath.isTalking()); + assertEquals( + "You'd better take that book back to #Ceryl quickly... he'll be waiting for you.", + jynath.get("text")); + + jynathEngine.step(pl, "book"); + assertTrue(jynath.isTalking()); + assertEquals( + "You'd better take that book back to #Ceryl quickly... he'll be waiting for you.", + jynath.get("text")); + + + jynathEngine.step(pl, "bye"); + assertFalse(jynath.isTalking()); + cerylEngine.step(pl, "Hi"); assertTrue(ceryl.isTalking()); *************** *** 108,111 **** --- 175,181 ---- } + + + @Test public final void testAddToWorld() { |