Skip to content
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

Jump to bottom

Define constant variables for multiple {errors, exceptions} userInfo keys #238

Merged
merged 4 commits into from
Mar 17, 2016
Merged

Define constant variables for multiple {errors, exceptions} userInfo keys #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f90962
Define constant variables for userInfo
Mar 16, 2016
6bf1a8b
Update tests
Mar 16, 2016
4cf8db0
Update document
Mar 17, 2016
d537ccf
Delete extra space
Mar 17, 2016
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
12 changes: 12 additions & 0 deletions Bolts/Common/BFTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ extern NSInteger const kBFMultipleErrorsError;
*/
extern NSString *const BFTaskMultipleExceptionsException;

/*!
An error userInfo key used if there were multiple errors on <BFTask taskForCompletionOfAllTasks:>.
Value type is `NSArray<NSError *> *`.
*/
extern NSString *const BFTaskMultipleErrorsUserInfoKey;

/*!
An error userInfo key used if there were multiple exceptions on <BFTask taskForCompletionOfAllTasks:>.
Value type is `NSArray<NSException *> *`.
*/
extern NSString *const BFTaskMultipleExceptionsUserInfoKey;

@class BFExecutor;
@class BFTask;

Expand Down
7 changes: 5 additions & 2 deletions Bolts/Common/BFTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
NSInteger const kBFMultipleErrorsError = 80175001;
NSString *const BFTaskMultipleExceptionsException = @"BFMultipleExceptionsException";

NSString *const BFTaskMultipleErrorsUserInfoKey = @"errors";
NSString *const BFTaskMultipleExceptionsUserInfoKey = @"exceptions";

@interface BFTask () {
id _result;
NSError *_error;
Expand Down Expand Up @@ -144,7 +147,7 @@ + (instancetype)taskForCompletionOfAllTasks:(nullable NSArray<BFTask *> *)tasks
NSException *exception =
[NSException exceptionWithName:BFTaskMultipleExceptionsException
reason:@"There were multiple exceptions."
userInfo:@{ @"exceptions": exceptions }];
userInfo:@{ BFTaskMultipleExceptionsUserInfoKey: exceptions }];
tcs.exception = exception;
}
} else if (errors.count > 0) {
Expand All @@ -153,7 +156,7 @@ + (instancetype)taskForCompletionOfAllTasks:(nullable NSArray<BFTask *> *)tasks
} else {
NSError *error = [NSError errorWithDomain:BFTaskErrorDomain
code:kBFMultipleErrorsError
userInfo:@{ @"errors": errors }];
userInfo:@{ BFTaskMultipleErrorsUserInfoKey: errors }];
tcs.error = error;
}
} else if (cancelled > 0) {
Expand Down
4 changes: 2 additions & 2 deletions BoltsTests/TaskTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ - (void)testTaskForCompletionOfAllTasksTwoExceptions {

XCTAssertEqualObjects(@"BFMultipleExceptionsException", task.exception.name);

NSArray *exceptions = [task.exception.userInfo objectForKey:@"exceptions"];
NSArray *exceptions = [task.exception.userInfo objectForKey:BFTaskMultipleExceptionsUserInfoKey];
XCTAssertEqual(2, (int)exceptions.count);
XCTAssertEqualObjects(@"TestException", [[exceptions objectAtIndex:0] name]);
XCTAssertEqualObjects(@"TestException", [[exceptions objectAtIndex:1] name]);
Expand Down Expand Up @@ -474,7 +474,7 @@ - (void)testTaskForCompletionOfAllTasksTwoErrors {
XCTAssertEqualObjects(@"bolts", task.error.domain);
XCTAssertEqual(kBFMultipleErrorsError, task.error.code);

NSArray *errors = [task.error.userInfo objectForKey:@"errors"];
NSArray *errors = [task.error.userInfo objectForKey:BFTaskMultipleErrorsUserInfoKey];
XCTAssertEqualObjects(@"BoltsTests", [[errors objectAtIndex:0] domain]);
XCTAssertEqual(35, (int)[[errors objectAtIndex:0] code]);
XCTAssertEqualObjects(@"BoltsTests", [[errors objectAtIndex:1] domain]);
Expand Down