[Arianne-commits] stendhal/tests/games/stendhal/server/core/engine PlayerListTest.java, 1.4, 1.5

[Martin F. <mar...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/engine
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18996/tests/games/stendhal/server/core/engine

Modified Files:
	PlayerListTest.java 
Log Message:
replace usage of getPrivateText() by PrivateTextMockingTestPlayer

Index: PlayerListTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/engine/PlayerListTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlayerListTest.java	30 Dec 2007 19:04:37 -0000	1.4
--- PlayerListTest.java	31 Dec 2007 00:46:50 -0000	1.5
***************
*** 1,6 ****
  package games.stendhal.server.core.engine;
  
! import static org.junit.Assert.*;
! import static org.hamcrest.CoreMatchers.*;
  import games.stendhal.common.filter.FilterCriteria;
  import games.stendhal.server.entity.player.Player;
--- 1,11 ----
  package games.stendhal.server.core.engine;
  
! import static org.hamcrest.CoreMatchers.is;
! import static org.hamcrest.CoreMatchers.not;
! import static org.hamcrest.CoreMatchers.sameInstance;
! import static org.junit.Assert.assertEquals;
! import static org.junit.Assert.assertSame;
! import static org.junit.Assert.assertThat;
! import static org.junit.Assert.assertTrue;
  import games.stendhal.common.filter.FilterCriteria;
  import games.stendhal.server.entity.player.Player;
***************
*** 10,13 ****
--- 15,19 ----
  
  import utilities.PlayerTestHelper;
+ import utilities.PrivateTextMockingTestPlayer;
  
  public class PlayerListTest {
***************
*** 20,24 ****
  	public void testPlayerList() {
  		PlayerList list = new PlayerList();
! 
  	}
  
--- 26,30 ----
  	public void testPlayerList() {
  		PlayerList list = new PlayerList();
! 		list.size();	// just to avoid the "is never read" warning
  	}
  
***************
*** 27,35 ****
  		PlayerList list = new PlayerList();
  		assertThat(list.size(), is(0));
! 		Player jack = PlayerTestHelper.createPlayer("jack");
  		list.add(jack);
  		assertThat(list.size(), is(1));
  		assertSame(jack, list.getOnlinePlayer("jack"));
! 		Player jack2 = PlayerTestHelper.createPlayer("jack");
  		list.add(jack2);
  		assertThat(list.size(), is(1));
--- 33,41 ----
  		PlayerList list = new PlayerList();
  		assertThat(list.size(), is(0));
! 		PrivateTextMockingTestPlayer jack = PlayerTestHelper.createPrivateTextMockingTestPlayer("jack");
  		list.add(jack);
  		assertThat(list.size(), is(1));
  		assertSame(jack, list.getOnlinePlayer("jack"));
! 		PrivateTextMockingTestPlayer jack2 = PlayerTestHelper.createPrivateTextMockingTestPlayer("jack");
  		list.add(jack2);
  		assertThat(list.size(), is(1));
***************
*** 42,48 ****
  	@Test
  	public void testAllPlayersModify() {
! 		Player jack = PlayerTestHelper.createPlayer("jack");
! 		Player bob = PlayerTestHelper.createPlayer("bob");
! 		Player ghost = PlayerTestHelper.createPlayer("ghost");
  		ghost.setGhost(true);
  		PlayerList list = new PlayerList();
--- 48,54 ----
  	@Test
  	public void testAllPlayersModify() {
! 		PrivateTextMockingTestPlayer jack = PlayerTestHelper.createPrivateTextMockingTestPlayer("jack");
! 		PrivateTextMockingTestPlayer bob = PlayerTestHelper.createPrivateTextMockingTestPlayer("bob");
! 		PrivateTextMockingTestPlayer ghost = PlayerTestHelper.createPrivateTextMockingTestPlayer("ghost");
  		ghost.setGhost(true);
  		PlayerList list = new PlayerList();
***************
*** 52,92 ****
  		final String message = "tellall test";
  		list.tellAllOnlinePlayers(message);
! 		assertEquals(message, jack.getPrivateText());
! 		assertEquals(message, bob.getPrivateText());
! 		assertEquals(message, ghost.getPrivateText());
  		list.forAllPlayersExecute(new Task<Player>() {
- 
  			public void execute(Player player) {
! 				player.clearEvents();
! 
  			}
- 
  		});
  
! 		assertEquals(null, jack.getPrivateText());
! 		assertEquals(null, bob.getPrivateText());
! 		assertEquals(null, ghost.getPrivateText());
  
  		list.forFilteredPlayersExecute(new Task<Player>() {
  			public void execute(Player player) {
  				player.sendPrivateText(message);
- 
  			}
  		}, new FilterCriteria<Player>() {
  			public boolean passes(Player o) {
  				return o.isGhost();
- 
  			}
  		});
! 		assertEquals(null, jack.getPrivateText());
! 		assertEquals(null, bob.getPrivateText());
! 		assertEquals(message, ghost.getPrivateText());
  	}
  
  	@Test
  	public void testAllPlayersRemove() {
! 		Player jack = PlayerTestHelper.createPlayer("jack");
! 		Player bob = PlayerTestHelper.createPlayer("bob");
! 		Player ghost = PlayerTestHelper.createPlayer("ghost");
  		ghost.setGhost(true);
  		final PlayerList list = new PlayerList();
--- 58,94 ----
  		final String message = "tellall test";
  		list.tellAllOnlinePlayers(message);
! 		assertEquals(message, jack.getPrivateTextString());
! 		assertEquals(message, bob.getPrivateTextString());
! 		assertEquals(message, ghost.getPrivateTextString());
  		list.forAllPlayersExecute(new Task<Player>() {
  			public void execute(Player player) {
! 				//TODO Is there a possibility to avoid this type cast?
! 				((PrivateTextMockingTestPlayer)player).resetPrivateTextString();
  			}
  		});
  
! 		assertEquals("", jack.getPrivateTextString());
! 		assertEquals("", bob.getPrivateTextString());
! 		assertEquals("", ghost.getPrivateTextString());
  
  		list.forFilteredPlayersExecute(new Task<Player>() {
  			public void execute(Player player) {
  				player.sendPrivateText(message);
  			}
  		}, new FilterCriteria<Player>() {
  			public boolean passes(Player o) {
  				return o.isGhost();
  			}
  		});
! 		assertEquals("", jack.getPrivateTextString());
! 		assertEquals("", bob.getPrivateTextString());
! 		assertEquals(message, ghost.getPrivateTextString());
  	}
  
  	@Test
  	public void testAllPlayersRemove() {
! 		PrivateTextMockingTestPlayer jack = PlayerTestHelper.createPrivateTextMockingTestPlayer("jack");
! 		PrivateTextMockingTestPlayer bob = PlayerTestHelper.createPrivateTextMockingTestPlayer("bob");
! 		PrivateTextMockingTestPlayer ghost = PlayerTestHelper.createPrivateTextMockingTestPlayer("ghost");
  		ghost.setGhost(true);
  		final PlayerList list = new PlayerList();
***************
*** 96,107 ****
  		final String message = "tellall test";
  		list.tellAllOnlinePlayers(message);
! 		assertEquals(message, jack.getPrivateText());
! 		assertEquals(message, bob.getPrivateText());
! 		assertEquals(message, ghost.getPrivateText());
  		list.forAllPlayersExecute(new Task<Player>() {
  
  			public void execute(Player player) {
  				list.remove(player);
- 
  			}
  
--- 98,108 ----
  		final String message = "tellall test";
  		list.tellAllOnlinePlayers(message);
! 		assertEquals(message, jack.getPrivateTextString());
! 		assertEquals(message, bob.getPrivateTextString());
! 		assertEquals(message, ghost.getPrivateTextString());
  		list.forAllPlayersExecute(new Task<Player>() {
  
  			public void execute(Player player) {
  				list.remove(player);
  			}