Merge pull request #43 from smikes/initial-Promise-tests

Initial promise tests

.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+.d8_history
+*~
+*.pyc
+console/TestCases

console/harness/PromiseHelper.js

@@ -0,0 +1,9 @@
+//-----------------------------------------------------------------------------
+function checkSequence(arr, message) {
+    arr.forEach(function(e, i) {
+        if (e !== (i+1)) {
+            $ERROR((message ? message : "Steps in unexpected sequence:") +
+                   " '" + arr.join(',') + "'");
+        }
+    });
+}

console/harness/doneprintHandle.js

@@ -3,8 +3,8 @@ function __consolePrintHandle__(msg){
 }
 
 function $DONE(){
-	if(arguments.length === 0)
+	if(!arguments[0])
 		__consolePrintHandle__('Test262:AsyncTestComplete');
 	else
 		__consolePrintHandle__('Error: ' + arguments[0]);
-}
+}

test/harness/PromiseHelper.js

@@ -0,0 +1,9 @@
+//-----------------------------------------------------------------------------
+function checkSequence(arr, message) {
+    arr.forEach(function(e, i) {
+        if (e !== (i+1)) {
+            $ERROR((message ? message : "Steps in unexpected sequence:") +
+                   " '" + arr.join(',') + "'");
+        }
+    });
+}

test/harness/doneprintHandle.js

@@ -3,8 +3,8 @@ function __consolePrintHandle__(msg){
 }
 
 function $DONE(){
-	if(arguments.length === 0)
+	if(!arguments[0])
 		__consolePrintHandle__('Test262:AsyncTestComplete');
 	else
 		__consolePrintHandle__('Error: ' + arguments[0]);
-}
+}

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.1_T1.js

@@ -0,0 +1,17 @@
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all is callable
+ *
+ * @author Sam Mikes
+ */
+
+// CHECK#1
+var x = typeof Promise.all;
+if (x !== "function") {
+    $ERROR('#1: x = typeof Promise.all; x === "function". Actual: ' + (x));
+}

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.2_T1.js

@@ -0,0 +1,17 @@
+/// Copyright 2012 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all expects 1 argument
+ *
+ * @author Sam Mikes
+ */
+
+// CHECK#1
+var x = Promise.all.length;
+if (x !== 1) {
+    $ERROR('#1: x = Promise.all.length; x === 1. Actual: ' + (x));
+}

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.1_T1.js

@@ -0,0 +1,17 @@
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all([]) is a Promise
+ *
+ * @author Sam Mikes
+ */
+
+// CHECK#1
+var x = (Promise.all([]) instanceof Promise);
+if (x !== true) {
+    $ERROR('#1: x (Promise.all([]) instanceof Promise); x === true. Actual: ' + (x));
+}

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.2_T1.js

@@ -0,0 +1,25 @@
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all([]) is resolved immediately
+ *
+ * @author Sam Mikes
+ */
+
+$INCLUDE("PromiseHelper.js");
+var sequence = [];
+
+Promise.all([]).then(function () {
+    sequence.push(1);
+}).catch($DONE);
+
+Promise.resolve().then(function() {
+    sequence.push(2);
+}).then(function () {
+    sequence.push(3);
+    checkSequence(sequence, "Promises resolved in unexpected sequence");
+}).then($DONE,$DONE);

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T1.js

@@ -0,0 +1,20 @@
+
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all is resolved with a new empty array
+ *
+ * @author Sam Mikes
+ */
+
+var arg = [];
+
+Promise.all(arg).then(function (result) {
+    if((result instanceof Array) !== true) {
+        $ERROR("expected an array from Promise.all, got " + result);
+    }
+}).then($DONE,$DONE);

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T2.js

@@ -0,0 +1,20 @@
+
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all is resolved with a new empty array
+ *
+ * @author Sam Mikes
+ */
+
+var arg = [];
+
+Promise.all(arg).then(function (result) {
+    if(result.length !== 0) {
+        $ERROR("expected an empty array from Promise.all([]), got " + result);
+    }
+}).then($DONE,$DONE);

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T3.js

@@ -0,0 +1,20 @@
+
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all is resolved with a new empty array
+ *
+ * @author Sam Mikes
+ */
+
+var arg = [];
+
+Promise.all(arg).then(function (result) {
+    if(result === arg) {
+        $ERROR("expected a new array from Promise.all but argument was re-used");
+    }
+}).then($DONE,$DONE);

test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A3.1_T1.js

@@ -0,0 +1,23 @@
+// Copyright 2014 Ecma International.  All rights reserved.
+/// Ecma International makes this code available under the terms and conditions set
+/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+/// "Use Terms").   Any redistribution of this code must retain the above
+/// copyright and this notice and otherwise comply with the Use Terms.
+
+/**
+ * Promise.all expects an iterable argument; 
+ * ref 7.4.1 non-Object fails CheckIterable
+ * ref 7.4.2 GetIterator throws TypeError if CheckIterable fails
+ *
+ * @author Sam Mikes
+ */
+
+var nonIterable = 3;
+
+Promise.all(nonIterable).then(function () {
+    $ERROR('Promise unexpectedly resolved: Promise.all(nonIterable) should throw TypeError');
+},function (err) {
+    if (!(err instanceof TypeError)) {
+        $ERROR('Expected TypeError, got ' + err);
+    }
+}).then($DONE,$DONE);

tools/packaging/test262.py

@@ -250,6 +250,12 @@ class TestCase(object):
   def IsAsyncTest(self):	
 	return '$DONE' in self.test
 
+  def GetIncludeList(self):
+    return re.findall('\$INCLUDE\([\'"]([^\)]+)[\'"]\)' ,self.test)
+
+  def GetAdditionalIncludes(self):
+    return '\n'.join([self.suite.GetInclude(include) for include in self.GetIncludeList()])
+
   def GetSource(self):
     # "var testDescrip = " + str(self.testRecord) + ';\n\n' + \
     source = self.suite.GetInclude("cth.js") + \
@@ -259,6 +265,7 @@ class TestCase(object):
         self.suite.GetInclude("testIntl.js") + \
 	self.suite.GetInclude("timer.js") + \
 	self.suite.GetInclude("doneprintHandle.js").replace('print', self.suite.print_handle) + \
+        self.GetAdditionalIncludes() + \
         self.test + '\n'
 
     if self.strict_mode: