[Arianne-commits] stendhal/tests/games/stendhal/server/actions/equip EquipmentActionTest.java, 1.31, 1.32

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/equip
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27604/tests/games/stendhal/server/actions/equip

Modified Files:
	EquipmentActionTest.java 
Log Message:
playerTestHelper.create("") uses playercreation from game .
privatetextmockingtestplayer removed

Index: EquipmentActionTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/actions/equip/EquipmentActionTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** EquipmentActionTest.java	26 Nov 2008 21:36:33 -0000	1.31
--- EquipmentActionTest.java	17 Jan 2009 20:19:08 -0000	1.32
***************
*** 18,22 ****
  
  import utilities.PlayerTestHelper;
- import utilities.PrivateTextMockingTestPlayer;
  import utilities.ZoneAndPlayerTestImpl;
  
--- 18,21 ----
***************
*** 50,55 ****
  	 * @return a Player where the  privateTexts are captured
  	 */
! 	private PrivateTextMockingTestPlayer createTestPlayer(final String name) {
! 		final PrivateTextMockingTestPlayer player = PlayerTestHelper.createPrivateTextMockingTestPlayer(name);
  
  		player.setPosition(10, 5);
--- 49,54 ----
  	 * @return a Player where the  privateTexts are captured
  	 */
! 	private Player createTestPlayer(final String name) {
! 		final Player player = PlayerTestHelper.createPlayer(name);
  
  		player.setPosition(10, 5);
***************
*** 62,66 ****
  	@Test
  	public void testDropInvalidSourceSlot() {
! 		final PrivateTextMockingTestPlayer player = createTestPlayer("george");
  
  		final RPAction drop = new RPAction();
--- 61,65 ----
  	@Test
  	public void testDropInvalidSourceSlot() {
! 		final Player player = createTestPlayer("george");
  
  		final RPAction drop = new RPAction();
***************
*** 72,81 ****
  		final EquipmentAction action = new DropAction();
  		action.onAction(player, drop);
! 		Assert.assertEquals("Source nonExistingSlotXXXXXX does not exist", player.getPrivateTextString());
  	}
  
  	@Test
  	public void testDropNonExistingItem() {
! 		final PrivateTextMockingTestPlayer player = createTestPlayer("bob");
  
  		final RPAction drop = new RPAction();
--- 71,80 ----
  		final EquipmentAction action = new DropAction();
  		action.onAction(player, drop);
! 		Assert.assertEquals("Source nonExistingSlotXXXXXX does not exist", player.events().get(0).get("text"));
  	}
  
  	@Test
  	public void testDropNonExistingItem() {
! 		final Player player = createTestPlayer("bob");
  
  		final RPAction drop = new RPAction();
***************
*** 90,94 ****
  		final EquipmentAction action = new DropAction();
  		action.onAction(player, drop);
! 		Assert.assertEquals("There is no such item in the bag of bob", player.getPrivateTextString());
  	}
  
--- 89,93 ----
  		final EquipmentAction action = new DropAction();
  		action.onAction(player, drop);
! 		Assert.assertEquals("There is no such item in the bag of bob", player.events().get(0).get("text"));
  	}