fix batch_await return null when error, should be error object, fix a…

…libaba#20
Feng-xp · Mar 3, 2019 · dabf22b · dabf22b
1 parent cc0dc88
commit dabf22b
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/Examples/coobjcBaseExample/coobjcBaseExampleTests/coobjcPromiseTests.m b/Examples/coobjcBaseExample/coobjcBaseExampleTests/coobjcPromiseTests.m
@@ -47,6 +47,31 @@ static id testPromise2() {
     return promise;
 }
 
+static COPromise *testPromise11() {
+    return [COPromise promise:^(COPromiseFullfill  _Nonnull fullfill, COPromiseReject  _Nonnull reject) {
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            fullfill(@"1");
+        });
+    }];
+}
+static COPromise *testPromise12() {
+    return [COPromise promise:^(COPromiseFullfill  _Nonnull fullfill, COPromiseReject  _Nonnull reject) {
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            fullfill(@"2");
+        });
+    }];
+}
+static COPromise *testPromise13() {
+    return [COPromise promise:^(COPromiseFullfill  _Nonnull fullfill, COPromiseReject  _Nonnull reject) {
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            reject([NSError errorWithDomain:@"aa" code:3 userInfo:@{}]);
+        });
+    }];
+}
+
 @interface Test123 : NSObject
 {
     dispatch_block_t _block;
@@ -180,5 +205,26 @@ static id testPromise3() {
         });
     });
 
+    it(@"batch await test", ^{
+        co_launch(^{
+
+            NSArray *results = batch_await(@[
+                                             testPromise11(),
+                                             testPromise12(),
+                                             testPromise13(),
+                                             ]);
+            expect(results[0]).to.equal(@"1");
+            expect(results[1]).to.equal(@"2");
+            expect(results[2]).to.equal([NSError errorWithDomain:@"aa" code:3 userInfo:@{}]);
+
+        });
+
+        waitUntil(^(DoneCallback done) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                done();
+            });
+        });
+    });
+
 });
 SpecEnd
diff --git a/coobjc/api/COCoroutine.m b/coobjc/api/COCoroutine.m
@@ -395,7 +395,7 @@ id co_await(id awaitable) {
               }]
              catch:^(NSError * _Nonnull error) {
                  co.lastError = error;
-                 [chan send_nonblock:nil];
+                 [chan send_nonblock:error];
              }];
 
             [chan onCancel:^(COChan * _Nonnull chan) {