Skip to content

Remove old GHUnit defines. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2015
Merged

Remove old GHUnit defines. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions Tests/Other/TestCases/TestCase/PFTestCase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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)
2 changes: 1 addition & 1 deletion Tests/Other/TestCases/TestCase/PFTestCase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}];

Expand Down