diff --git a/Tennis/objc/Tennis/TennisGame3.m b/Tennis/objc/Tennis/TennisGame3.m index bf12e6c2..bba66c0b 100644 --- a/Tennis/objc/Tennis/TennisGame3.m +++ b/Tennis/objc/Tennis/TennisGame3.m @@ -19,11 +19,11 @@ NSString *p2N; } -- (id)initWithPlayer1:(NSString *)p1N player2:(NSString *)p2N { - self = [super initWithPlayer1:p1N player2:p2N]; +- (id)initWithPlayer1:(NSString *)ap1N player2:(NSString *)ap2N { + self = [super initWithPlayer1:ap1N player2:ap2N]; if (self) { - self->p1N = p1N; - self->p2N = p2N; + p1N = ap1N; + p2N = ap2N; p1 = 0; p2 = 0; } diff --git a/Tennis/objc/TennisTests/TennisTests.m b/Tennis/objc/TennisTests/TennisTests.m index 6a4a2ea1..d8af05d4 100644 --- a/Tennis/objc/TennisTests/TennisTests.m +++ b/Tennis/objc/TennisTests/TennisTests.m @@ -12,9 +12,10 @@ #import "TennisGame2.h" #import "TennisGame3.h" -@interface TennisTests (Parametrized) +@interface TennisTests() + (NSArray*)parameters; @end + @implementation TennisTests (Parametrized) + (id)defaultTestSuite { SenTestSuite *testSuite = [[SenTestSuite alloc] initWithName:NSStringFromClass(self)]; @@ -100,7 +101,7 @@ } - (NSString *)name { - return [NSString stringWithFormat:@"%@ (%d,%d,%@)", [super name], player1Score, player2Score, expectedScore]; + return [[super name] stringByReplacingOccurrencesOfString:@"]" withString:[NSString stringWithFormat:@" (%d,%d,%@)]", player1Score, player2Score, expectedScore]]; } - (void)checkAllScoresForGame:(TennisGame *)game {