Tests/StringFormatTests.m @@ -58,7 +58,7 @@ } - (void)testAssertThrows { - STAssertThrows([NSException raise], nil); + STAssertThrows([NSException raise:NSGenericException format:@""], nil); } @end Tests/AssertionTests.m @@ -11,6 +11,16 @@ STAssertNotNil(today, nil); } +- (void)testTimeIntervalSinceReferenceDate { + NSDate *now = [NSDate date]; + NSDate *oneSecondFromNow = [[NSDate date] addTimeInterval:1.0]; + + double delta = [oneSecondFromNow timeIntervalSinceReferenceDate] - + [now timeIntervalSinceReferenceDate]; + + STAssertEqualsWithAccuracy(delta, 1.0, 0.00001, nil); +} + - (void)testCreateADateWithAString { NSDate *date = [NSDate dateWithString:@"2009-04-01 12:01:00 +0000"]; @@ -30,4 +40,24 @@ [dateFormatter release]; } +- (void)testFormatSubsecondTime { + NSDate *now = [NSDate date]; + NSDate *future = [[NSDate date] addTimeInterval:1.34]; + + double delta = [future timeIntervalSinceReferenceDate] - + [now timeIntervalSinceReferenceDate]; + + int seconds = (int)delta; + int minutes = (seconds / 60) % 60; + int tenths = (int)((delta - seconds) * 10); + + NSString *formatted = [NSString stringWithFormat:@"%02d:%02d.%1d", + minutes, seconds % 60, tenths]; + + STAssertEquals(minutes, 0, nil); + STAssertEquals(seconds, 1, nil); + STAssertEquals(tenths, 3, nil); + STAssertEqualObjects(formatted, @"00:01.3", nil); +} + @end Tests/DateTests.m @@ -54,7 +54,7 @@ class_getInstanceMethod(class, @selector(speak)); NSString *methodName = - [NSString stringWithCString:sel_getName(method_getName(method))]; + [NSString stringWithCString:sel_getName(method_getName(method)) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(methodName, @"speak", nil); } @@ -66,7 +66,7 @@ class_getClassMethod(class, @selector(allDogs)); NSString *methodName = - [NSString stringWithCString:sel_getName(method_getName(method))]; + [NSString stringWithCString:sel_getName(method_getName(method)) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(methodName, @"allDogs", nil); } @@ -78,7 +78,7 @@ class_getInstanceVariable(class, [@"name" UTF8String]); NSString *iVarName = - [NSString stringWithCString:ivar_getName(iVar)]; + [NSString stringWithCString:ivar_getName(iVar) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(iVarName, @"name", nil); } @@ -95,7 +95,7 @@ STAssertEqualObjects(name, @"Fido", nil); NSString *iVarName = - [NSString stringWithCString:ivar_getName(iVar)]; + [NSString stringWithCString:ivar_getName(iVar) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(iVarName, @"name", nil); } @@ -111,7 +111,7 @@ STAssertEqualObjects(dog.name, @"Sparky", nil); NSString *iVarName = - [NSString stringWithCString:ivar_getName(iVar)]; + [NSString stringWithCString:ivar_getName(iVar) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(iVarName, @"name", nil); } @@ -125,7 +125,7 @@ class_copyProtocolList(class, &count); NSString *protocolName = - [NSString stringWithCString:protocol_getName(protocolList[0])]; + [NSString stringWithCString:protocol_getName(protocolList[0]) encoding:NSUTF8StringEncoding]; STAssertEqualObjects(protocolName, @"Speakable", nil); } Tests/RuntimeTests.m @@ -1,14 +1,5 @@ -// -// main.m -// CocoaLearningTests -// -// Created by Mike Clark on 3/26/09. -// Copyright Clarkware Consulting, Inc. 2009. All rights reserved. -// - #import <Cocoa/Cocoa.h> -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **) argv); +int main(int argc, char *argv[]) { + return NSApplicationMain(argc, (const char **) argv); } main.m 689d115c72e3493444752e94822091e1c5152f34 Mike Clark mike@clarkware.com http://github.com/clarkware/cocoa-learning-tests/commit/abcaa4469e01d696b81c97ecec76fb1276e0a230 abcaa4469e01d696b81c97ecec76fb1276e0a230 2009-08-29T10:33:00-07:00 2009-08-29T10:33:00-07:00 Update for Mac OS X 10.6. 749f2715e8ad4cb2f8d98e9f7e7324c6f47c1e5a Mike Clark mike@clarkware.com