Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1560)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/mjsunit/harmony/promises.js

Issue 110503004: ES6 Promise: Rename method names to match spec. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/promise.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/mjsunit/harmony/promises.js
diff --git a/test/mjsunit/harmony/promises.js b/test/mjsunit/harmony/promises.js
index 3aa3fec33bf7b7ac0605d6ac4e4b1b690e207da7..117e5e2cc122f6c54cc08e07f554bcefddfeb91a 100644
--- a/test/mjsunit/harmony/promises.js
+++ b/test/mjsunit/harmony/promises.js
@@ -66,254 +66,254 @@ function assertAsyncDone(iteration) {
})();
(function() {
- Promise.resolved(5);
- Promise.resolved(5).chain(undefined, assertUnreachable).chain(
- function(x) { assertAsync(x === 5, "resolved/chain-nohandler") },
+ Promise.resolve(5);
+ Promise.resolve(5).chain(undefined, assertUnreachable).chain(
+ function(x) { assertAsync(x === 5, "resolve/chain-nohandler") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- Promise.rejected(5).chain(assertUnreachable, undefined).chain(
+ Promise.reject(5).chain(assertUnreachable, undefined).chain(
assertUnreachable,
- function(r) { assertAsync(r === 5, "rejected/chain-nohandler") }
+ function(r) { assertAsync(r === 5, "reject/chain-nohandler") }
)
assertAsyncRan()
})();
(function() {
- Promise.resolved(5).then(undefined, assertUnreachable).chain(
- function(x) { assertAsync(x === 5, "resolved/then-nohandler") },
+ Promise.resolve(5).then(undefined, assertUnreachable).chain(
+ function(x) { assertAsync(x === 5, "resolve/then-nohandler") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- Promise.rejected(5).then(assertUnreachable, undefined).chain(
+ Promise.reject(5).then(assertUnreachable, undefined).chain(
assertUnreachable,
- function(r) { assertAsync(r === 5, "rejected/then-nohandler") }
+ function(r) { assertAsync(r === 5, "reject/then-nohandler") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(
- function(x) { assertAsync(x === p2, "resolved/chain") },
+ function(x) { assertAsync(x === p2, "resolve/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(
- function(x) { assertAsync(x === 5, "resolved/then") },
+ function(x) { assertAsync(x === 5, "resolve/then") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.rejected(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.reject(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(
- function(x) { assertAsync(x === p2, "rejected/chain") },
+ function(x) { assertAsync(x === p2, "reject/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.rejected(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.reject(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(
assertUnreachable,
- function(x) { assertAsync(x === 5, "rejected/then") }
+ function(x) { assertAsync(x === 5, "reject/then") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { return x }, assertUnreachable).chain(
- function(x) { assertAsync(x === p1, "resolved/chain/chain") },
+ function(x) { assertAsync(x === p1, "resolve/chain/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { return x }, assertUnreachable).then(
- function(x) { assertAsync(x === 5, "resolved/chain/then") },
+ function(x) { assertAsync(x === 5, "resolve/chain/then") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { return 6 }, assertUnreachable).chain(
- function(x) { assertAsync(x === 6, "resolved/chain/chain2") },
+ function(x) { assertAsync(x === 6, "resolve/chain/chain2") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { return 6 }, assertUnreachable).then(
- function(x) { assertAsync(x === 6, "resolved/chain/then2") },
+ function(x) { assertAsync(x === 6, "resolve/chain/then2") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(function(x) { return x + 1 }, assertUnreachable).chain(
- function(x) { assertAsync(x === 6, "resolved/then/chain") },
+ function(x) { assertAsync(x === 6, "resolve/then/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(function(x) { return x + 1 }, assertUnreachable).then(
- function(x) { assertAsync(x === 6, "resolved/then/then") },
+ function(x) { assertAsync(x === 6, "resolve/then/then") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
- p3.then(function(x){ return Promise.resolved(x+1) }, assertUnreachable).chain(
- function(x) { assertAsync(x === 6, "resolved/then/chain2") },
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
+ p3.then(function(x){ return Promise.resolve(x+1) }, assertUnreachable).chain(
+ function(x) { assertAsync(x === 6, "resolve/then/chain2") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
- p3.then(function(x) { return Promise.resolved(x+1) }, assertUnreachable).then(
- function(x) { assertAsync(x === 6, "resolved/then/then2") },
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
+ p3.then(function(x) { return Promise.resolve(x+1) }, assertUnreachable).then(
+ function(x) { assertAsync(x === 6, "resolve/then/then2") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { throw 6 }, assertUnreachable).chain(
assertUnreachable,
- function(x) { assertAsync(x === 6, "resolved/chain-throw/chain") }
+ function(x) { assertAsync(x === 6, "resolve/chain-throw/chain") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(function(x) { throw 6 }, assertUnreachable).then(
assertUnreachable,
- function(x) { assertAsync(x === 6, "resolved/chain-throw/then") }
+ function(x) { assertAsync(x === 6, "resolve/chain-throw/then") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(function(x) { throw 6 }, assertUnreachable).chain(
assertUnreachable,
- function(x) { assertAsync(x === 6, "resolved/then-throw/chain") }
+ function(x) { assertAsync(x === 6, "resolve/then-throw/chain") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(function(x) { throw 6 }, assertUnreachable).then(
assertUnreachable,
- function(x) { assertAsync(x === 6, "resolved/then-throw/then") }
+ function(x) { assertAsync(x === 6, "resolve/then-throw/then") }
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
+ var p1 = Promise.resolve(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.chain(
- function(x) { assertAsync(x === p2, "resolved/thenable/chain") },
+ function(x) { assertAsync(x === p2, "resolve/thenable/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(5)
+ var p1 = Promise.resolve(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.then(
- function(x) { assertAsync(x === 5, "resolved/thenable/then") },
+ function(x) { assertAsync(x === 5, "resolve/thenable/then") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.rejected(5)
+ var p1 = Promise.reject(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.chain(
- function(x) { assertAsync(x === p2, "rejected/thenable/chain") },
+ function(x) { assertAsync(x === p2, "reject/thenable/chain") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.rejected(5)
+ var p1 = Promise.reject(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.then(
assertUnreachable,
- function(x) { assertAsync(x === 5, "rejected/thenable/then") }
+ function(x) { assertAsync(x === 5, "reject/thenable/then") }
)
assertAsyncRan()
})();
@@ -321,8 +321,8 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(
function(x) { assertAsync(x === p2, "chain/resolve") },
assertUnreachable
@@ -334,8 +334,8 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(
function(x) { assertAsync(x === 5, "then/resolve") },
assertUnreachable
@@ -347,8 +347,8 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.chain(
function(x) { assertAsync(x === p2, "chain/reject") },
assertUnreachable
@@ -360,8 +360,8 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(p1)
- var p3 = Promise.resolved(p2)
+ var p2 = Promise.resolve(p1)
+ var p3 = Promise.resolve(p2)
p3.then(
assertUnreachable,
function(x) { assertAsync(x === 5, "then/reject") }
@@ -374,7 +374,7 @@ function assertAsyncDone(iteration) {
var deferred = Promise.deferred()
var p1 = deferred.promise
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.chain(
function(x) { assertAsync(x === p2, "chain/resolve/thenable") },
assertUnreachable
@@ -387,7 +387,7 @@ function assertAsyncDone(iteration) {
var deferred = Promise.deferred()
var p1 = deferred.promise
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.then(
function(x) { assertAsync(x === 5, "then/resolve/thenable") },
assertUnreachable
@@ -400,7 +400,7 @@ function assertAsyncDone(iteration) {
var deferred = Promise.deferred()
var p1 = deferred.promise
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.chain(
function(x) { assertAsync(x === p2, "chain/reject/thenable") },
assertUnreachable
@@ -413,7 +413,7 @@ function assertAsyncDone(iteration) {
var deferred = Promise.deferred()
var p1 = deferred.promise
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
- var p3 = Promise.resolved(p2)
+ var p3 = Promise.resolve(p2)
p3.then(
assertUnreachable,
function(x) { assertAsync(x === 5, "then/reject/thenable") }
@@ -423,8 +423,8 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
var deferred = Promise.deferred()
var p3 = deferred.promise
p3.chain(
@@ -436,8 +436,8 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
var deferred = Promise.deferred()
var p3 = deferred.promise
p3.then(
@@ -449,8 +449,8 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
var deferred = Promise.deferred()
var p3 = deferred.promise
p3.chain(
@@ -462,8 +462,8 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
- var p2 = Promise.resolved(p1)
+ var p1 = Promise.resolve(5)
+ var p2 = Promise.resolve(p1)
var deferred = Promise.deferred()
var p3 = deferred.promise
p3.then(
@@ -475,7 +475,7 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
+ var p1 = Promise.resolve(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
var deferred = Promise.deferred()
var p3 = deferred.promise
@@ -488,7 +488,7 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(5)
+ var p1 = Promise.resolve(5)
var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
var deferred = Promise.deferred()
var p3 = deferred.promise
@@ -501,7 +501,7 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(0)
+ var p1 = Promise.resolve(0)
var p2 = p1.chain(function(x) { return p2 }, assertUnreachable)
p2.chain(
assertUnreachable,
@@ -511,7 +511,7 @@ function assertAsyncDone(iteration) {
})();
(function() {
- var p1 = Promise.resolved(0)
+ var p1 = Promise.resolve(0)
var p2 = p1.then(function(x) { return p2 }, assertUnreachable)
p2.chain(
assertUnreachable,
@@ -578,7 +578,7 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(2)
+ var p2 = Promise.resolve(2)
var p3 = Promise.deferred().promise
Promise.all([p1, p2, p3]).chain(
assertUnreachable,
@@ -605,29 +605,29 @@ function assertAsyncDone(iteration) {
})();
(function() {
- Promise.one([]).chain(
+ Promise.race([]).chain(
assertUnreachable,
assertUnreachable
)
})();
(function() {
- var p1 = Promise.resolved(1)
- var p2 = Promise.resolved(2)
- var p3 = Promise.resolved(3)
- Promise.one([p1, p2, p3]).chain(
- function(x) { assertAsync(x === 1, "resolved/all") },
+ var p1 = Promise.resolve(1)
+ var p2 = Promise.resolve(2)
+ var p3 = Promise.resolve(3)
+ Promise.race([p1, p2, p3]).chain(
+ function(x) { assertAsync(x === 1, "resolve/all") },
assertUnreachable
)
assertAsyncRan()
})();
(function() {
- var p1 = Promise.resolved(1)
- var p2 = Promise.resolved(2)
- var p3 = Promise.resolved(3)
- Promise.one([0, p1, p2, p3]).chain(
- function(x) { assertAsync(x === 0, "resolved-const/all") },
+ var p1 = Promise.resolve(1)
+ var p2 = Promise.resolve(2)
+ var p3 = Promise.resolve(3)
+ Promise.race([0, p1, p2, p3]).chain(
+ function(x) { assertAsync(x === 0, "resolve-const/all") },
assertUnreachable
)
assertAsyncRan()
@@ -640,8 +640,8 @@ function assertAsyncDone(iteration) {
var p2 = deferred2.promise
var deferred3 = Promise.deferred()
var p3 = deferred3.promise
- Promise.one([p1, p2, p3]).chain(
- function(x) { assertAsync(x === 3, "one/resolve") },
+ Promise.race([p1, p2, p3]).chain(
+ function(x) { assertAsync(x === 3, "race/resolve") },
assertUnreachable
)
deferred3.resolve(3)
@@ -652,10 +652,10 @@ function assertAsyncDone(iteration) {
(function() {
var deferred = Promise.deferred()
var p1 = deferred.promise
- var p2 = Promise.resolved(2)
+ var p2 = Promise.resolve(2)
var p3 = Promise.deferred().promise
- Promise.one([p1, p2, p3]).chain(
- function(x) { assertAsync(x === 2, "resolved/one") },
+ Promise.race([p1, p2, p3]).chain(
+ function(x) { assertAsync(x === 2, "resolve/race") },
assertUnreachable
)
deferred.resolve(1)
@@ -669,8 +669,8 @@ function assertAsyncDone(iteration) {
var p2 = deferred2.promise
var deferred3 = Promise.deferred()
var p3 = deferred3.promise
- Promise.one([p1, p2, p3]).chain(
- function(x) { assertAsync(x === 3, "one/resolve/reject") },
+ Promise.race([p1, p2, p3]).chain(
+ function(x) { assertAsync(x === 3, "race/resolve/reject") },
assertUnreachable
)
deferred3.resolve(3)
@@ -685,9 +685,9 @@ function assertAsyncDone(iteration) {
var p2 = deferred2.promise
var deferred3 = Promise.deferred()
var p3 = deferred3.promise
- Promise.one([p1, p2, p3]).chain(
+ Promise.race([p1, p2, p3]).chain(
assertUnreachable,
- function(x) { assertAsync(x === 3, "one/reject/resolve") }
+ function(x) { assertAsync(x === 3, "race/reject/resolve") }
)
deferred3.reject(3)
deferred1.resolve(1)
@@ -728,8 +728,8 @@ function assertAsyncDone(iteration) {
assertTrue(log === "nx1nr2dn", "subclass/create")
log = ""
- var p4 = MyPromise.resolved(4)
- var p5 = MyPromise.rejected(5)
+ var p4 = MyPromise.resolve(4)
+ var p5 = MyPromise.reject(5)
assertTrue(p4 instanceof MyPromise, "subclass/instance4")
assertTrue(p5 instanceof MyPromise, "subclass/instance5")
d3.resolve(3)
@@ -742,11 +742,11 @@ function assertAsyncDone(iteration) {
assertTrue(log === "dnwnwnx6", "subclass/chain")
log = ""
- Promise.all([11, Promise.resolved(12), 13, MyPromise.resolved(14), 15, 16])
+ Promise.all([11, Promise.resolve(12), 13, MyPromise.resolve(14), 15, 16])
assertTrue(log === "nx14wn", "subclass/all/arg")
log = ""
- MyPromise.all([21, Promise.resolved(22), 23, MyPromise.resolved(24), 25, 26])
+ MyPromise.all([21, Promise.resolve(22), 23, MyPromise.resolve(24), 25, 26])
assertTrue(log === "nx24dnnx21wnnx23wnwnnx25wnnx26wn", "subclass/all/self")
})();
« no previous file with comments | « src/promise.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698