From: Katie <ky...@us...> - 2008-08-23 23:44:04
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12489/tests/games/stendhal/server/maps/quests Modified Files: MithrilCloakTest.java Log Message: The first two steps pass now so I took the @Ignore away on them Index: MithrilCloakTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/MithrilCloakTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MithrilCloakTest.java 23 Aug 2008 21:00:49 -0000 1.1 --- MithrilCloakTest.java 23 Aug 2008 23:44:13 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- import java.util.Arrays; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; *************** *** 38,42 **** private static String shieldQuestSlot = "mithrilshield_quest"; ! private static Player player = null; private SpeakerNPC npc = null; private Engine en = null; --- 39,43 ---- private static String shieldQuestSlot = "mithrilshield_quest"; ! private Player player = null; private SpeakerNPC npc = null; private Engine en = null; *************** *** 70,83 **** quest.addToWorld(); player = PlayerTestHelper.createPlayer("player"); - zone.add(player); player.setQuest(shieldQuestSlot, "done"); player.setQuest("cloaks_collector", "done"); player.setQuest("cloaks_collector_2", ";red cloak;elvish cloak;"); } ! ! @Test - @Ignore public void testInitialSteps() { // start with the quest slot clean --- 71,84 ---- quest.addToWorld(); + } + @Before + public void setUp() { player = PlayerTestHelper.createPlayer("player"); player.setQuest(shieldQuestSlot, "done"); player.setQuest("cloaks_collector", "done"); player.setQuest("cloaks_collector_2", ";red cloak;elvish cloak;"); } ! @Test public void testInitialSteps() { // start with the quest slot clean *************** *** 94,98 **** en.step(player, "yes"); assertTrue("Thank you! It needs a replacement #bobbin, I'm ever so grateful for your help.".equals(npc.get("text"))||"Thank you! It needs a piece of leather to fix it. Please fetch me a suit of leather armor and come back as soon as you can.".equals(npc.get("text"))||"Thank you! It isn't running smoothly and needs a can of #oil, I'm ever so grateful for your help.".equals(npc.get("text"))); ! player.setQuest(questSlot, "bobbin"); assertEquals(en.getCurrentState(), ConversationStates.ATTENDING); en.step(player, "bobbin"); --- 95,99 ---- en.step(player, "yes"); assertTrue("Thank you! It needs a replacement #bobbin, I'm ever so grateful for your help.".equals(npc.get("text"))||"Thank you! It needs a piece of leather to fix it. Please fetch me a suit of leather armor and come back as soon as you can.".equals(npc.get("text"))||"Thank you! It isn't running smoothly and needs a can of #oil, I'm ever so grateful for your help.".equals(npc.get("text"))); ! player.setQuest(questSlot, "machine;bobbin"); assertEquals(en.getCurrentState(), ConversationStates.ATTENDING); en.step(player, "bobbin"); *************** *** 137,144 **** en.step(player, "kampusch"); assertEquals("He is obsessed with antiques so look for him in an antiques shop or a museum.", npc.get("text")); } ! @Test ! @Ignore public void testMakingFabric() { player.setQuest(questSlot, "need_fabric"); --- 138,146 ---- en.step(player, "kampusch"); assertEquals("He is obsessed with antiques so look for him in an antiques shop or a museum.", npc.get("text")); + en.step(player, "bye"); + assertEquals("Bye, thanks for stepping in.", npc.get("text")); } ! @Test public void testMakingFabric() { player.setQuest(questSlot, "need_fabric"); *************** *** 160,163 **** --- 162,167 ---- en.step(player, "whiggins"); assertEquals("Find the wizard Whiggins inside his house in the magic city.", npc.get("text")); + en.step(player, "bye"); + assertEquals("Farewell.", npc.get("text")); npc = SingletonRepository.getNPCList().get("Vincento Price"); *************** *** 168,173 **** item = ItemTestHelper.createItem("mithril nugget", 7); player.getSlot("bag").add(item); - item = ItemTestHelper.createItem("balloon", 1); - player.getSlot("bag").add(item); item = ItemTestHelper.createItem("silk thread", 40); player.getSlot("bag").add(item); --- 172,175 ---- *************** *** 193,196 **** --- 195,199 ---- assertEquals("Oh, I gave your 40 spools of silk thread to my research student Boris Karlova. Go collect them from him.", npc.get("text")); // [22:07] jammyjam earns 100 experience points. + en.step(player, "bye"); assertEquals("Ta ta!", npc.get("text")); *************** *** 201,215 **** assertEquals("The boss gave me these 40 spools of silk thread. Price gets his students to do his dirty work for him.", npc.get("text")); player.setQuest(questSlot, "got_thread"); npc = SingletonRepository.getNPCList().get("Kampusch"); en = npc.getEngine(); ! en.step(player, "hi"); ! assertEquals("Greetings, can I offer you anything?", npc.get("text")); en.step(player, "fuse"); assertEquals("For 40 spools of mithril thread to make your cloak, I need 40 spools of #silk #thread, 7 #mithril #nuggets and a #balloon.", npc.get("text")); en.step(player, "fuse"); assertEquals("I will fuse 40 mithril thread for you. Please come back in 4 hours.", npc.get("text")); - player.setQuest(questSlot,"fusingthread;12179739989790"); en.step(player, "bye"); assertEquals("Farewell.", npc.get("text")); --- 204,222 ---- assertEquals("The boss gave me these 40 spools of silk thread. Price gets his students to do his dirty work for him.", npc.get("text")); player.setQuest(questSlot, "got_thread"); + npc = SingletonRepository.getNPCList().get("Kampusch"); en = npc.getEngine(); ! en.step(player, "hello"); ! assertEquals("Greetings, can I #offer you anything?", npc.get("text")); ! // say fuse without all the items en.step(player, "fuse"); assertEquals("For 40 spools of mithril thread to make your cloak, I need 40 spools of #silk #thread, 7 #mithril #nuggets and a #balloon.", npc.get("text")); + // add the item + item = ItemTestHelper.createItem("balloon", 1); + player.getSlot("bag").add(item); en.step(player, "fuse"); assertEquals("I will fuse 40 mithril thread for you. Please come back in 4 hours.", npc.get("text")); en.step(player, "bye"); assertEquals("Farewell.", npc.get("text")); *************** *** 230,233 **** --- 237,241 ---- en.step(player, "fabric"); assertEquals("Cloth has different standards, which I'm sure you'll notice in your own cloaks. #Mithril fabric is the very finest and strongest of all. But then, I would say that, being from Mithrilbourgh... So, you need to find plenty of silk glands, then take them to a #scientist to make the thread. Once you have silk thread bring it to me to #fuse mithril into it. Finally, you will need to take the mithril thread to #Whiggins to get the fabric woven.", npc.get("text")); + en.step(player, "bye"); assertEquals("Farewell.", npc.get("text")); *************** *** 244,247 **** --- 252,257 ---- assertEquals("Please don't forget to take that letter to Pedinghaus. It means a lot to me.", npc.get("text")); player.setQuest(questSlot,"taking_letter"); + en.step(player, "bye"); + assertEquals("Till next time.", npc.get("text")); npc = SingletonRepository.getNPCList().get("Pedinghaus"); *************** *** 249,253 **** en.step(player, "hi"); ! assertEquals("Greetings. I sense you may be interested in mithril. If you desire me to cast you a mithril bar, just say the word.", npc.get("text")); en.step(player, "letter"); assertEquals("*reads* ... *reads* ... Well, I must say, that is a weight off my mind. Thank you ever so much. Please convey my warmest regards to Whiggins. All is forgiven.", npc.get("text")); --- 259,263 ---- en.step(player, "hi"); ! assertEquals("Greetings. I sense you may be interested in mithril. If you desire me to #cast you a #'mithril bar', just say the word.", npc.get("text")); en.step(player, "letter"); assertEquals("*reads* ... *reads* ... Well, I must say, that is a weight off my mind. Thank you ever so much. Please convey my warmest regards to Whiggins. All is forgiven.", npc.get("text")); *************** *** 266,270 **** en.step(player, "yes"); assertEquals("Lovely. In 2 hours your fabric will be ready.", npc.get("text")); - player.setQuest(questSlot,"weavingfabric;100000000000000"); en.step(player, "bye"); assertEquals("Till next time.", npc.get("text")); --- 276,279 ---- |