4 files changed, 190 insertions, 0 deletions
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_1.js b/test/suite/intl402/ch13/13.3/13.3.0_1.js
new file mode 100644
index 000000000..0f2902162
--- /dev/null
+++ b/test/suite/intl402/ch13/13.3/13.3.0_1.js
@@ -0,0 +1,32 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. handle "this time value" correctly.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var invalidValues = [undefined, null, 5, "5", false, {valueOf: function () { return 5; }}];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    invalidValues.forEach(function (value) {
+        var error;
+        try {
+            var result = f.call(value);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " did not reject this = " + value + ".");
+        } else if (error.name !== "TypeError") {
+            $ERROR("Date.prototype." + p + " rejected this = " + value + " with wrong error " + error.name + ".");
+        }
+    });
+});
+
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_2.js b/test/suite/intl402/ch13/13.3/13.3.0_2.js
new file mode 100644
index 000000000..7d5f32fa6
--- /dev/null
+++ b/test/suite/intl402/ch13/13.3/13.3.0_2.js
@@ -0,0 +1,26 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. handle non-finite values correctly.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var invalidValues = [NaN, Infinity, -Infinity];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    invalidValues.forEach(function (value) {
+        var result = f.call(new Date(value));
+        if (result !== "Invalid Date") {
+            $ERROR("Date.prototype." + p + " did not return \"Invalid Date\" for " +
+                value + " – got " + result + " instead.");
+        }
+    });
+});
+
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_6.js b/test/suite/intl402/ch13/13.3/13.3.0_6.js
new file mode 100644
index 000000000..c97b240b4
--- /dev/null
+++ b/test/suite/intl402/ch13/13.3/13.3.0_6.js
@@ -0,0 +1,74 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. throws the same exceptions as Intl.DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var locales = [null, [NaN], ["i"], ["de_DE"]];
+var options = [
+    {localeMatcher: null},
+    {timeZone: "invalid"},
+    {hour: "long"},
+    {formatMatcher: "invalid"}
+];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    locales.forEach(function (locales) {
+        var referenceError, error;
+        try {
+            var format = new Intl.DateTimeFormat(locales);
+        } catch (e) {
+            referenceError = e;
+        }
+        if (referenceError === undefined) {
+            $ERROR("Internal error: Expected exception was not thrown by Intl.DateTimeFormat for locales " + locales + ".");
+        }
+        
+        try {
+            var result = f.call(new Date(), locales);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " didn't throw exception for locales " + locales + ".");
+        } else if (error.name !== referenceError.name) {
+            $ERROR("Date.prototype." + p + " threw exception " + error.name +
+                " for locales " + locales + "; expected " + referenceError.name + ".");
+        }
+    });
+    
+    options.forEach(function (options) {
+        var referenceError, error;
+        try {
+            var format = new Intl.DateTimeFormat([], options);
+        } catch (e) {
+            referenceError = e;
+        }
+        if (referenceError === undefined) {
+            $ERROR("Internal error: Expected exception was not thrown by Intl.DateTimeFormat for options " +
+                JSON.stringify(options) + ".");
+        }
+        
+        try {
+            var result = f.call(new Date(), [], options);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " didn't throw exception for options " +
+                JSON.stringify(options) + ".");
+        } else if (error.name !== referenceError.name) {
+            $ERROR("Date.prototype." + p + " threw exception " + error.name +
+                " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
+        }
+    });
+});
+
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_7.js b/test/suite/intl402/ch13/13.3/13.3.0_7.js
new file mode 100644
index 000000000..fe7c9271d
--- /dev/null
+++ b/test/suite/intl402/ch13/13.3/13.3.0_7.js
@@ -0,0 +1,58 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. produces the same results as Intl.DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var functions = {
+    toLocaleString: [Date.prototype.toLocaleString,
+        {year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"}],
+    toLocaleDateString: [Date.prototype.toLocaleDateString,
+        {year: "numeric", month: "numeric", day: "numeric"}],
+    toLocaleTimeString: [Date.prototype.toLocaleTimeString,
+        {hour: "numeric", minute: "numeric", second: "numeric"}]
+};
+var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
+var locales = [undefined, ["de"], ["th-u-ca-gregory-nu-thai"], ["en"], ["ja-u-ca-japanese"], ["ar-u-ca-islamicc-nu-arab"]];
+var options = [
+    undefined,
+    {hour12: false},
+    {month: "long", day: "numeric", hour: "2-digit", minute: "2-digit"}
+];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p][0];
+    var defaults = functions[p][1];
+    locales.forEach(function (locales) {
+        options.forEach(function (options) {
+            var constructorOptions = options;
+            if (options === undefined) {
+                constructorOptions = defaults;
+            } else if (options.day === undefined) {
+                // for simplicity, our options above have either both date and time or neither
+                constructorOptions = Object.create(defaults);
+                for (var prop in options) {
+                    if (options.hasOwnProperty(prop)) {
+                        constructorOptions[prop] = options[prop];
+                    }
+                }
+            }
+            var referenceDateTimeFormat = new Intl.DateTimeFormat(locales, constructorOptions);
+            var referenceFormatted = dates.map(referenceDateTimeFormat.format);
+            
+            var formatted = dates.map(function (a) { return f.call(a, locales, options); });
+            try {
+                testArraysAreSame(referenceFormatted, formatted);
+            } catch (e) {
+                e.message += " (Testing with locales " + locales + "; options " +
+                    (options ? JSON.stringify(options) : options) + ".)";
+                throw e;
+            }
+        });
+    });
+});
+