14 files changed, 82 insertions, 97 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);
-