[Arianne-commits] stendhal/tests/games/stendhal/server/maps/quests CampfireTest.java, 1.32, 1.33

[bluelads <blu...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests
In directory vz-cvs-4.sog:/tmp/cvs-serv19709/tests/games/stendhal/server/maps/quests

Modified Files:
	CampfireTest.java 
Log Message:
reworked CampfireTest so that the two possible answers are actually evaluated. (Patches ID:3531525 by astridemma)

Index: CampfireTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/CampfireTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CampfireTest.java	24 Apr 2012 13:53:41 -0000	1.32
--- CampfireTest.java	2 Jun 2012 20:18:12 -0000	1.33
***************
*** 247,251 ****
  			en.setCurrentState(ConversationStates.ATTENDING);
  			en.step(player, request);
! 			assertTrue("Thanks, but I think the wood you brought me already will last me another 60 minutes.".equals(getReply(npc)) || "Thanks, but I think the wood you brought me already will last me another 1 hour.".equals(getReply(npc)));
  			assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
  			assertEquals("quest state unchanged", questState, player.getQuest(CAMPFIRE));
--- 247,252 ----
  			en.setCurrentState(ConversationStates.ATTENDING);
  			en.step(player, request);
! 			String reply = getReply(npc);
! 			assertTrue("Thanks, but I think the wood you brought me already will last me another 60 minutes.".equals(reply) || "Thanks, but I think the wood you brought me already will last me another 1 hour.".equals(reply));
  			assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
  			assertEquals("quest state unchanged", questState, player.getQuest(CAMPFIRE));