diff options
Diffstat (limited to 'UnitTesting/GTMTestTimerTest.m')
-rw-r--r-- | UnitTesting/GTMTestTimerTest.m | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/UnitTesting/GTMTestTimerTest.m b/UnitTesting/GTMTestTimerTest.m index 86f9d22..27758ff 100644 --- a/UnitTesting/GTMTestTimerTest.m +++ b/UnitTesting/GTMTestTimerTest.m @@ -6,9 +6,9 @@ // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy // of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -25,32 +25,32 @@ @implementation GTMTestTimerTest - (void)testTimer { GTMTestTimer *timer = GTMTestTimerCreate(); - STAssertNotNULL(timer, nil); + XCTAssertNotNULL(timer); GTMTestTimerRetain(timer); GTMTestTimerRelease(timer); - STAssertEqualsWithAccuracy(GTMTestTimerGetSeconds(timer), 0.0, 0.0, nil); + XCTAssertEqualWithAccuracy(GTMTestTimerGetSeconds(timer), 0.0, 0.0); GTMTestTimerStart(timer); - STAssertTrue(GTMTestTimerIsRunning(timer), nil); + XCTAssertTrue(GTMTestTimerIsRunning(timer)); NSRunLoop *loop = [NSRunLoop currentRunLoop]; [loop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; GTMTestTimerStop(timer); - - // We use greater than (and an almost absurd less than) because + + // We use greater than (and an almost absurd less than) because // these tests are very dependant on machine load, and we don't want // automated tests reporting false negatives. - STAssertGreaterThan(GTMTestTimerGetSeconds(timer), 0.1, nil); - STAssertGreaterThan(GTMTestTimerGetMilliseconds(timer), 100.0,nil); - STAssertGreaterThan(GTMTestTimerGetMicroseconds(timer), 100000.0, nil); - + XCTAssertGreaterThan(GTMTestTimerGetSeconds(timer), 0.1); + XCTAssertGreaterThan(GTMTestTimerGetMilliseconds(timer), 100.0); + XCTAssertGreaterThan(GTMTestTimerGetMicroseconds(timer), 100000.0); + // Check to make sure we're not WAY off the mark (by a factor of 10) - STAssertLessThan(GTMTestTimerGetMicroseconds(timer), 1000000.0, nil); - + XCTAssertLessThan(GTMTestTimerGetMicroseconds(timer), 1000000.0); + [loop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; GTMTestTimerStart(timer); [loop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - STAssertGreaterThan(GTMTestTimerGetSeconds(timer), 0.2, nil); + XCTAssertGreaterThan(GTMTestTimerGetSeconds(timer), 0.2); GTMTestTimerStop(timer); - STAssertEquals(GTMTestTimerGetIterations(timer), (NSUInteger)2, nil); + XCTAssertEqual(GTMTestTimerGetIterations(timer), (NSUInteger)2); GTMTestTimerRelease(timer); } @end |