[Macattrick-commit] macattrick/Test PositionHeapTest.m,1.4,1.5 PositionTest.m,1.12,1.13

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

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

Modified Files:
	PositionHeapTest.m PositionTest.m 
Log Message:
import bug fixed

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PositionTest.m	8 May 2005 20:17:50 -0000	1.12
--- PositionTest.m	16 May 2005 13:32:00 -0000	1.13
***************
*** 157,160 ****
--- 157,161 ----
  	Position *pos = [[Position alloc] initFromSaveString: @"Winger|0.000000|0.000000|0.000000|0.100000|0.000000|0.050000|0.700000|0.000000|0.100000|0.050000"];
  	UKNotNil(pos);
+ 	UKEqual([pos identifier], @"Winger");
  	UKFloatsEqual([pos wingerRate], 0.7, 0.001);
  	UKFloatsEqual([pos setPiecesRate], 0.05, 0.001);

Index: PositionHeapTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionHeapTest.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PositionHeapTest.m	9 May 2005 19:49:03 -0000	1.4
--- PositionHeapTest.m	16 May 2005 13:32:00 -0000	1.5
***************
*** 56,59 ****
--- 56,61 ----
  	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] identifier], @"Forward");
  	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] scorerRate] > 0);
+ 	
+ 	
  }
  
***************
*** 70,81 ****
  }
  
  - (void) testLoadFromFile{
  	NSString *filename = [AllTests getProperty:@"positionsfile1"];
  	PositionHeap *heap = [PositionHeap uniqueInstance];
  	[heap loadPositionHeapFromFile:filename];
! //	Position *newDefender = [heap positionWithIdentifier:@"Central Defender"];
! //	UKNotNil(newDefender);
! //	UKFloatsEqual([newDefender defenderRate], 0.95, 0.001);
! //	UKFloatsEqual([newDefender playerFormRate], 0.8, 0.001);
  }
  
--- 72,85 ----
  }
  
+ 
  - (void) testLoadFromFile{
  	NSString *filename = [AllTests getProperty:@"positionsfile1"];
  	PositionHeap *heap = [PositionHeap uniqueInstance];
  	[heap loadPositionHeapFromFile:filename];
! 	Position *newDefender = [heap positionWithIdentifier:@"Central Defender"];
! 	UKNotNil(newDefender);
! 	UKEqual([newDefender  identifier],@"Central Defender");
! 	UKFloatsEqual([newDefender defenderRate], 0.95, 0.001);
! 	UKFloatsEqual([newDefender playerFormRate], 0.8, 0.001);
  }