diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js index 4b654bf8e0..c59e96e4ec 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js @@ -6,6 +6,8 @@ info: > If B = 110xxxxx (n = 2) and string.charAt(k + 4) and string.charAt(k + 5) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.10_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests ---*/ @@ -16,15 +18,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%C0%" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 110xxxxx (n = 2) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js index c730adbac5..dbce64b258 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js @@ -7,6 +7,8 @@ info: > string.charAt(k + 5)) or (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.11_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests, string.charAt(k + 4) and string.charAt(k + 5) do not represent hexadecimal digits @@ -19,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%E0%" + String.fromCharCode(indexJ, indexJ) + "%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js index 1c31e22556..098fa45852 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js @@ -7,6 +7,8 @@ info: > string.charAt(k + 5)) or (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.11_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests, string.charAt(k + 7) and string.charAt(k + 8) do not represent hexadecimal digits @@ -19,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%E0%" + "%A0" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js index d731a7b8ff..034cc57fac 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js @@ -8,6 +8,8 @@ info: > string.charAt(k + 8)) or (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.12_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests, string.charAt(k + 4) and string.charAt(k + 5) do not represent hexadecimal digits @@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + String.fromCharCode(indexJ, indexJ) + "%A0%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js index fbcb56d8ba..159148b3da 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js @@ -8,6 +8,8 @@ info: > string.charAt(k + 8)) or (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.12_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests, string.charAt(k + 7) and string.charAt(k + 7) do not represent hexadecimal digits @@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + "%A0" + String.fromCharCode(indexJ, indexJ) + "%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js index e29da8ce6c..13873864ff 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js @@ -8,6 +8,8 @@ info: > string.charAt(k + 8)) or (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.12_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests, string.charAt(k + 10) and string.charAt(k + 11) do not represent hexadecimal digits @@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + "%A0%A0" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js index 978e7517a9..fc3ae33b18 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js @@ -6,6 +6,8 @@ info: > If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.13_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xC0; indexB <= 0xDF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js index cac109a333..55ea6e326a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js @@ -6,6 +6,8 @@ info: > If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.13_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xC0; indexB <= 0xDF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js index 1993a13420..c51ba39a6a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.14_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js index 5d5c9a7376..dc45457dda 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.14_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js index 6153a20932..107150f0bc 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.14_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js index 04a8121d15..f2003b21a3 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.14_T4 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js index 322785b1e2..baf51e3012 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js index a6a40ba88e..2e602d45bf 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js index f503082b2c..ba7f129bbf 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js index b752791481..631eaec9ca 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T4 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js index 072aabdd65..e323559d52 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T5 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js index 777672e792..233a9c0c6c 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError es5id: 15.1.3.2_A1.15_T6 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF] includes: [decimalToHexString.js] ---*/ @@ -16,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.1_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.1_T1.js index 2efedfcebf..6a072c6ba8 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.1_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.1_T1.js @@ -4,6 +4,8 @@ /*--- info: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError es5id: 15.1.3.2_A1.1_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js index fea67dd932..074a35718b 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js @@ -6,6 +6,8 @@ info: > If B = string.charAt(k+1) + string.charAt(k+2) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.2_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests ---*/ @@ -17,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURIComponent("%" + String.fromCharCode(indexJ) + "1"); result = false; - } catch (e) { + } catch (e) { if ((e instanceof URIError) !== true) { result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If string.charAt(k+1) does not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js index 39c6573a8c..012cfb7a6b 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js @@ -6,6 +6,8 @@ info: > If B = string.charAt(k+1) + string.charAt(k+2) do not represent hexadecimal digits, throw URIError es5id: 15.1.3.2_A1.2_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests ---*/ @@ -17,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURIComponent("%" + "1" + String.fromCharCode(indexJ)); result = false; - } catch (e) { + } catch (e) { if ((e instanceof URIError) !== true) { result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If string.charAt(k+2) does not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js index 99073d74dd..182677d442 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js @@ -4,6 +4,8 @@ /*--- info: If B = 10xxxxxx or B = 11111xxx, throw URIError es5id: 15.1.3.2_A1.3_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF] includes: [decimalToHexString.js] ---*/ @@ -14,31 +16,31 @@ var indexP; var indexO = 0; for (var index = 0x80; index <= 0xBF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -49,6 +51,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js index d4cdfc6ff6..a9bc2157ea 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js @@ -4,6 +4,8 @@ /*--- info: If B = 10xxxxxx or B = 11111xxx, throw URIError es5id: 15.1.3.2_A1.3_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF] includes: [decimalToHexString.js] ---*/ @@ -14,31 +16,31 @@ var indexP; var indexO = 0; for (var index = 0xF8; index <= 0xFF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -49,6 +51,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js index 97108d76a6..2d91c523fa 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js @@ -4,6 +4,8 @@ /*--- info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError es5id: 15.1.3.2_A1.4_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xC0 - 0xDF] includes: [decimalToHexString.js] ---*/ @@ -14,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xC0; index <= 0xDF; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 3; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; - } + errorCount++; + } } if (errorCount > 0) { @@ -57,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js index 782bb26d40..2bd11c744d 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js @@ -4,6 +4,8 @@ /*--- info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError es5id: 15.1.3.2_A1.5_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xE0 - 0xEF] includes: [decimalToHexString.js] ---*/ @@ -14,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 6; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; - } + errorCount++; + } } if (errorCount > 0) { @@ -57,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js index 8e5e0f6764..10d53f10bc 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js @@ -4,6 +4,8 @@ /*--- info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError es5id: 15.1.3.2_A1.6_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xF0 - 0xF7] includes: [decimalToHexString.js] ---*/ @@ -14,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 9; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; - } + errorCount++; + } } if (errorCount > 0) { @@ -57,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js index 488c589d3f..fcc546ff78 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js @@ -6,6 +6,8 @@ info: > If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw URIError es5id: 15.1.3.2_A1.7_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests. B = [0xC0 - 0xDF] includes: [decimalToHexString.js] ---*/ @@ -16,31 +18,31 @@ var indexP; var indexO = 0; for (var index = 0xC0; index <= 0xDF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -51,6 +53,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js index 672cc54437..79e9119481 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and string.charAt(k + 3), string.charAt(k + 6) not equal "%", throw URIError es5id: 15.1.3.2_A1.8_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests. B = [0xE0 - 0xEF], string.charAt(k + 3) not equal "%" includes: [decimalToHexString.js] @@ -17,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js index d562ac053e..9600357f8c 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js @@ -6,6 +6,8 @@ info: > If B = 1110xxxx (n = 3) and string.charAt(k + 3), string.charAt(k + 6) not equal "%", throw URIError es5id: 15.1.3.2_A1.8_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests. B = [0xE0 - 0xEF], string.charAt(k + 6) not equal "%" includes: [decimalToHexString.js] @@ -17,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js index f2b31216a2..6ca5ff3821 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and string.charAt(k + 3), string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError es5id: 15.1.3.2_A1.9_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests. B = [0xF0 - 0x0F7], string.charAt(k + 3) not equal "%" includes: [decimalToHexString.js] @@ -17,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js index 1033aa1ae2..7bf8b8778a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and string.charAt(k + 3), string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError es5id: 15.1.3.2_A1.9_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests. B = [0xF0 - 0x0F7], string.charAt(k + 6) not equal "%" includes: [decimalToHexString.js] @@ -17,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0111%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js index 22f48126d8..19892da3e2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js @@ -6,6 +6,8 @@ info: > If B = 11110xxx (n = 4) and string.charAt(k + 3), string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError es5id: 15.1.3.2_A1.9_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > Complex tests. B = [0xF0 - 0x0F7], string.charAt(k + 9) not equal "%" includes: [decimalToHexString.js] @@ -17,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0%A0111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js index 05c7db39f7..5ffde47cff 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js @@ -4,6 +4,8 @@ /*--- info: If string.charAt(k) not equal "%", return this char es5id: 15.1.3.2_A2.1_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests includes: [decimalToHexString.js] ---*/ @@ -14,20 +16,20 @@ var count = 0; for (var indexI = 0; indexI <= 65535; indexI++) { if (indexI !== 0x25) { var hex = decimalToHexString(indexI); - try { + try { var str = String.fromCharCode(indexI); - if (decodeURIComponent(str) !== str) { + if (decodeURIComponent(str) !== str) { $ERROR('#' + hex + ' '); errorCount++; - } + } } catch (e){ $ERROR('#' + hex + ' '); errorCount++; - } + } count++; } -} +} -if (errorCount > 0) { +if (errorCount > 0) { $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js index 59074ba2dd..74bd1d8dd1 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js @@ -4,6 +4,8 @@ /*--- info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), return B1 es5id: 15.1.3.2_A2.2_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests, use RFC 3629 includes: [decimalToHexString.js] ---*/ @@ -15,28 +17,28 @@ var indexO = 0; for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) { count++; var hexB1 = decimalToPercentHexString(indexB1); - var index = indexB1; + var index = indexB1; var hex = String.fromCharCode(index); if (decodeURIComponent(hexB1) === hex) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } if (errorCount > 0) { @@ -47,6 +49,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js index 14edea9c3b..96e7aeafb8 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js @@ -6,6 +6,8 @@ info: > If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without B1 = [0xC0, 0xC1], return UTF8(B1, B2) es5id: 15.1.3.2_A2.3_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests, use RFC 3629 includes: [decimalToHexString.js] ---*/ @@ -20,27 +22,27 @@ for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) { for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { count++; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); - var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F); + var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F); if (decodeURIComponent(hexB1_B2) === String.fromCharCode(index)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } } @@ -52,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js index 8c6678e8f6..e444e9807a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js @@ -7,6 +7,8 @@ info: > without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 - 0xDFFF), return UTF8(B1, B2, B3) es5id: 15.1.3.2_A2.4_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests, use RFC 3629 includes: [decimalToHexString.js] ---*/ @@ -20,33 +22,33 @@ for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) { var hexB1 = decimalToPercentHexString(indexB1); for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { if ((indexB1 === 0xE0) && (indexB2 <= 0x9F)) continue; - if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue; + if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) { count++; var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3); - var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F); + var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F); if (decodeURIComponent(hexB1_B2_B3) === String.fromCharCode(index)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; - } + errorCount++; + } } } @@ -58,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js index 42cbda2245..062bf7c883 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js @@ -7,6 +7,8 @@ info: > 0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF], return UTF8(B1, B2, B3, B4) es5id: 15.1.3.2_A2.5_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex tests, use RFC 3629 includes: [decimalToHexString.js] ---*/ @@ -19,7 +21,7 @@ var indexO = 0; for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) { var hexB1 = decimalToPercentHexString(indexB1); for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { - if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue; + if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue; if ((indexB1 === 0xF4) && (indexB2 >= 0x90)) continue; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) { @@ -29,29 +31,29 @@ for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) { count++; var index = (indexB1 & 0x07) * 0x40000 + (indexB2 & 0x3F) * 0x1000 + (indexB3 & 0x3F) * 0x40 + (indexB4 & 0x3F); var L = ((index - 0x10000) & 0x03FF) + 0xDC00; - var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800; + var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800; if (decodeURIComponent(hexB1_B2_B3_B4) === String.fromCharCode(H, L)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + if ((index - indexP) !== 1) { if ((indexP - indexO) !== 0) { var hexP = decimalToHexString(indexP); var hexO = decimalToHexString(indexO); $ERROR('#' + hexO + '-' + hexP + ' '); - } + } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } indexO = index; - } + } } indexP = index; - errorCount++; + errorCount++; } - } + } } } @@ -63,6 +65,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T1.js index 7f7cf3201e..565cb55090 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T1.js @@ -4,6 +4,8 @@ /*--- info: Let reservedURIComponentSet be the empty string es5id: 15.1.3.2_A3_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > uriReserved and "#" not in reservedURIComponentSet. HexDigit in [0..9, A..F] diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T2.js index 94321d5291..eb533e38c0 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T2.js @@ -4,6 +4,8 @@ /*--- info: Let reservedURIComponentSet be the empty string es5id: 15.1.3.2_A3_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > uriReserved and "#" not in reservedURIComponentSet. HexDigit in [0..9, a..f] diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T3.js index 16477c5446..f79e27d576 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A3_T3.js @@ -4,6 +4,8 @@ /*--- info: Let reservedURIComponentSet be the empty string es5id: 15.1.3.2_A3_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Complex test ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T1.js index 92a4051a8f..26f34d34a2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T1.js @@ -4,6 +4,8 @@ /*--- info: URI tests es5id: 15.1.3.2_A4_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking ENGLISH ALPHABET ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T2.js index f36889c1c6..b5fe1a6ce2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T2.js @@ -4,6 +4,8 @@ /*--- info: URI tests es5id: 15.1.3.2_A4_T2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking RUSSIAN ALPHABET ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T3.js index 8e01d7049b..52ffcca9cd 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T3.js @@ -4,6 +4,8 @@ /*--- info: URI tests es5id: 15.1.3.2_A4_T3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking URL with Line Terminator ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js index 1981622c96..9ab470c164 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js @@ -4,6 +4,8 @@ /*--- info: URI tests es5id: 15.1.3.2_A4_T4 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Test some url ---*/ @@ -20,7 +22,7 @@ if (decodeURIComponent("http://unipro.ru") !== "http://unipro.ru") { //CHECK#3 if (decodeURIComponent("http:%2f%2Fwww.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") !== "http://www.google.ru/support/jobs/bin/static.py?page=why-ru.html&sid=liveandwork") { $ERROR('#3: http:%2f%2Fwww.google.ru/support/jobs/bin/static.py%3Fpage3dwhy-ru.html%26sid3Dliveandwork"'); -} +} //CHECK#4 if (decodeURIComponent("http:%2F%2Fen.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8#Description") { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js index 49c5704eb1..e8d46165b7 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js @@ -4,6 +4,8 @@ /*--- info: The length property of decodeURIComponent has the attribute DontEnum es5id: 15.1.3.2_A5.1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking use propertyIsEnumerable, for-in ---*/ @@ -17,7 +19,7 @@ var result = true; for (var p in decodeURIComponent){ if (p === "length") { result = false; - } + } } if (result !== true) { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js index ef720eb205..8ef6ccf653 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js @@ -6,6 +6,8 @@ info: > The length property of decodeURIComponent does not have the attribute DontDelete es5id: 15.1.3.2_A5.2 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking use hasOwnProperty, delete ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.3.js index cb11b7ed5d..ee9fd6f306 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.3.js @@ -4,6 +4,8 @@ /*--- info: The length property of decodeURIComponent has the attribute ReadOnly es5id: 15.1.3.2_A5.3 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking if varying the length property fails includes: [propertyHelper.js] ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.4.js index f1783b7eed..99f993a491 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.4.js @@ -4,6 +4,8 @@ /*--- info: The length property of decodeURIComponent is 1 es5id: 15.1.3.2_A5.4 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: decodeURIComponent.length === 1 ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js index 877e9c07f0..e01cd5502f 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js @@ -4,6 +4,8 @@ /*--- info: The decodeURIComponent property has the attribute DontEnum es5id: 15.1.3.2_A5.5 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking use propertyIsEnumerable, for-in ---*/ @@ -17,7 +19,7 @@ var result = true; for (var p in this){ if (p === "decodeURIComponent") { result = false; - } + } } if (result !== true) { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.6.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.6.js index 3ee72a6cdd..d70b3f79ca 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.6.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.6.js @@ -4,6 +4,8 @@ /*--- info: The decodeURIComponent property has not prototype property es5id: 15.1.3.2_A5.6 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: Checking decodeURIComponent.prototype ---*/ diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.7.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.7.js index 79349059d7..65e434a0ae 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.7.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.7.js @@ -4,6 +4,8 @@ /*--- info: The decodeURIComponent property can't be used as constructor es5id: 15.1.3.2_A5.7 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > If property does not implement the internal [[Construct]] method, throw a TypeError exception diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js index a4371e54fc..cb27193eb2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js @@ -4,6 +4,8 @@ /*--- info: Operator use ToString es5id: 15.1.3.2_A6_T1 +es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: If Type(value) is Object, evaluate ToPrimitive(value, String) ---*/ @@ -17,7 +19,7 @@ if (decodeURIComponent(object) !== "[object Object]") { var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; if (decodeURIComponent(object) !== "^") { $ERROR('#2: var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; decodeURIComponent(object) === "^". Actual: ' + (decodeURIComponent(object))); -} +} //CHECK#3 var object = {valueOf: function() {return "%5E"}, toString: function() {return {}}}; @@ -57,11 +59,11 @@ try { var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object); $ERROR('#7.1: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object) throw "error". Actual: ' + (decodeURIComponent(object))); -} +} catch (e) { if (e !== "error") { $ERROR('#7.2: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object) throw "error". Actual: ' + (e)); - } + } } //CHECK#8 @@ -69,9 +71,9 @@ try { var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object); $ERROR('#8.1: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object) throw TypeError. Actual: ' + (decodeURIComponent(object))); -} +} catch (e) { if ((e instanceof TypeError) !== true) { $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object) throw TypeError. Actual: ' + (e)); - } + } } diff --git a/test/built-ins/decodeURIComponent/name.js b/test/built-ins/decodeURIComponent/name.js index a3d8794d44..d075580493 100644 --- a/test/built-ins/decodeURIComponent/name.js +++ b/test/built-ins/decodeURIComponent/name.js @@ -3,6 +3,7 @@ /*--- es6id: 18.2.6.3 +esid: sec-decodeuricomponent-encodeduricomponent description: > decodeURIComponent.name is "decodeURIComponent". info: >