Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B Bolts-ObjC
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 34
    • Issues 34
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 7
    • Merge requests 7
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • BoltsFramework
  • Bolts-ObjC
  • Merge requests
  • !238

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

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/chuganzy/errors_key into master 9 years ago
  • Overview 11
  • Commits 4
  • Pipelines 0
  • Changes 3

Created by: chuganzy

Compare
  • master (base)

and
  • latest version
    d537ccfc
    4 commits, 2 years ago

3 files
+ 19
- 4

    Preferences

    File browser
    Compare changes
Bolts/‎Common‎
BFTa‎sk.h‎ +12 -0
BFTa‎sk.m‎ +5 -2
Bolts‎Tests‎
TaskT‎ests.m‎ +2 -2
Bolts/Common/BFTask.h
+ 12
- 0
  • View file @ d537ccfc

  • Edit in single-file editor

  • Open in Web IDE


@@ -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;
Bolts/Common/BFTask.m
+ 5
- 2
  • View file @ d537ccfc

  • Edit in single-file editor

  • Open in Web IDE


@@ -25,6 +25,9 @@ NSString *const BFTaskErrorDomain = @"bolts";
NSInteger const kBFMultipleErrorsError = 80175001;
NSString *const BFTaskMultipleExceptionsException = @"BFMultipleExceptionsException";
NSString *const BFTaskMultipleErrorsUserInfoKey = @"errors";
NSString *const BFTaskMultipleExceptionsUserInfoKey = @"exceptions";
@interface BFTask () {
id _result;
NSError *_error;
@@ -144,7 +147,7 @@ NSString *const BFTaskMultipleExceptionsException = @"BFMultipleExceptionsExcept
NSException *exception =
[NSException exceptionWithName:BFTaskMultipleExceptionsException
reason:@"There were multiple exceptions."
userInfo:@{ @"exceptions": exceptions }];
userInfo:@{ BFTaskMultipleExceptionsUserInfoKey: exceptions }];
tcs.exception = exception;
}
} else if (errors.count > 0) {
@@ -153,7 +156,7 @@ NSString *const BFTaskMultipleExceptionsException = @"BFMultipleExceptionsExcept
} else {
NSError *error = [NSError errorWithDomain:BFTaskErrorDomain
code:kBFMultipleErrorsError
userInfo:@{ @"errors": errors }];
userInfo:@{ BFTaskMultipleErrorsUserInfoKey: errors }];
tcs.error = error;
}
} else if (cancelled > 0) {
BoltsTests/TaskTests.m
+ 2
- 2
  • View file @ d537ccfc

  • Edit in single-file editor

  • Open in Web IDE


@@ -399,7 +399,7 @@
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]);
@@ -474,7 +474,7 @@
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]);
Assignee
Nikita Lutsenko's avatar
Nikita Lutsenko
Assign to
0 Reviewers
None
Request review from
Labels
1
CLA Signed
1
CLA Signed
    Assign labels
  • Manage project labels

Milestone
1.7.0
1.7.0
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
2
2 participants
Nikita Lutsenko
Administrator
Reference: BoltsFramework/Bolts-ObjC!238
Source branch: github/fork/chuganzy/errors_key

Menu

Explore Projects Groups Snippets