[Arianne-commits] stendhal/tests/games/stendhal/server/core/rp StendhalRPActionTest.java, 1.13, 1.14

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

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/rp
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18060/tests/games/stendhal/server/core/rp

Modified Files:
	StendhalRPActionTest.java 
Log Message:
reintroduced target attribute

Index: StendhalRPActionTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/rp/StendhalRPActionTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StendhalRPActionTest.java	28 Jan 2010 22:55:47 -0000	1.13
--- StendhalRPActionTest.java	7 Feb 2010 17:01:28 -0000	1.14
***************
*** 11,15 ****
  import games.stendhal.server.maps.MockStendlRPWorld;
  
- import marauroa.common.game.RPEvent;
  import marauroa.server.game.db.DatabaseFactory;
  
--- 11,14 ----
***************
*** 55,74 ****
  	}
  	
- 	/**
- 	 * Get whatever private text message a player got.
- 	 * 
- 	 * @param player the player to be examined
- 	 * @return the text message
- 	 */
- 	private String getTextMessage(Player player) {
- 		for (RPEvent e : player.events()) {
- 			if (e.getName().equals("private_text")) {
- 				return e.get("text");
- 			}
- 		}
- 		
- 		return null;
- 	}
- 	
  	@Test
  	public void startAttackingOneself() {
--- 54,57 ----
***************
*** 91,95 ****
  		StendhalRPAction.startAttack(player, victim);
  		assertSame(player.getAttackTarget(), victim);
! 		player.stopAttack(victim);
  		assertNull(player.getAttackTarget());
  		
--- 74,78 ----
  		StendhalRPAction.startAttack(player, victim);
  		assertSame(player.getAttackTarget(), victim);
! 		player.stopAttack();
  		assertNull(player.getAttackTarget());
  		
***************
*** 98,102 ****
  		StendhalRPAction.startAttack(player, victim);
  		assertSame(player.getAttackTarget(), victim);
! 		player.stopAttack(victim);
  		
  		// strong player, weak monster
--- 81,85 ----
  		StendhalRPAction.startAttack(player, victim);
  		assertSame(player.getAttackTarget(), victim);
! 		player.stopAttack();
  		
  		// strong player, weak monster
***************
*** 132,139 ****
  			// equal level. should always succeed
  			assertSame("Attacking player at unprotected area", hyde.getAttackTarget(), jekyll);
! 			hyde.stopAttack(jekyll);
  		}
! 	
! 		hyde.clearEvents();
  		// protect jekyll; the attack should fail
  		protectMap();
--- 115,121 ----
  			// equal level. should always succeed
  			assertSame("Attacking player at unprotected area", hyde.getAttackTarget(), jekyll);
! 			hyde.stopAttack();
  		}
! 		
  		// protect jekyll; the attack should fail
  		protectMap();
***************
*** 144,148 ****
  			assertNull("Attacking player at protected area", hyde.getAttackTarget());
  			assertEquals("message at attacking at protected area", 
! 					"The powerful protective aura in this place prevents you from attacking jekyll.", getTextMessage(hyde));
  			hyde.clearEvents();
  		}
--- 126,130 ----
  			assertNull("Attacking player at protected area", hyde.getAttackTarget());
  			assertEquals("message at attacking at protected area", 
! 					"The powerful protective aura in this place prevents you from attacking jekyll.", hyde.events().get(0).get("text"));
  			hyde.clearEvents();
  		}
***************
*** 162,166 ****
  			// jekyll is stronger than hyde, so attacking should succeed
  			assertSame("Attacking player at unprotected area", hyde.getAttackTarget(), jekyll);
! 			hyde.stopAttack(jekyll);
  		}
  		
--- 144,148 ----
  			// jekyll is stronger than hyde, so attacking should succeed
  			assertSame("Attacking player at unprotected area", hyde.getAttackTarget(), jekyll);
! 			hyde.stopAttack();
  		}
  		
***************
*** 172,176 ****
  			assertNull("Attacking player at protected area", hyde.getAttackTarget());
  			assertEquals("message at attacking at protected area", 
! 					"The powerful protective aura in this place prevents you from attacking jekyll.", getTextMessage(hyde));
  			hyde.clearEvents();
  		}
--- 154,158 ----
  			assertNull("Attacking player at protected area", hyde.getAttackTarget());
  			assertEquals("message at attacking at protected area", 
! 					"The powerful protective aura in this place prevents you from attacking jekyll.", hyde.events().get(0).get("text"));
  			hyde.clearEvents();
  		}
***************
*** 195,199 ****
  					
  					assertEquals("message at attacking at protected area", 
! 							"Your conscience would trouble you if you carried out this attack.", getTextMessage(hyde));
  					hyde.clearEvents();
  					
--- 177,181 ----
  					
  					assertEquals("message at attacking at protected area", 
! 							"Your conscience would trouble you if you carried out this attack.", hyde.events().get(0).get("text"));
  					hyde.clearEvents();
  					
***************
*** 202,211 ****
  					StendhalRPAction.startAttack(hyde, jekyll);
  					assertSame("Self defence against a weak enemy", hyde.getAttackTarget(), jekyll);
! 					jekyll.stopAttack(hyde);
  				} else {
  					// the victim is not too weak
  					assertSame("Attacking only a bit weaker victim", hyde.getAttackTarget(), jekyll);
  				}
! 				hyde.stopAttack(jekyll);
  			}
  		}
--- 184,193 ----
  					StendhalRPAction.startAttack(hyde, jekyll);
  					assertSame("Self defence against a weak enemy", hyde.getAttackTarget(), jekyll);
! 					jekyll.stopAttack();
  				} else {
  					// the victim is not too weak
  					assertSame("Attacking only a bit weaker victim", hyde.getAttackTarget(), jekyll);
  				}
! 				hyde.stopAttack();
  			}
  		}
***************
*** 223,232 ****
  		StendhalRPAction.startAttack(hyde, sheep);
  		assertSame("Attacking a sheep in unprotected area", hyde.getAttackTarget(), sheep);
! 		hyde.stopAttack(sheep);
  		// also if you are the owner
  		sheep.setOwner(hyde);
  		StendhalRPAction.startAttack(hyde, sheep);
  		assertSame("Attacking a sheep in unprotected area", hyde.getAttackTarget(), sheep);
! 		hyde.stopAttack(sheep);
  		// but attacking someone elses pet is a no-no
  		sheep.setOwner(jekyll);
--- 205,214 ----
  		StendhalRPAction.startAttack(hyde, sheep);
  		assertSame("Attacking a sheep in unprotected area", hyde.getAttackTarget(), sheep);
! 		hyde.stopAttack();
  		// also if you are the owner
  		sheep.setOwner(hyde);
  		StendhalRPAction.startAttack(hyde, sheep);
  		assertSame("Attacking a sheep in unprotected area", hyde.getAttackTarget(), sheep);
! 		hyde.stopAttack();
  		// but attacking someone elses pet is a no-no
  		sheep.setOwner(jekyll);
***************
*** 235,240 ****
  		assertEquals("message at attacking someone else's sheep", 
  				"You pity jekyll's sheep too much to kill it.", 
! 				getTextMessage(hyde));
! 		hyde.stopAttack(sheep);
  		hyde.clearEvents();
  		sheep.setOwner(null);
--- 217,222 ----
  		assertEquals("message at attacking someone else's sheep", 
  				"You pity jekyll's sheep too much to kill it.", 
! 				hyde.events().get(0).get("text"));
! 		hyde.stopAttack();
  		hyde.clearEvents();
  		sheep.setOwner(null);
***************
*** 247,251 ****
  				"The powerful protective aura in this place prevents you from attacking that sheep.", 
  				hyde.events().get(0).get("text"));
! 		hyde.stopAttack(sheep);
  		hyde.clearEvents();
  		
--- 229,233 ----
  				"The powerful protective aura in this place prevents you from attacking that sheep.", 
  				hyde.events().get(0).get("text"));
! 		hyde.stopAttack();
  		hyde.clearEvents();