Merge pull request #461 from jugglinmike/improve-promise-coverage-then

Improve Promise coverage: Promise.prototype.then

test/built-ins/Promise/prototype/then/rxn-handler-rejected-next.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+description: All queued jobs should be executed in series
+es6id: 25.4.2.1
+info: >
+    [...]
+    7. If handlerResult is an abrupt completion, then
+       a. Let status be Call(promiseCapability.[[Reject]], undefined,
+          «handlerResult.[[value]]»).
+       b. NextJob Completion(status).
+    8. Let status be Call(promiseCapability.[[Resolve]], undefined,
+       «handlerResult.[[value]]»).
+    9. NextJob Completion(status).
+---*/
+
+var promise = new Promise(function(_, reject) {
+  reject();
+});
+var log = '';
+
+promise.then(function() {
+    log += 'A';
+  }, function() {
+    log += 'a';
+  });
+
+promise.then(function() {
+    log += 'B';
+  }, function() {
+    log += 'b';
+  });
+
+promise.then(function() {
+    log += 'C';
+  }, function() {
+    log += 'c';
+  });
+
+promise.then(function() {
+    $DONE('This promise should not be fulfilled.');
+  }, function() {
+    if (log !== 'abc') {
+      $DONE(
+        'Expected each "onFulfilled" handler to be invoked exactly once in series. ' +
+        'Expected: abc. Actual: ' + log
+      );
+      return;
+    }
+
+    $DONE();
+  });

test/built-ins/Promise/prototype/then/on-rejected-return-value.js → test/built-ins/Promise/prototype/then/rxn-handler-rejected-return-abrupt.js

-// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+description: An abrupt completion should trigger promise rejection
 es6id: 25.4.5.3
-description: The return value of the `onRejected` method
 info: >
+    [...]
     7. Return PerformPromiseThen(promise, onFulfilled, onRejected,
        resultCapability).
 
     25.4.5.3.1 PerformPromiseThen
-
     [...]
     9. Else if the value of promise's [[PromiseState]] internal slot is
        "rejected",
        a. Let reason be the value of promise's [[PromiseResult]] internal slot.
        b. Perform EnqueueJob("PromiseJobs", PromiseReactionJob,
           «rejectReaction, reason»).
+
+    25.4.2.1 PromiseReactionJob
+    [...]
+    7. If handlerResult is an abrupt completion, then
+       a. Let status be Call(promiseCapability.[[Reject]], undefined,
+          «handlerResult.[[value]]»).
+       b. NextJob Completion(status).
+    8. Let status be Call(promiseCapability.[[Resolve]], undefined,
+       «handlerResult.[[value]]»).
+    9. NextJob Completion(status).
 ---*/
 
-var returnVal = {};
-var promise = new Promise(function(_, reject) {
+var value = {};
+var p1 = new Promise(function(_, reject) {
   reject();
 });
+var p2;
 
-promise.then(null, function() {
-  return returnVal;
-}).then(function(result) {
-  assert.sameValue(result, returnVal);
+p2 = p1.then(function() {}, function() {
+    throw value;
+  });
 
-  $DONE();
-}, function() {
-  $DONE('The promise should not be rejected');
-});
+p2.then(function() {
+    $DONE('The `onFulfilled` handler should not be invoked.');
+  }, function(x) {
+    if (x !== value) {
+      $DONE('The `onRejected` handler should be invoked with the promise result.');
+      return;
+    }
+
+    $DONE();
+  });

test/built-ins/Promise/prototype/then/rxn-handler-rejected-return-normal.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+description: A normal completion should trigger promise fulfillment
+es6id: 25.4.5.3
+info: >
+    [...]
+    7. Return PerformPromiseThen(promise, onFulfilled, onRejected,
+       resultCapability).
+
+    25.4.5.3.1 PerformPromiseThen
+    [...]
+    9. Else if the value of promise's [[PromiseState]] internal slot is
+       "rejected",
+       a. Let reason be the value of promise's [[PromiseResult]] internal slot.
+       b. Perform EnqueueJob("PromiseJobs", PromiseReactionJob,
+          «rejectReaction, reason»).
+
+    25.4.2.1 PromiseReactionJob
+    [...]
+    7. If handlerResult is an abrupt completion, then
+       a. Let status be Call(promiseCapability.[[Reject]], undefined,
+          «handlerResult.[[value]]»).
+       b. NextJob Completion(status).
+    8. Let status be Call(promiseCapability.[[Resolve]], undefined,
+       «handlerResult.[[value]]»).
+    9. NextJob Completion(status).
+---*/
+
+var value = {};
+var p1 = new Promise(function(_, reject) {
+  reject();
+});
+var p2;
+
+p2 = p1.then(function() {}, function() {
+    return value;
+  });
+
+p2.then(function(x) {
+    if (x !== value) {
+      $DONE('The `onFulfilled` handler should be invoked with the promise result.');
+      return;
+    }
+
+    $DONE();
+  }, function() {
+    $DONE('The `onRejected` handler should not be invoked.');
+  });

test/built-ins/Promise/prototype/then/S25.4.2.1_A2.1_T1.js → test/built-ins/Promise/prototype/then/rxn-handler-thrower.js

@@ -13,9 +13,11 @@ var obj = {};
 
 var p = Promise.reject(obj).then(/*Identity, Thrower*/)
         .then(function () {
-            $ERROR("Unexpected fulfillment - promise should reject.");
+            $DONE("Unexpected fulfillment - promise should reject.");
         }, function (arg) {
             if (arg !== obj) {
-                $ERROR("Expected reject reason to be obj, actually " + arg);
+                $DONE("Expected reject reason to be obj, actually " + arg);
+                return;
             }
-        }).then($DONE, $DONE);
+            $DONE();
+        });