[Arianne-commits] stendhal/tests/games/stendhal/server/maps/kirdneh/city FlowerSellerNPCTest.java, 1.6, 1.7

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/kirdneh/city
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10614/tests/games/stendhal/server/maps/kirdneh/city

Modified Files:
	FlowerSellerNPCTest.java 
Log Message:
replaced npc.get("text") with getReply(npc)

Index: FlowerSellerNPCTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/kirdneh/city/FlowerSellerNPCTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FlowerSellerNPCTest.java	13 Jul 2009 22:24:25 -0000	1.6
--- FlowerSellerNPCTest.java	11 Dec 2009 19:45:39 -0000	1.7
***************
*** 4,7 ****
--- 4,8 ----
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
+ import static utilities.SpeakerNPCTestHelper.getReply;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  import games.stendhal.server.entity.npc.fsm.Engine;
***************
*** 44,51 ****
  
  		assertTrue(en.step(player, "hi Fleur"));
! 		assertEquals("Hi! Are you here to #trade?", npc.get("text"));
  
  		assertTrue(en.step(player, "bye"));
! 		assertEquals("Come back soon!", npc.get("text"));
  	}
  
--- 45,52 ----
  
  		assertTrue(en.step(player, "hi Fleur"));
! 		assertEquals("Hi! Are you here to #trade?", getReply(npc));
  
  		assertTrue(en.step(player, "bye"));
! 		assertEquals("Come back soon!", getReply(npc));
  	}
  
***************
*** 56,66 ****
  
  		assertTrue(en.step(player, "hi"));
! 		assertEquals("Hi! Are you here to #trade?", npc.get("text"));
  
  		assertTrue(en.step(player, "job"));
! 		assertEquals("I sell roses in this here market.", npc.get("text"));
  
  		assertTrue(en.step(player, "trade"));
! 		assertEquals("I sell rose.", npc.get("text"));
  
  		// There is currently no quest response defined for Fleur.
--- 57,67 ----
  
  		assertTrue(en.step(player, "hi"));
! 		assertEquals("Hi! Are you here to #trade?", getReply(npc));
  
  		assertTrue(en.step(player, "job"));
! 		assertEquals("I sell roses in this here market.", getReply(npc));
  
  		assertTrue(en.step(player, "trade"));
! 		assertEquals("I sell rose.", getReply(npc));
  
  		// There is currently no quest response defined for Fleur.
***************
*** 68,109 ****
  
  		assertTrue(en.step(player, "buy"));
! 		assertEquals("Please tell me what you want to buy.", npc.get("text"));
  
  		assertTrue(en.step(player, "buy dog"));
! 		assertEquals("Sorry, I don't sell dogs.", npc.get("text"));
  
  		assertTrue(en.step(player, "buy candle"));
! 		assertEquals("Sorry, I don't sell candles.", npc.get("text"));
  
  		assertTrue(en.step(player, "buy a glass of wine"));
! 		assertEquals("Sorry, I don't sell glasses of wine.", npc.get("text"));
  
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", npc.get("text"));
  
  		assertTrue(en.step(player, "no"));
! 		assertEquals("Ok, how else may I help you?", npc.get("text"));
  
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", npc.get("text"));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Sorry, you don't have enough money!", npc.get("text"));
  
  		assertTrue(en.step(player, "buy two roses"));
! 		assertEquals("2 roses will cost 100. Do you want to buy them?", npc.get("text"));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Sorry, you don't have enough money!", npc.get("text"));
  
  		// equip with enough money to buy one rose
  		assertTrue(equipWithMoney(player, 50));
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", npc.get("text"));
  
  		assertFalse(player.isEquipped("rose"));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Congratulations! Here is your rose!", npc.get("text"));
  
  		assertTrue(player.isEquipped("rose"));
--- 69,110 ----
  
  		assertTrue(en.step(player, "buy"));
! 		assertEquals("Please tell me what you want to buy.", getReply(npc));
  
  		assertTrue(en.step(player, "buy dog"));
! 		assertEquals("Sorry, I don't sell dogs.", getReply(npc));
  
  		assertTrue(en.step(player, "buy candle"));
! 		assertEquals("Sorry, I don't sell candles.", getReply(npc));
  
  		assertTrue(en.step(player, "buy a glass of wine"));
! 		assertEquals("Sorry, I don't sell glasses of wine.", getReply(npc));
  
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", getReply(npc));
  
  		assertTrue(en.step(player, "no"));
! 		assertEquals("Ok, how else may I help you?", getReply(npc));
  
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", getReply(npc));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Sorry, you don't have enough money!", getReply(npc));
  
  		assertTrue(en.step(player, "buy two roses"));
! 		assertEquals("2 roses will cost 100. Do you want to buy them?", getReply(npc));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Sorry, you don't have enough money!", getReply(npc));
  
  		// equip with enough money to buy one rose
  		assertTrue(equipWithMoney(player, 50));
  		assertTrue(en.step(player, "buy rose"));
! 		assertEquals("1 rose will cost 50. Do you want to buy it?", getReply(npc));
  
  		assertFalse(player.isEquipped("rose"));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Congratulations! Here is your rose!", getReply(npc));
  
  		assertTrue(player.isEquipped("rose"));
***************
*** 112,119 ****
  		assertTrue(equipWithMoney(player, 250));
  		assertTrue(en.step(player, "buy 5 roses"));
! 		assertEquals("5 roses will cost 250. Do you want to buy them?", npc.get("text"));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Congratulations! Here are your roses!", npc.get("text"));
  
  		assertTrue(player.isEquipped("rose", 6));
--- 113,120 ----
  		assertTrue(equipWithMoney(player, 250));
  		assertTrue(en.step(player, "buy 5 roses"));
! 		assertEquals("5 roses will cost 250. Do you want to buy them?", getReply(npc));
  
  		assertTrue(en.step(player, "yes"));
! 		assertEquals("Congratulations! Here are your roses!", getReply(npc));
  
  		assertTrue(player.isEquipped("rose", 6));