aboutsummaryrefslogtreecommitdiffstats
path: root/test/suite/intl402/ch10
diff options
context:
space:
mode:
Diffstat (limited to 'test/suite/intl402/ch10')
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_1.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_10.js15
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_11.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_13.js14
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_19_b.js9
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_19_c.js15
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_20.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_23.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_6.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.1_a.js14
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.2.1_4.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.2_a.js12
-rw-r--r--test/suite/intl402/ch10/10.1/10.1.3.js11
-rw-r--r--test/suite/intl402/ch10/10.1/10.1_L15.js17
-rw-r--r--test/suite/intl402/ch10/10.2/10.2.1.js9
-rw-r--r--test/suite/intl402/ch10/10.2/10.2.2_L15.js17
-rw-r--r--test/suite/intl402/ch10/10.2/10.2.2_a.js10
-rw-r--r--test/suite/intl402/ch10/10.2/10.2.2_b.js14
-rw-r--r--test/suite/intl402/ch10/10.2/10.2.3_b.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.1.js10
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js18
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_1_c.js12
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_CS_a.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.2_L15.js17
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.3.js15
-rw-r--r--test/suite/intl402/ch10/10.3/10.3.3_L15.js17
-rw-r--r--test/suite/intl402/ch10/10.3/10.3_L15.js17
-rw-r--r--test/suite/intl402/ch10/10.3/10.3_a.js10
-rw-r--r--test/suite/intl402/ch10/10.3/10.3_b.js14
-rw-r--r--test/suite/intl402/ch10/10.4/10.4_a.js9
33 files changed, 208 insertions, 235 deletions
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_1.js b/test/suite/intl402/ch10/10.1/10.1.1_1.js
index 432e073fc..1f35563bb 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_1.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_1.js
@@ -1,12 +1,11 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that an object can't be re-initialized as a Collator.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that an object can't be re-initialized as a Collator.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
testWithIntlConstructors(function (Constructor) {
var obj, error;
@@ -40,4 +39,3 @@ testWithIntlConstructors(function (Constructor) {
return true;
});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_10.js b/test/suite/intl402/ch10/10.1/10.1.1_10.js
index 5c6b657b5..08fae192c 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_10.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_10.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- * changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the behavior of a Record is not affected by
+ adversarial changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
taintProperties(["localeMatcher", "kn", "kf"]);
@@ -15,4 +15,3 @@ var locale = new Intl.Collator(undefined, {localeMatcher: "lookup"}).resolvedOpt
if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
$ERROR("Collator returns invalid locale " + locale + ".");
}
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_11.js b/test/suite/intl402/ch10/10.1/10.1.1_11.js
index 447fd8b28..da500b382 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_11.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_11.js
@@ -1,12 +1,10 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the option localeMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option localeMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
testOption(Intl.Collator, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_13.js b/test/suite/intl402/ch10/10.1/10.1.1_13.js
index 4129eebd2..7d9a2c1bc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_13.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_13.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the options numeric and caseFirst are processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the options numeric and caseFirst are processed
+ correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
testOption(Intl.Collator, "numeric", "boolean", undefined, undefined, {isOptional: true});
testOption(Intl.Collator, "caseFirst", "string", ["upper", "lower", "false"], undefined, {isOptional: true});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_19_b.js b/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
index f1fef2704..65e7d2ba0 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
@@ -1,10 +1,10 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests the special handling of the "co" key in Intl.Collator.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests the special handling of the "co" key in Intl.Collator.
+author: Norbert Lindenberg
+---*/
function checkCollation(extensionCoValue, usageValue, expectedCollations, expectedUsage) {
var requestLocale = extensionCoValue !== undefined ? "de-DE-u-co-" + extensionCoValue : "de-DE";
@@ -41,4 +41,3 @@ checkCollation("search", undefined, ["default"], "sort");
checkCollation("search", "search", ["default"], "search");
checkCollation("search", "sort", ["default"], "sort");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_19_c.js b/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
index 4ad76d45b..7f3de815a 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the options numeric and caseFirst can be
- * set through either the locale or the options.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the options numeric and caseFirst can be set through
+ either the locale or the options.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
var options = [
{key: "kn", property: "numeric", type: "boolean", values: [true, false]},
@@ -60,4 +60,3 @@ options.forEach(function (option) {
}
});
});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_20.js b/test/suite/intl402/ch10/10.1/10.1.1_20.js
index 97d70c0f9..a790d2019 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_20.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_20.js
@@ -1,13 +1,11 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the option sensitivity is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option sensitivity is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// the fallback is variant only for usage === sort, but that happens to be the fallback for usage
testOption(Intl.Collator, "sensitivity", "string", ["base", "accent", "case", "variant"], "variant");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_23.js b/test/suite/intl402/ch10/10.1/10.1.1_23.js
index 0b5261509..5ad42aee1 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_23.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_23.js
@@ -1,13 +1,11 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the option ignorePunctuation is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option ignorePunctuation is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// the fallback is variant only for usage === sort, but that happens to be the fallback for usage
testOption(Intl.Collator, "ignorePunctuation", "boolean", undefined, false);
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_6.js b/test/suite/intl402/ch10/10.1/10.1.1_6.js
index bc13436d7..cdda4cefc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_6.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_6.js
@@ -1,12 +1,10 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the option usage is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option usage is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
testOption(Intl.Collator, "usage", "string", ["sort", "search"], "sort");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_a.js b/test/suite/intl402/ch10/10.1/10.1.1_a.js
index 56d4b9789..79cd5ba1e 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_a.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_a.js
@@ -1,13 +1,13 @@
// Copyright 2013 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that constructing a Collator doesn't create or modify
- * unwanted properties on the RegExp constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that constructing a Collator doesn't create or modify
+ unwanted properties on the RegExp constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
testForUnwantedRegExpChanges(function () {
new Intl.Collator("de-DE-u-co-phonebk");
diff --git a/test/suite/intl402/ch10/10.1/10.1.2.1_4.js b/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
index 22e69065e..ce3b986f7 100644
--- a/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
+++ b/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
@@ -1,11 +1,12 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that for non-object values passed as this to Collator a
- * wrapper object will be initialized and returned.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+ Tests that for non-object values passed as this to Collator a
+ wrapper object will be initialized and returned.
+author: Norbert Lindenberg
+---*/
var thisValues = [true, 42, "国際化"];
@@ -18,4 +19,3 @@ thisValues.forEach(function (value) {
}
return true;
});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.2_a.js b/test/suite/intl402/ch10/10.1/10.1.2_a.js
index de69a4809..1cc9073cc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.2_a.js
+++ b/test/suite/intl402/ch10/10.1/10.1.2_a.js
@@ -2,12 +2,11 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator can be subclassed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that Intl.Collator can be subclassed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// get a collator and have it sort an array for comparison with the subclass
var locales = ["tlh", "id", "en"];
@@ -27,4 +26,3 @@ MyCollator.prototype.constructor = MyCollator;
var collator = new MyCollator(locales);
a.sort(collator.compare);
testArraysAreSame(referenceSorted, a);
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.3.js b/test/suite/intl402/ch10/10.1/10.1.3.js
index 7459d98d6..0ab3e51f3 100644
--- a/test/suite/intl402/ch10/10.1/10.1.3.js
+++ b/test/suite/intl402/ch10/10.1/10.1.3.js
@@ -1,10 +1,12 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that objects constructed by Intl.Collator have the specified internal properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+ Tests that objects constructed by Intl.Collator have the specified
+ internal properties.
+author: Norbert Lindenberg
+---*/
var obj = new Intl.Collator();
@@ -16,4 +18,3 @@ if (actualPrototype !== Intl.Collator.prototype) {
if (!Object.isExtensible(obj)) {
$ERROR("Object constructed by Intl.Collator must be extensible.");
}
-
diff --git a/test/suite/intl402/ch10/10.1/10.1_L15.js b/test/suite/intl402/ch10/10.1/10.1_L15.js
index 4dbabfd64..2185796cc 100644
--- a/test/suite/intl402/ch10/10.1/10.1_L15.js
+++ b/test/suite/intl402/ch10/10.1/10.1_L15.js
@@ -1,14 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that Intl.Collator meets the requirements for built-in
+ objects defined by the introduction of chapter 15 of the
+ ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(Intl.Collator, true, true, ["supportedLocalesOf"], 0);
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.1.js b/test/suite/intl402/ch10/10.2/10.2.1.js
index 9eccb073c..a2e5dacd1 100644
--- a/test/suite/intl402/ch10/10.2/10.2.1.js
+++ b/test/suite/intl402/ch10/10.2/10.2.1.js
@@ -1,10 +1,10 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype has the required attributes.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl.Collator.prototype has the required attributes.
+author: Norbert Lindenberg
+---*/
var desc = Object.getOwnPropertyDescriptor(Intl.Collator, "prototype");
if (desc === undefined) {
@@ -19,4 +19,3 @@ if (desc.enumerable) {
if (desc.configurable) {
$ERROR("Intl.Collator.prototype must not be configurable.");
}
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_L15.js b/test/suite/intl402/ch10/10.2/10.2.2_L15.js
index 6ffcdde84..7076f2ce3 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_L15.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_L15.js
@@ -1,14 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.supportedLocalesOf
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that Intl.Collator.supportedLocalesOf meets the
+ requirements for built-in objects defined by the introduction of
+ chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(Intl.Collator.supportedLocalesOf, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_a.js b/test/suite/intl402/ch10/10.2/10.2.2_a.js
index 5cf953ce8..772cb5c05 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_a.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_a.js
@@ -1,10 +1,11 @@
// Copyright 2012 Google Inc. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator has a supportedLocalesOf
- * property, and it works as planned.
- */
+/*---
+description: >
+ Tests that Intl.Collator has a supportedLocalesOf property, and
+ it works as planned.
+---*/
var defaultLocale = new Intl.Collator().resolvedOptions().locale;
var notSupported = 'zxx'; // "no linguistic content"
@@ -24,4 +25,3 @@ if (supportedLocales.length !== 1) {
if (supportedLocales[0] !== defaultLocale) {
$ERROR('The default locale is not returned in the supported list.');
}
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_b.js b/test/suite/intl402/ch10/10.2/10.2.2_b.js
index 1b99fd8c5..38c78faad 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_b.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_b.js
@@ -1,13 +1,13 @@
// Copyright 2013 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.supportedLocalesOf
- * doesn't access arguments that it's not given.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that Intl.Collator.supportedLocalesOf doesn't access
+ arguments that it's not given.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
taintDataProperty(Object.prototype, "1");
new Intl.Collator("und");
diff --git a/test/suite/intl402/ch10/10.2/10.2.3_b.js b/test/suite/intl402/ch10/10.2/10.2.3_b.js
index aef1e746a..5c02d60e2 100644
--- a/test/suite/intl402/ch10/10.2/10.2.3_b.js
+++ b/test/suite/intl402/ch10/10.2/10.2.3_b.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator does not accept Unicode locale
- * extension keys and values that are not allowed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that Intl.Collator does not accept Unicode locale extension
+ keys and values that are not allowed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
var testArray = [
"hello", "你好", "こんにちは",
@@ -49,4 +49,3 @@ Object.getOwnPropertyNames(keyValues).forEach(function (key) {
testArraysAreSame(defaultSortedArray, testArray.sort(collator.compare));
});
});
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.1.js b/test/suite/intl402/ch10/10.3/10.3.1.js
index 699949e18..5103cbdcd 100644
--- a/test/suite/intl402/ch10/10.3/10.3.1.js
+++ b/test/suite/intl402/ch10/10.3/10.3.1.js
@@ -1,13 +1,13 @@
// Copyright 2012 Google Inc. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype.constructor is the
- * Intl.Collator.
- */
+/*---
+description: >
+ Tests that Intl.Collator.prototype.constructor is the
+ Intl.Collator.
+---*/
if (Intl.Collator.prototype.constructor !== Intl.Collator) {
$ERROR("Intl.Collator.prototype.constructor is not the same as " +
"Intl.Collator");
}
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js b/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
index 3d49601db..2ef9a442b 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
@@ -1,14 +1,14 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that the function returned by Intl.Collator.prototype.compare
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that the function returned by
+ Intl.Collator.prototype.compare meets the requirements for
+ built-in objects defined by the introduction of chapter 15 of the
+ ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(new Intl.Collator().compare, true, false, [], 2);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_1_c.js b/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
index 73f2bcf09..43e9f2b3f 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
@@ -1,12 +1,11 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that compare function is bound to its Intl.Collator.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that compare function is bound to its Intl.Collator.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
var strings = ["d", "O", "od", "oe", "of", "ö", "o\u0308", "X", "y", "Z", "Z.", "𠮷野家", "吉野家", "!A", "A", "b", "C"];
var locales = [undefined, ["de"], ["de-u-co-phonebk"], ["en"], ["ja"], ["sv"]];
@@ -33,4 +32,3 @@ locales.forEach(function (locales) {
}
});
});
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
index a946245b4..427f62d3a 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
@@ -2,12 +2,14 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that the function returned by Intl.Collator.prototype.compare
- * returns 0 when comparing Strings that are considered canonically equivalent
- * by the Unicode standard.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+ Tests that the function returned by
+ Intl.Collator.prototype.compare returns 0 when comparing Strings
+ that are considered canonically equivalent by the Unicode
+ standard.
+author: Norbert Lindenberg
+---*/
var collator = new Intl.Collator();
var pairs = [
@@ -65,4 +67,3 @@ function toU(s) {
}
return result;
}
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
index c417d2b8a..8f3d83e18 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the compare function isn't entirely unreasonable.
- * This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the compare function isn't entirely unreasonable. This
+ test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// this test should be valid at least for the following locales
var locales = ["de", "en", "es", "fr", "it"];
@@ -19,4 +19,3 @@ locales.forEach(function (locale) {
var expected = ["A", "b", "C", "d", "E", "f", "g", "H", "i", "J", "k", "L", "m", "N", "V", "w", "X", "y", "Z"];
testArraysAreSame(expected, a);
});
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
index 5d5060be5..67d3e49d8 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
@@ -2,13 +2,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the compare function supports phonebook sorting if it says it does.
- * This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the compare function supports phonebook sorting if it
+ says it does. This test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// this test should be valid at least for the following locales
var locales = ["de-DE-u-co-phonebk", "de-u-co-phonebk"];
@@ -19,4 +19,3 @@ if (locales.indexOf(collator.resolvedOptions().locale) !== -1) {
var expected = ["A", "Ab", "Ä", "Af", "b", "od", "ö", "off"];
testArraysAreSame(expected, a);
}
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
index be5f1aa33..ccef21e26 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
@@ -2,13 +2,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that the compare function supports different sensitivity settings.
- * This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the compare function supports different sensitivity
+ settings. This test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
// this test should be valid at least for the following locales
var locales = ["de", "en", "es", "it"];
@@ -31,4 +31,3 @@ locales.forEach(function (locale) {
testArraysAreSame(expected[sensitivity], matches);
});
});
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_L15.js b/test/suite/intl402/ch10/10.3/10.3.2_L15.js
index 5845ea3ca..68d032f36 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_L15.js
@@ -1,14 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that the getter for Intl.Collator.prototype.compare
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that the getter for Intl.Collator.prototype.compare meets
+ the requirements for built-in objects defined by the introduction
+ of chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get , true, false, [], 0);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.3.js b/test/suite/intl402/ch10/10.3/10.3.3.js
index bc6b4fabb..8669a2770 100644
--- a/test/suite/intl402/ch10/10.3/10.3.3.js
+++ b/test/suite/intl402/ch10/10.3/10.3.3.js
@@ -1,13 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that the object returned by Intl.Collator.prototype.resolvedOptions
- * has the right properties.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+ Tests that the object returned by
+ Intl.Collator.prototype.resolvedOptions has the right properties.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
var actual = new Intl.Collator().resolvedOptions();
@@ -44,4 +44,3 @@ mustHaveProperty(actual, "ignorePunctuation", [false]);
mustHaveProperty(actual, "collation", collations);
mayHaveProperty(actual, "numeric", [true, false]);
mayHaveProperty(actual, "caseFirst", ["upper", "lower", "false"]);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.3_L15.js b/test/suite/intl402/ch10/10.3/10.3.3_L15.js
index 718cc9fea..6e9f6672b 100644
--- a/test/suite/intl402/ch10/10.3/10.3.3_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.3_L15.js
@@ -1,14 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype.resolvedOptions
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that Intl.Collator.prototype.resolvedOptions meets the
+ requirements for built-in objects defined by the introduction of
+ chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(Intl.Collator.prototype.resolvedOptions, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_L15.js b/test/suite/intl402/ch10/10.3/10.3_L15.js
index 60719736c..09dfa2fc8 100644
--- a/test/suite/intl402/ch10/10.3/10.3_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3_L15.js
@@ -1,14 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype
- * meets the requirements for built-in objects defined by the introduction of
- * chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+ Tests that Intl.Collator.prototype meets the requirements for
+ built-in objects defined by the introduction of chapter 15 of the
+ ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
testBuiltInObject(Intl.Collator.prototype, false, false, ["constructor", "compare", "resolvedOptions"]);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_a.js b/test/suite/intl402/ch10/10.3/10.3_a.js
index aa2e52845..e4016c262 100644
--- a/test/suite/intl402/ch10/10.3/10.3_a.js
+++ b/test/suite/intl402/ch10/10.3/10.3_a.js
@@ -1,10 +1,11 @@
// Copyright 2012 Google Inc. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype is an object that
- * has been initialized as an Intl.Collator.
- */
+/*---
+description: >
+ Tests that Intl.Collator.prototype is an object that has been
+ initialized as an Intl.Collator.
+---*/
// test by calling a function that would fail if "this" were not an object
// initialized as an Intl.Collator
@@ -12,4 +13,3 @@ if (Intl.Collator.prototype.compare("aаあ아", "aаあ아") !== 0) {
$ERROR("Intl.Collator.prototype is not an object that has been " +
"initialized as an Intl.Collator.");
}
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_b.js b/test/suite/intl402/ch10/10.3/10.3_b.js
index 9c3c2db32..97dbfa390 100644
--- a/test/suite/intl402/ch10/10.3/10.3_b.js
+++ b/test/suite/intl402/ch10/10.3/10.3_b.js
@@ -1,12 +1,13 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator.prototype functions throw a
- * TypeError if called on a non-object value or an object that hasn't been
- * initialized as a Collator.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+ Tests that Intl.Collator.prototype functions throw a TypeError if
+ called on a non-object value or an object that hasn't been
+ initialized as a Collator.
+author: Norbert Lindenberg
+---*/
var functions = {
"compare getter": Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get,
@@ -30,4 +31,3 @@ Object.getOwnPropertyNames(functions).forEach(function (functionName) {
}
});
});
-
diff --git a/test/suite/intl402/ch10/10.4/10.4_a.js b/test/suite/intl402/ch10/10.4/10.4_a.js
index 7527f65eb..a611bafb3 100644
--- a/test/suite/intl402/ch10/10.4/10.4_a.js
+++ b/test/suite/intl402/ch10/10.4/10.4_a.js
@@ -1,10 +1,10 @@
// Copyright 2012 Mozilla Corporation. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Tests that Intl.Collator instances have the specified properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl.Collator instances have the specified properties.
+author: Norbert Lindenberg
+---*/
var obj = new Intl.Collator();
@@ -12,4 +12,3 @@ var toStringValue = Object.prototype.toString.call(obj);
if (toStringValue !== "[object Object]") {
$ERROR("Intl.Collator instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
}
-