5 files changed, 92 insertions, 0 deletions
diff --git a/js/src/tests/test262/intl402/ch06/6.4/6.4_a.js b/js/src/tests/test262/intl402/ch06/6.4/6.4_a.js
new file mode 100644
index 000000000..05202353c
--- /dev/null
+++ b/js/src/tests/test262/intl402/ch06/6.4/6.4_a.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that valid time zone names are accepted.
+ * @author Norbert Lindenberg
+ */
+
+var validTimeZoneNames = [
+    "UTC",
+    "utc" // time zone names are case-insensitive
+];
+
+validTimeZoneNames.forEach(function (name) {
+    // this must not throw an exception for a valid time zone name
+    var format = new Intl.DateTimeFormat(["de-de"], {timeZone: name});
+    if (format.resolvedOptions().timeZone !== name.toUpperCase()) {
+        $ERROR("Time zone name " + name + " was not correctly accepted; turned into " +
+            format.resolvedOptions().timeZone + ".");
+    }
+});
+
diff --git a/js/src/tests/test262/intl402/ch06/6.4/6.4_b.js b/js/src/tests/test262/intl402/ch06/6.4/6.4_b.js
new file mode 100644
index 000000000..847d804e3
--- /dev/null
+++ b/js/src/tests/test262/intl402/ch06/6.4/6.4_b.js
@@ -0,0 +1,34 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that invalid time zone names are not accepted.
+ * @author Norbert Lindenberg
+ */
+
+var invalidTimeZoneNames = [
+    "",
+    "MEZ", // localized abbreviation
+    "Pacific Time", // localized long form
+    "cnsha", // BCP 47 time zone code
+    "invalid", // as the name says
+    "Europe/İstanbul", // non-ASCII letter
+    "asıa/baku", // non-ASCII letter
+    "europe/brußels"  // non-ASCII letter
+];
+
+invalidTimeZoneNames.forEach(function (name) {
+    var error;
+    try {
+        // this must throw an exception for an invalid time zone name
+        var format = new Intl.DateTimeFormat(["de-de"], {timeZone: name});
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Invalid time zone name " + name + " was not rejected.");
+    } else if (error.name !== "RangeError") {
+        $ERROR("Invalid time zone name " + name + " was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test262/intl402/ch06/6.4/6.4_c.js b/js/src/tests/test262/intl402/ch06/6.4/6.4_c.js
new file mode 100644
index 000000000..a9969b648
--- /dev/null
+++ b/js/src/tests/test262/intl402/ch06/6.4/6.4_c.js
@@ -0,0 +1,36 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that additional time zone names, if accepted, are handled correctly.
+ * @author Norbert Lindenberg
+ */
+
+// canonicalization specified in conformance clause
+var additionalTimeZoneNames = {
+    "Etc/GMT": "UTC",
+    "Greenwich": "UTC",
+    "PRC": "Asia/Shanghai",
+    "AmErIcA/LoS_aNgElEs": "America/Los_Angeles",
+    "etc/gmt+7": "Etc/GMT+7"
+};
+
+Object.getOwnPropertyNames(additionalTimeZoneNames).forEach(function (name) {
+    var format, error;
+    try {
+        format = new Intl.DateTimeFormat([], {timeZone: name});
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        var actual = format.resolvedOptions().timeZone;
+        var expected = additionalTimeZoneNames[name];
+        if (actual !== expected) {
+            $ERROR("Time zone name " + name + " was accepted, but incorrectly canonicalized to " +
+                actual + "; expected " + expected + ".");
+        }
+    } else if (error.name !== "RangeError") {
+        $ERROR("Time zone name " + name + " was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test262/intl402/ch06/6.4/browser.js b/js/src/tests/test262/intl402/ch06/6.4/browser.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/test262/intl402/ch06/6.4/browser.js
diff --git a/js/src/tests/test262/intl402/ch06/6.4/shell.js b/js/src/tests/test262/intl402/ch06/6.4/shell.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/test262/intl402/ch06/6.4/shell.js