From 7f9096291016f90b316f0191282cc79be53c7cbb Mon Sep 17 00:00:00 2001
From: Takeru Chuganji <takeru@hoppenichu.com>
Date: Thu, 17 Mar 2016 05:39:56 +0900
Subject: [PATCH 1/4] Define constant variables for userInfo
---
Bolts/Common/BFTask.h | 3 +++
Bolts/Common/BFTask.m | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Bolts/Common/BFTask.h b/Bolts/Common/BFTask.h
index c8bf333..054c6e3 100644
--- a/Bolts/Common/BFTask.h
+++ b/Bolts/Common/BFTask.h
@@ -29,6 +29,9 @@ extern NSInteger const kBFMultipleErrorsError;
*/
extern NSString *const BFTaskMultipleExceptionsException;
+extern NSString *const BFTaskMultipleErrorsUserInfoKey; // NSArray<NSError *>
+extern NSString *const BFTaskMultipleExceptionsUserInfoKey; // NSArray<NSException *>
+
@class BFExecutor;
@class BFTask;
diff --git a/Bolts/Common/BFTask.m b/Bolts/Common/BFTask.m
index 60a87bc..757cd7d 100644
--- a/Bolts/Common/BFTask.m
+++ b/Bolts/Common/BFTask.m
@@ -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) {
--
GitLab
From 6bf1a8b5fa90eea3b456ea5ab4c60a0b815daf03 Mon Sep 17 00:00:00 2001
From: Takeru Chuganji <takeru@hoppenichu.com>
Date: Thu, 17 Mar 2016 05:42:23 +0900
Subject: [PATCH 2/4] Update tests
---
BoltsTests/TaskTests.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BoltsTests/TaskTests.m b/BoltsTests/TaskTests.m
index 7be5c04..db4d06a 100644
--- a/BoltsTests/TaskTests.m
+++ b/BoltsTests/TaskTests.m
@@ -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]);
--
GitLab
From 4cf8db0b35cd4299521266177c7f54692e2998bd Mon Sep 17 00:00:00 2001
From: Takeru Chuganji <takeru@hoppenichu.com>
Date: Thu, 17 Mar 2016 12:11:20 +0900
Subject: [PATCH 3/4] Update document
---
Bolts/Common/BFTask.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Bolts/Common/BFTask.h b/Bolts/Common/BFTask.h
index 054c6e3..776926e 100644
--- a/Bolts/Common/BFTask.h
+++ b/Bolts/Common/BFTask.h
@@ -29,8 +29,17 @@ extern NSInteger const kBFMultipleErrorsError;
*/
extern NSString *const BFTaskMultipleExceptionsException;
-extern NSString *const BFTaskMultipleErrorsUserInfoKey; // NSArray<NSError *>
-extern NSString *const BFTaskMultipleExceptionsUserInfoKey; // NSArray<NSException *>
+/*!
+ 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;
--
GitLab
From d537ccfc0644fd6dfb69cf7e203ae469861addc0 Mon Sep 17 00:00:00 2001
From: Takeru Chuganji <takeru@hoppenichu.com>
Date: Thu, 17 Mar 2016 12:15:05 +0900
Subject: [PATCH 4/4] Delete extra space
---
Bolts/Common/BFTask.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Bolts/Common/BFTask.h b/Bolts/Common/BFTask.h
index 776926e..a2eb696 100644
--- a/Bolts/Common/BFTask.h
+++ b/Bolts/Common/BFTask.h
@@ -37,7 +37,7 @@ extern NSString *const BFTaskMultipleErrorsUserInfoKey;
/*!
An error userInfo key used if there were multiple exceptions on <BFTask taskForCompletionOfAllTasks:>.
- Value type is `NSArray<NSException *> *`.
+ Value type is `NSArray<NSException *> *`.
*/
extern NSString *const BFTaskMultipleExceptionsUserInfoKey;
--
GitLab