Monotone-Parent: 9b3ca8d1aaa3b15df09c58887d1e37a7aa3e21cc

Monotone-Revision: 198521b8ef49be92b78cac25495a2439d4763792

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-08T15:46:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-01-08 15:46:00 +00:00
parent 38c31ba2aa
commit 29ddd6719e
7 changed files with 255 additions and 131 deletions
+23 -77
View File
@@ -20,7 +20,12 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/Foundation.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h>
#import <Foundation/NSString.h>
#import "SOGoTestRunner.h"
#import "SOGoTest.h"
@@ -52,11 +57,7 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
{
if ((self = [super init]))
{
messages = [NSMutableArray new];
testCount = 0;
failuresCount = 0;
errorsCount = 0;
hasFailed = NO;
testRunner = nil;
}
return self;
@@ -64,10 +65,15 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
- (void) dealloc
{
[messages release];
[testRunner release];
[super dealloc];
}
- (void) setTestRunner: (SOGoTestRunner *) newTestRunner
{
ASSIGN (testRunner, newTestRunner);
}
- (void) setUp
{
}
@@ -97,44 +103,8 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
}
}
- (void) reportException: (NSException *) exception
method: (NSString *) methodName
withCode: (SOGoTestFailureCode) failureCode
{
static NSString *failurePrefixs[] = { @"", @"FAIL", @"ERROR" };
NSMutableString *message;
NSString *fileInfo;
hasFailed = YES;
message = [NSMutableString stringWithFormat: @"%@: %@",
failurePrefixs[failureCode], methodName];
fileInfo = [[exception userInfo] objectForKey: @"fileInfo"];
if (fileInfo)
[message appendFormat: @" (%@)\n", fileInfo];
else
[message appendString: @"\n"];
[message appendString: @"----------------------------------------------------------------------\n"];
if (failureCode == SOGoTestFailureFailure)
{
[message appendString: [exception reason]];
failuresCount++;
}
else if (failureCode == SOGoTestFailureError)
{
[message appendFormat: @"an exception occured: %@\n"
@" reason: %@",
[exception name], [exception reason]];
errorsCount++;
}
[message appendString: @"\n"];
[messages addObject: message];
}
- (void) performTest: (SEL) testMethod
{
static char failureChars[] = { '.', 'F', 'E' };
SOGoTestFailureCode failureCode;
failureCode = SOGoTestFailureSuccess;
@@ -145,9 +115,9 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
NS_HANDLER
{
failureCode = SOGoTestFailureError;
[self reportException: localException
method: @"setUp"
withCode: failureCode];
[testRunner reportException: localException
method: @"setUp"
withCode: failureCode];
}
NS_ENDHANDLER;
@@ -164,9 +134,9 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
failureCode = SOGoTestFailureFailure;
else
failureCode = SOGoTestFailureError;
[self reportException: localException
method: NSStringFromSelector (testMethod)
withCode: failureCode];
[testRunner reportException: localException
method: NSStringFromSelector (testMethod)
withCode: failureCode];
}
NS_ENDHANDLER;
}
@@ -178,35 +148,13 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
NS_HANDLER
{
failureCode = SOGoTestFailureError;
[self reportException: localException
method: @"tearDown"
withCode: failureCode];
[testRunner reportException: localException
method: @"tearDown"
withCode: failureCode];
}
NS_ENDHANDLER;
testCount++;
fprintf (stderr, "%c", failureChars[failureCode]);
}
- (void) displayReport
{
static NSString *separator = @"\n======================================================================\n";
NSString *reportMessage;
if ([messages count])
{
fprintf (stderr, "%s", [separator UTF8String]);
reportMessage = [messages componentsJoinedByString: separator];
fprintf (stderr, "%s", [reportMessage UTF8String]);
}
fprintf (stderr,
"\n----------------------------------------------------------------------\n"
"Ran %d tests\n\n", testCount);
if (hasFailed)
fprintf (stderr, "FAILED (%d failures, %d errors)\n",
failuresCount, errorsCount);
else
fprintf (stderr, "OK\n");
[testRunner incrementTestCounter: failureCode];
}
- (BOOL) run
@@ -229,8 +177,6 @@ static NSString *SOGoTestAssertException = @"SOGoTestAssertException";
}
}
[self displayReport];
return YES;
}