Skip to content

Commit 5f86ac8

Browse files
committed
Merge pull request #20 from ParsePlatform/nlutsenko.ghunit
Remove old GHUnit defines.
2 parents db36476 + efddc54 commit 5f86ac8

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

Tests/Other/TestCases/TestCase/PFTestCase.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,6 @@
7676
#define OCMProtocolMock _PFOCMockWarning _PFProtocolMock
7777
#define OCMPartialMock _PFOCMockWarning _PFPartialMock
7878

79-
#define GHFail XCTFail
80-
#define GHAssertTrue XCTAssertTrue
81-
#define GHAssertFalse XCTAssertFalse
82-
#define GHAssertNil XCTAssertNil
83-
#define GHAssertNotNil XCTAssertNotNil
84-
#define GHAssertEquals XCTAssertEqual
85-
#define GHAssertNotEquals XCTAssertNotEqual
86-
#define GHAssertEqualStrings XCTAssertEqualObjects
87-
#define GHAssertNotEqualStrings XCTAssertNotEqualObjects
88-
#define GHAssertEqualObjects XCTAssertEqualObjects
89-
#define GHAssertNotEqualObjects XCTAssertNotEqualObjects
90-
#define GHAssertEqualsWithAccuracy XCTAssertEqualWithAccuracy
91-
#define GHAssertThrows XCTAssertThrows
92-
#define GHAssertThrowsSpecificNamed XCTAssertThrowsSpecificNamed
93-
#define GHAssertNoThrow XCTAssertNoThrow
94-
9579
#define PFAssertEqualInts(a1, a2, description...) \
9680
XCTAssertEqual((int)(a1), (int)(a2), ## description);
9781

@@ -105,9 +89,9 @@ XCTAssertTrue([a1 isKindOfClass:[a2 class]], ## description)
10589
XCTAssertFalse([a1 isKindOfClass:[a2 class]], ## description)
10690

10791
#define PFAssertThrowsInconsistencyException(expression, ...) \
108-
GHAssertThrowsSpecificNamed(expression, NSException, NSInternalInconsistencyException, __VA_ARGS__)
92+
XCTAssertThrowsSpecificNamed(expression, NSException, NSInternalInconsistencyException, __VA_ARGS__)
10993

11094
#define PFAssertThrowsInvalidArgumentException(expression, ...) \
111-
GHAssertThrowsSpecificNamed(expression, NSException, NSInvalidArgumentException, __VA_ARGS__)
95+
XCTAssertThrowsSpecificNamed(expression, NSException, NSInvalidArgumentException, __VA_ARGS__)
11296

11397
#define PFAssertStringContains(a, b) XCTAssertTrue([(a) rangeOfString:(b)].location != NSNotFound)

Tests/Other/TestCases/TestCase/PFTestCase.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ - (void)assertDirectory:(NSString *)directoryPath hasContents:(NSDictionary *)ex
157157
} else if ([contents isKindOfClass:[NSNull class]]) {
158158
[self assertFileExists:path];
159159
} else {
160-
GHFail(@"Not sure what to do with a %@", [contents class]);
160+
XCTFail(@"Not sure what to do with a %@", [contents class]);
161161
}
162162
}];
163163

0 commit comments

Comments
 (0)