[Macattrick-commit] macattrick/Test LineUpTreeLayerTest.m,1.6,1.7 LineUpTreeNodeTest.m,1.7,1.8 PlayerSortingTest.m,1.4,1.5 PositionTest.m,1.13,1.14

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick/Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11784/Test

Modified Files:
	LineUpTreeLayerTest.m LineUpTreeNodeTest.m PlayerSortingTest.m 
	PositionTest.m 
Log Message:
PlayerState object introduced. Changeable data is now stored in it. Player object uses currentState to access the data

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PositionTest.m	16 May 2005 13:32:00 -0000	1.13
--- PositionTest.m	29 May 2005 13:17:14 -0000	1.14
***************
*** 44,60 ****
  	positionWinger = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"];
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill: 6 keeperSkill: 6
! 			  playmakerSkill: 1 scorerSkill: 1
! 				passingSkill: 1 wingerSkill: 1
! 			   defenderSkill: 1 setPiecesSkill:1];
! 	[player1 setExperience:1];
! 	[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill: 7 keeperSkill: 1
! 		  playmakerSkill: 8 scorerSkill: 4
! 			passingSkill: 3 wingerSkill: 4
! 			   defenderSkill: 3 setPiecesSkill:8];
! 	[player2 setExperience:1];
! 	[player2 setPlayerForm:8];
  
  }
--- 44,58 ----
  	positionWinger = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"];
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill:6]; 	[player1 setKeeperSkill:6];
! 	[player1 setPlaymakerSkill:1];	[player1 setScorerSkill:1];
! 	[player1 setPassingSkill:1];	[player1 setWingerSkill:1]; 
! 	[player1 setDefenderSkill:1];   [player1 setSetPiecesSkill:1];
! 	[player1 setExperience:1];		[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill:7]; 	[player2 setKeeperSkill:1];
! 	[player2 setPlaymakerSkill:8];	[player2 setScorerSkill:4];
! 	[player2 setPassingSkill:3];	[player2 setWingerSkill:4]; 
! 	[player2 setDefenderSkill:3];   [player2 setSetPiecesSkill:8];
! 	[player2 setExperience:1];		[player2 setPlayerForm:8];
  
  }

Index: PlayerSortingTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PlayerSortingTest.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlayerSortingTest.m	27 Apr 2005 19:36:45 -0000	1.4
--- PlayerSortingTest.m	29 May 2005 13:17:14 -0000	1.5
***************
*** 45,52 ****
  	[player1 setPlayerName:@"player1"];
  	[player2 setPlayerName:@"PLAYER2"];
! 	[player1 setStaminaSkill:4 keeperSkill:7 playmakerSkill:2 scorerSkill:1 
! 				passingSkill:4 wingerSkill:1 defenderSkill:5 setPiecesSkill:8];
! 	[player2 setStaminaSkill:7 keeperSkill:6 playmakerSkill:3 scorerSkill:1 
! 				passingSkill:6 wingerSkill:3 defenderSkill:6 setPiecesSkill:2];	
  }
  
--- 45,56 ----
  	[player1 setPlayerName:@"player1"];
  	[player2 setPlayerName:@"PLAYER2"];
! 	[player1 setStaminaSkill:4]; 	[player1 setKeeperSkill:7];
! 	[player1 setPlaymakerSkill:2];	[player1 setScorerSkill:1];
! 	[player1 setPassingSkill:4];	[player1 setWingerSkill:1]; 
! 	[player1 setDefenderSkill:5];   [player1 setSetPiecesSkill:8];
! 	[player2 setStaminaSkill:7]; 	[player2 setKeeperSkill:6];
! 	[player2 setPlaymakerSkill:3];	[player2 setScorerSkill:1];
! 	[player2 setPassingSkill:6];	[player2 setWingerSkill:3]; 
! 	[player2 setDefenderSkill:6];   [player2 setSetPiecesSkill:2];
  }
  

Index: LineUpTreeNodeTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeNodeTest.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LineUpTreeNodeTest.m	27 Apr 2005 19:36:45 -0000	1.7
--- LineUpTreeNodeTest.m	29 May 2005 13:17:14 -0000	1.8
***************
*** 43,66 ****
  - (void)setUp {
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill: 6 keeperSkill: 6
! 			  playmakerSkill: 1 scorerSkill: 1
! 				passingSkill: 1 wingerSkill: 1
! 			   defenderSkill: 1 setPiecesSkill:1];
! 	[player1 setExperience:1];
! 	[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill: 7 keeperSkill: 1
! 			  playmakerSkill: 8 scorerSkill: 4
! 				passingSkill: 3 wingerSkill: 4
! 			   defenderSkill: 3 setPiecesSkill:8];
! 	[player2 setExperience:1];
! 	[player2 setPlayerForm:8];
  	player3 = [[Player alloc] init];
! 	[player3 setStaminaSkill: 4 keeperSkill: 1
! 			  playmakerSkill: 5 scorerSkill: 7
! 				passingSkill: 4 wingerSkill: 4
! 			   defenderSkill: 3 setPiecesSkill:6];
! 	[player3 setExperience:1];
! 	[player3 setPlayerForm:8];
  	position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"];
  	position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"];
--- 43,63 ----
  - (void)setUp {
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill:6]; 	[player1 setKeeperSkill:6];
! 	[player1 setPlaymakerSkill:1];	[player1 setScorerSkill:1];
! 	[player1 setPassingSkill:1];	[player1 setWingerSkill:1]; 
! 	[player1 setDefenderSkill:1];   [player1 setSetPiecesSkill:1];
! 	[player1 setExperience:1];		[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill:7]; 	[player2 setKeeperSkill:1];
! 	[player2 setPlaymakerSkill:8];	[player2 setScorerSkill:4];
! 	[player2 setPassingSkill:3];	[player2 setWingerSkill:4]; 
! 	[player2 setDefenderSkill:3];   [player2 setSetPiecesSkill:8];
! 	[player2 setExperience:1];		[player2 setPlayerForm:8];
  	player3 = [[Player alloc] init];
! 	[player3 setStaminaSkill:4]; 	[player3 setKeeperSkill:1];
! 	[player3 setPlaymakerSkill:5];	[player3 setScorerSkill:7];
! 	[player3 setPassingSkill:4];	[player3 setWingerSkill:4]; 
! 	[player3 setDefenderSkill:3];   [player3 setSetPiecesSkill:6];
! 	[player3 setExperience:1];		[player3 setPlayerForm:8];
  	position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"];
  	position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"];

Index: LineUpTreeLayerTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LineUpTreeLayerTest.m	27 Apr 2005 19:36:45 -0000	1.6
--- LineUpTreeLayerTest.m	29 May 2005 13:17:13 -0000	1.7
***************
*** 30,33 ****
--- 30,34 ----
  #import "PositionHeap.h"
  
+ 
  @implementation LineUpTreeLayerTest
  
***************
*** 43,66 ****
  - (void)setUp {
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill: 6 keeperSkill: 6
! 			  playmakerSkill: 1 scorerSkill: 1
! 				passingSkill: 1 wingerSkill: 1
! 			   defenderSkill: 1 setPiecesSkill:1];
! 	[player1 setExperience:1];
! 	[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill: 7 keeperSkill: 1
! 			  playmakerSkill: 8 scorerSkill: 4
! 				passingSkill: 3 wingerSkill: 4
! 			   defenderSkill: 3 setPiecesSkill:8];
! 	[player2 setExperience:1];
! 	[player2 setPlayerForm:8];
  	player3 = [[Player alloc] init];
! 	[player3 setStaminaSkill: 4 keeperSkill: 1
! 			  playmakerSkill: 5 scorerSkill: 7
! 				passingSkill: 4 wingerSkill: 4
! 			   defenderSkill: 3 setPiecesSkill:6];
! 	[player3 setExperience:1];
! 	[player3 setPlayerForm:8];
  	position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"];
  	position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"];
--- 44,64 ----
  - (void)setUp {
  	player1 = [[Player alloc] init];
! 	[player1 setStaminaSkill:6]; 	[player1 setKeeperSkill:6];
! 	[player1 setPlaymakerSkill:1];	[player1 setScorerSkill:1];
! 	[player1 setPassingSkill:1];	[player1 setWingerSkill:1]; 
! 	[player1 setDefenderSkill:1];   [player1 setSetPiecesSkill:1];
! 	[player1 setExperience:1];		[player1 setPlayerForm:8];
  	player2 = [[Player alloc] init];
! 	[player2 setStaminaSkill:7]; 	[player2 setKeeperSkill:1];
! 	[player2 setPlaymakerSkill:8];	[player2 setScorerSkill:4];
! 	[player2 setPassingSkill:3];	[player2 setWingerSkill:4]; 
! 	[player2 setDefenderSkill:3];   [player2 setSetPiecesSkill:8];
! 	[player2 setExperience:1];		[player2 setPlayerForm:8];
  	player3 = [[Player alloc] init];
! 	[player3 setStaminaSkill:4]; 	[player3 setKeeperSkill:1];
! 	[player3 setPlaymakerSkill:5];	[player3 setScorerSkill:7];
! 	[player3 setPassingSkill:4];	[player3 setWingerSkill:4]; 
! 	[player3 setDefenderSkill:3];   [player3 setSetPiecesSkill:6];
! 	[player3 setExperience:1];		[player3 setPlayerForm:8];
  	position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"];
  	position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"];