Implement other routines of Promise (#1729)

Add Promise.resolve, Promise.reject, Promise.race, Promise.all and Promise.prototype.catch Also it fixes the issue 1763 JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
2017-04-26 19:47:51 +08:00
parent 9d4123c3c4
commit 078f6e101d
20 changed files with 1044 additions and 138 deletions
@@ -13,4 +13,7 @@
 * limitations under the License.
 */

-assert (Promise.prototype.length === 1);
+Promise.resolve("abc").then(function(x)
+{
+  assert (x === "abc");
+});
@@ -13,24 +13,13 @@
 * limitations under the License.
 */

-var obj = {name:""};
+var a = new Promise(function(f)
+{
+  var o = {name: "abc"};
+  f(o);
+})

-var a = new Promise(function(f, r){
-  obj.name = obj.name + "a";
-  f(obj);
+Promise.resolve(a).then(function(x)
+{
+  assert (x.name === "abc");
 });
-
-a.then(function(x) {
-  x.name = x.name + "b";
-  return x;
-}).then(null, function(x) {
-  x.name = x.name + "c"; // unreachable
-  return x;
-}).then(function(x) {
-  x.name = x.name + "d";
-  assert (obj.name === "aebd");
-});
-
-obj.name = obj.name + "e";
-
-assert (obj.name === "ae")
@@ -13,24 +13,10 @@
 * limitations under the License.
 */

-var a = new Promise(function(f, r){
-  r(0);
+Promise.reject("abc").then(function(x)
+{
+  assert (false); // should not run here.
+}, function(x)
+{
+  assert (x === "abc");
 });
-
-a
-.then(function f1(x) {
-  return x + 1; // unreachable
-}, function r1(x){
-  return x + 10;
-})
-.then(function f2(x) {
-  throw x + 100
-})
-.then(function f3(x) {
-  return x + 1000 //unreachable
-}, function r3(x) {
-  return x + 10000
-})
-.then(function(x) {
-  assert (x === 10110);
-})
@@ -13,14 +13,37 @@
 * limitations under the License.
 */

-var a = new Promise(function(f, r){
-  f("a");
+var a = Promise.resolve('a');
+var b = Promise.reject('b');
+
+Promise.race([a, b]).then(function(x)
+{
+  assert (x === 'a');
+}, function(x)
+{
+  assert (false); // should not run here.
 });

-var b = new Promise(function(f, r){
-  f(a);
-})
+Promise.race([b, a]).then(function(x)
+{
+  assert (false); // should not run here.
+}, function(x)
+{
+  assert (x === 'b');
+});

-b.then(function(x) {
-  assert (x === "a");
-})
+Promise.race([ ,b, a]).then(function(x)
+{
+  assert (x === undefined);
+}, function(x)
+{
+  assert (false); // should not run here.
+});
+
+Promise.race(a).then(function(x)
+{
+  assert (false); // should not run here.
+}, function(x)
+{
+  assert(x.name === "TypeError");
+});
@@ -0,0 +1,52 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var a = Promise.resolve('a');
+var b = Promise.resolve('b');
+var c = Promise.reject('c');
+
+Promise.all([a, b, 1]).then(function(x)
+{
+  assert (x[0] === 'a');
+  assert (x[1] === 'b');
+  assert (x[2] === 1);
+}, function(x)
+{
+  assert (false); // should not run here.
+});
+
+Promise.all([a, b, c, 1]).then(function(x)
+{
+  assert (false); // should not run here.
+}, function(x)
+{
+  assert (x === 'c');
+});
+
+Promise.all([]).then(function(x)
+{
+  assert (x.length === 0);
+}, function(x)
+{
+  assert (false); // should not run here.
+});
+
+Promise.all(a).then(function(x)
+{
+  assert (false); // should not run here.
+}, function(x)
+{
+  assert(x.name === "TypeError");
+});
@@ -0,0 +1,16 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+assert (Promise.prototype.length === 1);
@@ -0,0 +1,36 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var obj = {name:""};
+
+var a = new Promise(function(f, r){
+  obj.name = obj.name + "a";
+  f(obj);
+});
+
+a.then(function(x) {
+  x.name = x.name + "b";
+  return x;
+}).then(null, function(x) {
+  x.name = x.name + "c"; // unreachable
+  return x;
+}).then(function(x) {
+  x.name = x.name + "d";
+  assert (obj.name === "aebd");
+});
+
+obj.name = obj.name + "e";
+
+assert (obj.name === "ae")
@@ -0,0 +1,36 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var a = new Promise(function(f, r){
+  r(0);
+});
+
+a
+.then(function f1(x) {
+  return x + 1; // unreachable
+}, function r1(x){
+  return x + 10;
+})
+.then(function f2(x) {
+  throw x + 100
+})
+.then(function f3(x) {
+  return x + 1000 //unreachable
+}, function r3(x) {
+  return x + 10000
+})
+.then(function(x) {
+  assert (x === 10110);
+})
@@ -0,0 +1,26 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var a = new Promise(function(f, r){
+  f("a");
+});
+
+var b = new Promise(function(f, r){
+  f(a);
+})
+
+b.then(function(x) {
+  assert (x === "a");
+})
@@ -0,0 +1,22 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Promise.reject("abc").catch(function(x)
+{
+  assert (x === "abc");
+  return "def";
+}).then(function(x) {
+  assert (x === "def");
+});
@@ -0,0 +1,15 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+new Promise(Math.max.propertyIsEnumerable.toString).then()