[Arianne-commits] stendhal/tests/games/stendhal/server/maps/quests CrownForTheWannaBeKingTest.java, 1.14, 1.15 HerbsForCarmenTest.java, 1.7, 1.8

[Katie R. <ky...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2831/tests/games/stendhal/server/maps/quests

Modified Files:
	CrownForTheWannaBeKingTest.java HerbsForCarmenTest.java 
Log Message:
Made change suggested by martinf for fixing [Stendhal] grammar of flask - ID: 3104130 and updated two affected tests to match the new behaviour.

Index: HerbsForCarmenTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/HerbsForCarmenTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HerbsForCarmenTest.java	6 Nov 2010 11:39:36 -0000	1.7
--- HerbsForCarmenTest.java	14 Nov 2010 23:33:31 -0000	1.8
***************
*** 142,146 ****
  		assertEquals("Great, what did you bring?", getReply(npc));
  		en.step(player, "apple");
! 		assertEquals("You don't have apple with you!", getReply(npc));
  		en.step(player, "bye");
  		assertEquals("Bye.", getReply(npc));
--- 142,146 ----
  		assertEquals("Great, what did you bring?", getReply(npc));
  		en.step(player, "apple");
! 		assertEquals("You don't have an apple with you!", getReply(npc));
  		en.step(player, "bye");
  		assertEquals("Bye.", getReply(npc));

Index: CrownForTheWannaBeKingTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/CrownForTheWannaBeKingTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CrownForTheWannaBeKingTest.java	19 Sep 2010 02:41:22 -0000	1.14
--- CrownForTheWannaBeKingTest.java	14 Nov 2010 23:33:31 -0000	1.15
***************
*** 21,24 ****
--- 21,25 ----
  import static org.junit.Assert.assertTrue;
  import static utilities.SpeakerNPCTestHelper.getReply;
+ import games.stendhal.common.Grammar;
  import games.stendhal.server.core.engine.SingletonRepository;
  import games.stendhal.server.entity.npc.ConversationPhrases;
***************
*** 324,328 ****
  			npcEngine.step(bob, playerSays);
  			assertThat(playerSays, npcEngine.getCurrentState(), is(ConversationStates.QUESTION_1));
! 			assertEquals("You don't have " + playerSays + " with you!", getReply(npc));
  		}
  
--- 325,329 ----
  			npcEngine.step(bob, playerSays);
  			assertThat(playerSays, npcEngine.getCurrentState(), is(ConversationStates.QUESTION_1));
! 			assertEquals("You don't have " + Grammar.a_noun(playerSays) + " with you!", getReply(npc));
  		}