From 9478a43ea75ae93ef352180806d1dbce3a515d5c Mon Sep 17 00:00:00 2001 From: Leo Balter Date: Mon, 20 Mar 2017 13:15:06 -0400 Subject: [PATCH] Fix Date coercion tests (#906) Fixes #767 --- test/built-ins/Date/UTC/coercion-errors.js | 14 ++--- test/built-ins/Date/UTC/coercion-order.js | 2 +- test/built-ins/Date/coercion-errors.js | 64 ++++++++++++++++++++++ test/built-ins/Date/coercion-order.js | 35 ++++++++++++ 4 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 test/built-ins/Date/coercion-errors.js create mode 100644 test/built-ins/Date/coercion-order.js diff --git a/test/built-ins/Date/UTC/coercion-errors.js b/test/built-ins/Date/UTC/coercion-errors.js index e0d4962771..bbca1753e4 100644 --- a/test/built-ins/Date/UTC/coercion-errors.js +++ b/test/built-ins/Date/UTC/coercion-errors.js @@ -22,39 +22,39 @@ var counter = { toString: function() { callCount += 1; } }; var callCount = 0; assert.throws(Test262Error, function() { - new Date(thrower, counter); + Date.UTC(thrower, counter); }, 'year'); assert.sameValue(callCount, 0, 'coercion halts following error from "year"'); assert.throws(Test262Error, function() { - new Date(0, thrower, counter); + Date.UTC(0, thrower, counter); }, 'month'); assert.sameValue(callCount, 0, 'coercion halts following error from "month"'); assert.throws(Test262Error, function() { - new Date(0, 0, thrower, counter); + Date.UTC(0, 0, thrower, counter); }, 'date'); assert.sameValue(callCount, 0, 'coercion halts following error from "date"'); assert.throws(Test262Error, function() { - new Date(0, 0, 1, thrower, counter); + Date.UTC(0, 0, 1, thrower, counter); }, 'hours'); assert.sameValue(callCount, 0, 'coercion halts following error from "hours"'); assert.throws(Test262Error, function() { - new Date(0, 0, 1, 0, thrower, counter); + Date.UTC(0, 0, 1, 0, thrower, counter); }, 'minutes'); assert.sameValue( callCount, 0, 'coercion halts following error from "minutes"' ); assert.throws(Test262Error, function() { - new Date(0, 0, 1, 0, 0, thrower, counter); + Date.UTC(0, 0, 1, 0, 0, thrower, counter); }, 'seconds'); assert.sameValue( callCount, 0, 'coercion halts following error from "seconds"' ); assert.throws(Test262Error, function() { - new Date(0, 0, 1, 0, 0, 0, thrower); + Date.UTC(0, 0, 1, 0, 0, 0, thrower); }, 'ms'); diff --git a/test/built-ins/Date/UTC/coercion-order.js b/test/built-ins/Date/UTC/coercion-order.js index 0ecf723745..eb1d00c5f8 100644 --- a/test/built-ins/Date/UTC/coercion-order.js +++ b/test/built-ins/Date/UTC/coercion-order.js @@ -26,6 +26,6 @@ var minutes = { toString: function() { log += 'minutes'; return 0; } }; var seconds = { toString: function() { log += 'seconds'; return 0; } }; var ms = { toString: function() { log += 'ms'; return 0; } }; -new Date(year, month, date, hours,minutes, seconds, ms); +Date.UTC(year, month, date, hours,minutes, seconds, ms); assert.sameValue(log, 'yearmonthdatehoursminutessecondsms'); diff --git a/test/built-ins/Date/coercion-errors.js b/test/built-ins/Date/coercion-errors.js new file mode 100644 index 0000000000..70aef63828 --- /dev/null +++ b/test/built-ins/Date/coercion-errors.js @@ -0,0 +1,64 @@ +// Copyright (C) 2017 the V8 project authors. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-date-year-month-date-hours-minutes-seconds-ms +description: Abrupt completions from coercing input values +info: | + 3. If NewTarget is not undefined, then + a. Let y be ? ToNumber(year). + b. Let m be ? ToNumber(month). + c. If date is supplied, let dt be ? ToNumber(date); else let dt be 1. + d. If hours is supplied, let h be ? ToNumber(hours); else let h be 0. + e. If minutes is supplied, let min be ? ToNumber(minutes); else let min be 0. + f. If seconds is supplied, let s be ? ToNumber(seconds); else let s be 0. + g. If ms is supplied, let milli be ? ToNumber(ms); else let milli be 0. + h. If y is not NaN and 0 ≤ ToInteger(y) ≤ 99, let yr be 1900+ToInteger(y); otherwise, + let yr be y. + i. Let finalDate be MakeDate(MakeDay(yr, m, dt), MakeTime(h, min, s, milli)). + j. Let O be ? OrdinaryCreateFromConstructor(NewTarget, "%DatePrototype%", « [[DateValue]] »). + k. Set O.[[DateValue]] to TimeClip(UTC(finalDate)). + l. Return O. +---*/ + +var thrower = { toString: function() { throw new Test262Error(); } }; +var counter = { toString: function() { callCount += 1; } }; +var callCount = 0; + +assert.throws(Test262Error, function() { + new Date(thrower, counter); +}, 'year'); +assert.sameValue(callCount, 0, 'coercion halts following error from "year"'); + +assert.throws(Test262Error, function() { + new Date(0, thrower, counter); +}, 'month'); +assert.sameValue(callCount, 0, 'coercion halts following error from "month"'); + +assert.throws(Test262Error, function() { + new Date(0, 0, thrower, counter); +}, 'date'); +assert.sameValue(callCount, 0, 'coercion halts following error from "date"'); + +assert.throws(Test262Error, function() { + new Date(0, 0, 1, thrower, counter); +}, 'hours'); +assert.sameValue(callCount, 0, 'coercion halts following error from "hours"'); + +assert.throws(Test262Error, function() { + new Date(0, 0, 1, 0, thrower, counter); +}, 'minutes'); +assert.sameValue( + callCount, 0, 'coercion halts following error from "minutes"' +); + +assert.throws(Test262Error, function() { + new Date(0, 0, 1, 0, 0, thrower, counter); +}, 'seconds'); +assert.sameValue( + callCount, 0, 'coercion halts following error from "seconds"' +); + +assert.throws(Test262Error, function() { + new Date(0, 0, 1, 0, 0, 0, thrower); +}, 'ms'); diff --git a/test/built-ins/Date/coercion-order.js b/test/built-ins/Date/coercion-order.js new file mode 100644 index 0000000000..f794b4d911 --- /dev/null +++ b/test/built-ins/Date/coercion-order.js @@ -0,0 +1,35 @@ +// Copyright (C) 2016 the V8 project authors. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-date-year-month-date-hours-minutes-seconds-ms +description: Order of input coercion +info: | + 3. If NewTarget is not undefined, then + a. Let y be ? ToNumber(year). + b. Let m be ? ToNumber(month). + c. If date is supplied, let dt be ? ToNumber(date); else let dt be 1. + d. If hours is supplied, let h be ? ToNumber(hours); else let h be 0. + e. If minutes is supplied, let min be ? ToNumber(minutes); else let min be 0. + f. If seconds is supplied, let s be ? ToNumber(seconds); else let s be 0. + g. If ms is supplied, let milli be ? ToNumber(ms); else let milli be 0. + h. If y is not NaN and 0 ≤ ToInteger(y) ≤ 99, let yr be 1900+ToInteger(y); otherwise, + let yr be y. + i. Let finalDate be MakeDate(MakeDay(yr, m, dt), MakeTime(h, min, s, milli)). + j. Let O be ? OrdinaryCreateFromConstructor(NewTarget, "%DatePrototype%", « [[DateValue]] »). + k. Set O.[[DateValue]] to TimeClip(UTC(finalDate)). + l. Return O. +---*/ + +var log = ''; +var year = { toString: function() { log += 'year'; return 0; } }; +var month = { toString: function() { log += 'month'; return 0; } }; +var date = { toString: function() { log += 'date'; return 1; } }; +var hours = { toString: function() { log += 'hours'; return 0; } }; +var minutes = { toString: function() { log += 'minutes'; return 0; } }; +var seconds = { toString: function() { log += 'seconds'; return 0; } }; +var ms = { toString: function() { log += 'ms'; return 0; } }; + +new Date(year, month, date, hours,minutes, seconds, ms); + +assert.sameValue(log, 'yearmonthdatehoursminutessecondsms');