[Arianne-commits] stendhal/tests/games/stendhal/server/maps/ados/bar BarMaidNPCTest.java, 1.7, 1.8

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

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

Modified Files:
	BarMaidNPCTest.java 
Log Message:
replaced npc.getText() with getReply(npc)

Index: BarMaidNPCTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/ados/bar/BarMaidNPCTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BarMaidNPCTest.java	12 Jul 2008 14:44:32 -0000	1.7
--- BarMaidNPCTest.java	11 Dec 2009 19:50:37 -0000	1.8
***************
*** 4,7 ****
--- 4,8 ----
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertThat;
+ import static utilities.SpeakerNPCTestHelper.getReply;
  import games.stendhal.server.core.engine.SingletonRepository;
  import games.stendhal.server.core.engine.StendhalRPZone;
***************
*** 17,23 ****
  import marauroa.common.Log4J;
  
- import org.junit.After;
- import org.junit.AfterClass;
- import org.junit.Before;
  import org.junit.BeforeClass;
  import org.junit.Test;
--- 18,21 ----
***************
*** 33,48 ****
  	}
  
- 	@AfterClass
- 	public static void tearDownAfterClass() throws Exception {
- 	}
- 
- 	@Before
- 	public void setUp() throws Exception {
- 	}
- 
- 	@After
- 	public void tearDown() throws Exception {
- 	}
- 
  	@Test
  	public void testConfigureZone() {
--- 31,34 ----
***************
*** 73,82 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat(barMaid.getText(), is("Hi!"));
  
  		sentence = new SentenceImplementation(new Expression("bye", ExpressionType.VERB));
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.IDLE));
! 		assertThat(barMaid.getText(), is("Bye bye!"));
  	}
  
--- 59,68 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat(getReply(barMaid), is("Hi!"));
  
  		sentence = new SentenceImplementation(new Expression("bye", ExpressionType.VERB));
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.IDLE));
! 		assertThat(getReply(barMaid), is("Bye bye!"));
  	}
  
***************
*** 95,99 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("job text", barMaid.getText(),
  				is("I'm a bar maid. But we've run out of food to feed our customers, can you #offer any?"));
  
--- 81,85 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("job text", getReply(barMaid),
  				is("I'm a bar maid. But we've run out of food to feed our customers, can you #offer any?"));
  
***************
*** 101,105 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("help text", barMaid.getText(),
  				is("If you could #offer any meat, ham or cheese to restock our larders I'd be grateful."));
  
--- 87,91 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("help text", getReply(barMaid),
  				is("If you could #offer any meat, ham or cheese to restock our larders I'd be grateful."));
  
***************
*** 107,111 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("quest text", barMaid.getText(), is("Just #offers of food is enough, thank you."));
  	}
  
--- 93,97 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("quest text", getReply(barMaid), is("Just #offers of food is enough, thank you."));
  	}
  
***************
*** 125,129 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("offer text", barMaid.getText(), is("I buy cheese, meat, spinach, ham, flour, and porcini."));
  
  		final Expression sell = new Expression("sell", ExpressionType.VERB);
--- 111,115 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("offer text", getReply(barMaid), is("I buy cheese, meat, spinach, ham, flour, and porcini."));
  
  		final Expression sell = new Expression("sell", ExpressionType.VERB);
***************
*** 132,141 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("offer text", barMaid.getText(), is("Please tell me what you want to sell."));
  
  		sentence = new SentenceImplementation(sell, new Expression("cheese", ExpressionType.OBJECT));
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 piece of cheese is worth 5. Do you want to sell it?"));
  		engine.setCurrentState(ConversationStates.ATTENDING);
  
--- 118,127 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.ATTENDING));
! 		assertThat("offer text", getReply(barMaid), is("Please tell me what you want to sell."));
  
  		sentence = new SentenceImplementation(sell, new Expression("cheese", ExpressionType.OBJECT));
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 piece of cheese is worth 5. Do you want to sell it?"));
  		engine.setCurrentState(ConversationStates.ATTENDING);
  
***************
*** 143,147 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 piece of meat is worth 10. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 129,133 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 piece of meat is worth 10. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 149,153 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 spinach is worth 15. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 135,139 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 spinach is worth 15. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 155,159 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 piece of ham is worth 20. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 141,145 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 piece of ham is worth 20. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 161,165 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 sack of flour is worth 25. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 147,151 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 sack of flour is worth 25. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 167,171 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("1 porcini is worth 30. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 153,157 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("1 porcini is worth 30. Do you want to sell it?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 175,179 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("2 porcini are worth 60. Do you want to sell them?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
--- 161,165 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("2 porcini are worth 60. Do you want to sell them?"));
  
  		engine.setCurrentState(ConversationStates.ATTENDING);
***************
*** 183,187 ****
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", barMaid.getText(), is("2 sacks of flour are worth 50. Do you want to sell them?"));
  	}
  
--- 169,173 ----
  		engine.step(PlayerTestHelper.createPlayer("bob"), sentence);
  		assertThat(engine.getCurrentState(), is(ConversationStates.SELL_PRICE_OFFERED));
! 		assertThat("offer text", getReply(barMaid), is("2 sacks of flour are worth 50. Do you want to sell them?"));
  	}