diff --git a/test/intl402/DisplayNames/prototype/of/type-currency-invalid.js b/test/intl402/DisplayNames/prototype/of/type-currency-invalid.js index 8c367aa8802..cf98c85d3d3 100644 --- a/test/intl402/DisplayNames/prototype/of/type-currency-invalid.js +++ b/test/intl402/DisplayNames/prototype/of/type-currency-invalid.js @@ -4,14 +4,14 @@ esid: sec-Intl.DisplayNames.prototype.of description: Throws a RangeError for invalid `currency` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) ... 6. Assert: type is "currency". 7. If ! IsWellFormedCurrencyCode(code) is false, throw a RangeError exception. 8. Return the ASCII-uppercase of code. - 6.3.1 IsWellFormedCurrencyCode ( code ) + IsWellFormedCurrencyCode ( code ) 1. If the length of currency is not 3, return false. 2. Let normalized be the ASCII-uppercase of currency. 3. If normalized contains any code unit outside of 0x0041 through 0x005A (corresponding to Unicode characters LATIN CAPITAL LETTER A through LATIN CAPITAL LETTER Z), return false. @@ -53,10 +53,6 @@ assert.throws(RangeError, function() { displayNames.of('_aaa'); }, 'leading separator (underscore)'); -assert.throws(RangeError, function() { - displayNames.of('aaa-'); -}, 'trailing separator (dash)'); - assert.throws(RangeError, function() { displayNames.of('aaa_'); }, 'trailing separator (underscore)'); diff --git a/test/intl402/DisplayNames/prototype/of/type-currency-valid.js b/test/intl402/DisplayNames/prototype/of/type-currency-valid.js index 5e6fa84c077..d1be63038b3 100644 --- a/test/intl402/DisplayNames/prototype/of/type-currency-valid.js +++ b/test/intl402/DisplayNames/prototype/of/type-currency-valid.js @@ -4,14 +4,14 @@ esid: sec-Intl.DisplayNames.prototype.of description: Returns string value for valid `currency` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) ... 6. Assert: type is "currency". 7. If ! IsWellFormedCurrencyCode(code) is false, throw a RangeError exception. 8. Return the ASCII-uppercase of code. - 6.3.1 IsWellFormedCurrencyCode ( code ) + IsWellFormedCurrencyCode ( code ) 1. If the length of currency is not 3, return false. 2. Let normalized be the ASCII-uppercase of currency. diff --git a/test/intl402/DisplayNames/prototype/of/type-region-invalid.js b/test/intl402/DisplayNames/prototype/of/type-region-invalid.js index aba3335d3e5..ac0f0be654c 100644 --- a/test/intl402/DisplayNames/prototype/of/type-region-invalid.js +++ b/test/intl402/DisplayNames/prototype/of/type-region-invalid.js @@ -4,7 +4,7 @@ esid: sec-Intl.DisplayNames.prototype.of description: Throws a RangeError for invalid `region` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) ... 2. If type is "region", then @@ -64,7 +64,7 @@ assert.throws(RangeError, function() { }, 'trailing separator (dash)'); assert.throws(RangeError, function() { - displayNames.of('111-'); + displayNames.of('111_'); }, 'trailing separator (underscore)'); assert.throws(RangeError, function() { diff --git a/test/intl402/DisplayNames/prototype/of/type-region-valid.js b/test/intl402/DisplayNames/prototype/of/type-region-valid.js index 528335ec420..7065098ee58 100644 --- a/test/intl402/DisplayNames/prototype/of/type-region-valid.js +++ b/test/intl402/DisplayNames/prototype/of/type-region-valid.js @@ -4,7 +4,7 @@ esid: sec-Intl.DisplayNames.prototype.of description: Returns string value for valid `region` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) ... 2. If type is "region", then diff --git a/test/intl402/DisplayNames/prototype/of/type-script-invalid.js b/test/intl402/DisplayNames/prototype/of/type-script-invalid.js index 427129c06b9..635838db986 100644 --- a/test/intl402/DisplayNames/prototype/of/type-script-invalid.js +++ b/test/intl402/DisplayNames/prototype/of/type-script-invalid.js @@ -4,7 +4,7 @@ esid: sec-Intl.DisplayNames.prototype.of description: Throws a RangeError for invalid `script` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) ... 3. If type is "script", then a. If code cannot be matched by the unicode_script_subtag Unicode locale nonterminal, throw a RangeError exception. @@ -22,7 +22,6 @@ assert.throws(RangeError, function() { displayNames.of('aaa'); }, 'insufficient length'); - assert.throws(RangeError, function() { displayNames.of('aaaaa'); }, 'excessive length'); @@ -41,15 +40,15 @@ assert.throws(RangeError, function() { assert.throws(RangeError, function() { displayNames.of('aaaa-'); -}, 'trailing separator, -'); +}, 'trailing separator (dash)'); assert.throws(RangeError, function() { displayNames.of('_aaaa'); -}, 'leading separator, _'); +}, 'leading separator (underscore)'); assert.throws(RangeError, function() { displayNames.of('aaaa_'); -}, 'trailing separator, _'); +}, 'trailing separator (underscore)'); assert.throws(RangeError, function() { displayNames.of('aa a'); diff --git a/test/intl402/DisplayNames/prototype/of/type-script-valid.js b/test/intl402/DisplayNames/prototype/of/type-script-valid.js index d69f4d1ba38..8de6f0ac7ee 100644 --- a/test/intl402/DisplayNames/prototype/of/type-script-valid.js +++ b/test/intl402/DisplayNames/prototype/of/type-script-valid.js @@ -4,7 +4,8 @@ esid: sec-Intl.DisplayNames.prototype.of description: Returns string value for valid `script` codes info: | - 12.3.3 Intl.DisplayNames.prototype.of ( code ) + 12.5.1 CanonicalCodeForDisplayNames ( type, code ) + ... 3. If type is "script", then a. If code cannot be matched by the unicode_script_subtag Unicode locale nonterminal, throw a RangeError exception.