[Macattrick-commit] macattrick/Test AllTests.m,1.20,1.21 PositionHeapTest.m,1.2,1.3 PositionTest.m,1.11,1.12

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

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

Modified Files:
	AllTests.m PositionHeapTest.m PositionTest.m 
Log Message:
export and import positionsheap added. import is not yet tested approprietly

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PositionTest.m	27 Apr 2005 19:36:45 -0000	1.11
--- PositionTest.m	8 May 2005 20:17:50 -0000	1.12
***************
*** 146,149 ****
--- 146,165 ----
  	UKObjectsEqual(positionKeeper ,newKeeper);
  }
+ 
+ - (void) testSaveString {
+ 	Position *pos = [[Position alloc] initWithIdentifier:@"Inner Midfield" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 
+ 									passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0];
+ 
+ 	UKStringsEqual([pos saveString], @"Inner Midfield|0.600000|0.350000|0.250000|0.000000|0.500000|0.150000|0.000000|0.100000|0.000000|0.000000");
+ }
+ 
+ - (void) testInitFromSaveString {
+ 	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);
+ 	UKFloatsEqual([pos wingerRate], 0.7, 0.001);
+ 	UKFloatsEqual([pos setPiecesRate], 0.05, 0.001);
+ 	UKFloatsEqual([pos total], 1.0, 0.001);
+ }
+ 
  -(void) testIsEqual {
  	UKTrue([positionKeeper isEqual: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]]);

Index: AllTests.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AllTests.m	27 Apr 2005 19:36:44 -0000	1.20
--- AllTests.m	8 May 2005 20:17:50 -0000	1.21
***************
*** 94,97 ****
--- 94,98 ----
  	[[HattrickOrg uniqueInstance] setLoginName: [AllTests getProperty:@"login"] password:[AllTests getProperty:@"password"]];
  	[properties setObject:[NSString stringWithFormat:@"%@/Test/players.xml", [Properties libraryPath]] forKey:@"playersfile"];
+     [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile.xml", [Properties libraryPath]] forKey:@"positionsfile"];
      [pool release];
  }

Index: PositionHeapTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionHeapTest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionHeapTest.m	27 Apr 2005 19:36:45 -0000	1.2
--- PositionHeapTest.m	8 May 2005 20:17:50 -0000	1.3
***************
*** 28,35 ****
--- 28,43 ----
  
  #import "PositionHeapTest.h"
+ #import "AllTests.h"
  
  
  @implementation PositionHeapTest
  
+ - (void) testUniqueInstance {
+ 	PositionHeap *first = [PositionHeap uniqueInstance];
+ 	UKNotNil(first);
+ 	PositionHeap *second = [PositionHeap uniqueInstance];
+ 	UKObjectsSame(first, second);
+ }
+ 
  
  -(void) testPossiblePositions {
***************
*** 39,41 ****
--- 47,68 ----
  }
  
+ - (void) testPositionWithIdentifier {
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Keeper"] identifier], @"Keeper");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Keeper"] keeperRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Central Defender"] identifier], @"Central Defender");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Central Defender"] defenderRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Inner Midfield"] identifier], @"Inner Midfield");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Inner Midfield"] playmakingRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] identifier], @"Forward");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] scorerRate] > 0);
+ }
+ 
+ 
+ 
+ - (void) testSaveToFile {
+ 	PositionHeap *heap = [PositionHeap uniqueInstance];
+ 	NSString *filename = [AllTests getProperty:@"positionsfile"];
+ 	[heap saveToFile:filename];
+ }
+ 
  @end