[MERGE #1672 @dilijev] Update Date.UTC to not return NaN for 1 argume…

…nt. Fixes #1665. Merge pull request #1672 from dilijev:dateutc Fixes #1665: Date.UTC(x) [one-argument] spec change.
chakra-core · Oct 3, 2016 · f815ff0 · f815ff0
2 parents dcaf859 + 416e54c
commit f815ff0
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 5 deletions.
diff --git a/lib/Runtime/Library/DateImplementation.cpp b/lib/Runtime/Library/DateImplementation.cpp
@@ -1582,9 +1582,9 @@ namespace Js {
         uint ivar;
 
         // See: https://github.com/Microsoft/ChakraCore/issues/1318
-        // Date.UTC should return NaN with < 2 arguments.
-        // args.Info.Count includes an implicit first parameter, so we check for Count <= 2.
-        if (args.Info.Count <= 2)
+        // Date.UTC should return NaN with 0 arguments.
+        // args.Info.Count includes an implicit first parameter, so we check for Count <= 1.
+        if (args.Info.Count <= 1)
         {
             return JavascriptNumber::NaN;
         }

diff --git a/test/Date/dateutc.baseline b/test/Date/dateutc.baseline
@@ -1,5 +1,5 @@
-NaN
-NaN
+126230400000
+126230400000
 149817600000
 151804800000
 151804800000
@@ -11,3 +11,13 @@ NaN
 151806030040
 NaN
 NaN
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
diff --git a/test/Date/dateutc.js b/test/Date/dateutc.js
@@ -20,3 +20,56 @@ d = Date.UTC(1, 9, 24, 0, 20, 30, 40); write(d);
 d = Date.UTC(74, 9, 24, 0, 20, 30, 40, 50); write(d);
 d = Date.UTC("hello"); write(d);
 d = Date.UTC(); write(d);
+
+function assert(p, message) {
+    if (!message) {
+        message = 'assert(true)';
+    }
+
+    if (p) {
+        console.log('PASS');
+    } else {
+        console.log(`FAIL: ${message}`);
+    }
+}
+
+assert(isNaN(Date.UTC()), "expected: Date.UTC() is NaN");
+assert(!isNaN(Date.UTC(2017)), "expected: Date.UTC(2017) is not NaN");
+assert(!isNaN(Date.UTC(2017, 0)), "expected: Date.UTC(2017, 0) is not NaN;");
+assert(!isNaN(Date.UTC(2017, 0, 1)), "expected: Date.UTC(2017, 0, 1) is not NaN;");
+assert(isNaN(Date.UTC(2017, undefined)), "expected: Date.UTC(2017, undefined) is NaN");
+assert(Date.UTC(2017) === Date.UTC(2017, 0), "expected: Date.UTC(2017) === Date.UTC(2017, 0)");
+assert(Date.UTC(2017, 0) === Date.UTC(2017, 0, 1), "expected: Date.UTC(2017, 0) === Date.UTC(2017, 0, 1)");
+
+try {
+    Date.UTC({ valueOf: function() { throw "hey!" } });
+    console.log("FAIL: expected: throws");
+} catch (e) {
+    if (e.toString() === "hey!") {
+        console.log("PASS");
+    } else {
+        console.log("expected: e.toString() === 'hey!'");
+    }
+}
+
+try {
+    Date.UTC({ valueOf: function() { throw "hey!" } }, 0);
+    console.log("FAIL: expected: throws");
+} catch (e) {
+    if (e.toString() === "hey!") {
+        console.log("PASS");
+    } else {
+        console.log("expected: e.toString() === 'hey!'");
+    }
+}
+
+try {
+    Date.UTC({ valueOf: function() { throw "hey!" } }, 0, 1);
+    console.log("FAIL: expected: throws");
+} catch (e) {
+    if (e.toString() === "hey!") {
+        console.log("PASS");
+    } else {
+        console.log("expected: e.toString() === 'hey!'");
+    }
+}