1 files changed, 58 insertions, 0 deletions
diff --git a/js/src/tests/test262/intl402/Collator/numeric-and-caseFirst.js b/js/src/tests/test262/intl402/Collator/numeric-and-caseFirst.js
new file mode 100644
index 0000000000..6953fe1b08
--- /dev/null
+++ b/js/src/tests/test262/intl402/Collator/numeric-and-caseFirst.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.
+
+/*---
+es5id: 10.1.1_19_c
+description: >
+    Tests that the options numeric and caseFirst can be  set through
+    either the locale or the options.
+author: Norbert Lindenberg
+---*/
+
+var options = [
+    {key: "kn", property: "numeric", type: "boolean", values: [true, false]},
+    {key: "kf", property: "caseFirst", type: "string", values: ["upper", "lower", "false"]}
+];
+
+options.forEach(function (option) {
+    var defaultLocale = new Intl.Collator().resolvedOptions().locale;
+    var collator, opt, result;
+    
+    // find out which values are supported for a property in the default locale
+    var supportedValues = [];
+    option.values.forEach(function (value) {
+        opt = {};
+        opt[option.property] = value;
+        collator = new Intl.Collator([defaultLocale], opt);
+        result = collator.resolvedOptions()[option.property];
+        if (result !== undefined && supportedValues.indexOf(result) === -1) {
+            supportedValues.push(result);
+        }
+    });
+    
+    // verify that the supported values can also be set through the locale
+    supportedValues.forEach(function (value) {
+        collator = new Intl.Collator([defaultLocale + "-u-" + option.key + "-" + value]);
+        result = collator.resolvedOptions()[option.property];
+        assert.sameValue(result, value, "Property " + option.property + " couldn't be set through locale extension key " + option.key + ".");
+    });
+    
+    // verify that the options setting overrides the locale setting
+    supportedValues.forEach(function (value) {
+        var otherValue;
+        option.values.forEach(function (possibleValue) {
+            if (possibleValue !== value) {
+                otherValue = possibleValue;
+            }
+        });
+        if (otherValue !== undefined) {
+            opt = {};
+            opt[option.property] = value;
+            collator = new Intl.Collator([defaultLocale + "-u-" + option.key + "-" + otherValue], opt);
+            result = collator.resolvedOptions()[option.property];
+            assert.sameValue(result, value, "Options value for property " + option.property + " doesn't override locale extension key " + option.key + ".");
+        }
+    });
+});
+
+reportCompare(0, 0);