From efddc54c38dff096ea4bd165e57039dc71464123 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 14 Aug 2015 16:53:56 -0700 Subject: [PATCH] Remove old GHUnit defines. --- Tests/Other/TestCases/TestCase/PFTestCase.h | 20 ++------------------ Tests/Other/TestCases/TestCase/PFTestCase.m | 2 +- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Tests/Other/TestCases/TestCase/PFTestCase.h b/Tests/Other/TestCases/TestCase/PFTestCase.h index b40972ba5..5ac28b282 100644 --- a/Tests/Other/TestCases/TestCase/PFTestCase.h +++ b/Tests/Other/TestCases/TestCase/PFTestCase.h @@ -76,22 +76,6 @@ #define OCMProtocolMock _PFOCMockWarning _PFProtocolMock #define OCMPartialMock _PFOCMockWarning _PFPartialMock -#define GHFail XCTFail -#define GHAssertTrue XCTAssertTrue -#define GHAssertFalse XCTAssertFalse -#define GHAssertNil XCTAssertNil -#define GHAssertNotNil XCTAssertNotNil -#define GHAssertEquals XCTAssertEqual -#define GHAssertNotEquals XCTAssertNotEqual -#define GHAssertEqualStrings XCTAssertEqualObjects -#define GHAssertNotEqualStrings XCTAssertNotEqualObjects -#define GHAssertEqualObjects XCTAssertEqualObjects -#define GHAssertNotEqualObjects XCTAssertNotEqualObjects -#define GHAssertEqualsWithAccuracy XCTAssertEqualWithAccuracy -#define GHAssertThrows XCTAssertThrows -#define GHAssertThrowsSpecificNamed XCTAssertThrowsSpecificNamed -#define GHAssertNoThrow XCTAssertNoThrow - #define PFAssertEqualInts(a1, a2, description...) \ XCTAssertEqual((int)(a1), (int)(a2), ## description); @@ -105,9 +89,9 @@ XCTAssertTrue([a1 isKindOfClass:[a2 class]], ## description) XCTAssertFalse([a1 isKindOfClass:[a2 class]], ## description) #define PFAssertThrowsInconsistencyException(expression, ...) \ -GHAssertThrowsSpecificNamed(expression, NSException, NSInternalInconsistencyException, __VA_ARGS__) +XCTAssertThrowsSpecificNamed(expression, NSException, NSInternalInconsistencyException, __VA_ARGS__) #define PFAssertThrowsInvalidArgumentException(expression, ...) \ -GHAssertThrowsSpecificNamed(expression, NSException, NSInvalidArgumentException, __VA_ARGS__) +XCTAssertThrowsSpecificNamed(expression, NSException, NSInvalidArgumentException, __VA_ARGS__) #define PFAssertStringContains(a, b) XCTAssertTrue([(a) rangeOfString:(b)].location != NSNotFound) diff --git a/Tests/Other/TestCases/TestCase/PFTestCase.m b/Tests/Other/TestCases/TestCase/PFTestCase.m index 29b49b032..1720bf12f 100644 --- a/Tests/Other/TestCases/TestCase/PFTestCase.m +++ b/Tests/Other/TestCases/TestCase/PFTestCase.m @@ -157,7 +157,7 @@ - (void)assertDirectory:(NSString *)directoryPath hasContents:(NSDictionary *)ex } else if ([contents isKindOfClass:[NSNull class]]) { [self assertFileExists:path]; } else { - GHFail(@"Not sure what to do with a %@", [contents class]); + XCTFail(@"Not sure what to do with a %@", [contents class]); } }];