Index: LayoutTests/fast/encoding/api/fatal-flag.html |
diff --git a/LayoutTests/fast/encoding/api/fatal-flag.html b/LayoutTests/fast/encoding/api/fatal-flag.html |
index 7f01ea11d65f7a32795af507ab49768d4626595a..c3e6f794055771a43487dcf8f8f9d9bff5463a3f 100644 |
--- a/LayoutTests/fast/encoding/api/fatal-flag.html |
+++ b/LayoutTests/fast/encoding/api/fatal-flag.html |
@@ -1,29 +1,65 @@ |
<!DOCTYPE html> |
-<script src="../../../resources/js-test.js"></script> |
+<title>Encoding API: Fatal flag</title> |
+<script src="../../../resources/testharness.js"></script> |
+<script src="../../../resources/testharnessreport.js"></script> |
+<script src="resources/shared.js"></script> |
<script> |
-description("Test the Encoding API's 'fatal' flag"); |
- |
var bad = [ |
- { encoding: 'utf-8', input: "[0xC0]" }, // ends early |
- { encoding: 'utf-8', input: "[0xC0, 0x00]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xC0, 0xC0]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xE0]" }, // ends early |
- { encoding: 'utf-8', input: "[0xE0, 0x00]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xE0, 0xC0]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xE0, 0x80, 0x00]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xE0, 0x80, 0xC0]" }, // invalid trail |
- { encoding: 'utf-8', input: "[0xFC, 0x80, 0x80, 0x80, 0x80, 0x80]" }, // > 0x10FFFF |
- { encoding: 'utf-16le', input: "[0x00]" }, // truncated code unit |
- { encoding: 'utf-16le', input: "[0x00, 0xd8]" }, // surrogate half |
- { encoding: 'utf-16le', input: "[0x00, 0xd8, 0x00, 0x00]" }, // surrogate half |
- { encoding: 'utf-16le', input: "[0x00, 0xdc, 0x00, 0x00]" }, // trail surrogate |
- { encoding: 'utf-16le', input: "[0x00, 0xdc, 0x00, 0xd8]" } // swapped surrogates |
- // FIXME: Legacy encoding cases |
+ { encoding: 'utf-8', input: [0xFF], name: 'invalid code' }, |
+ { encoding: 'utf-8', input: [0xC0], name: 'ends early' }, |
+ { encoding: 'utf-8', input: [0xC0, 0x00], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xC0, 0xC0], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xE0], name: 'ends early' }, |
+ { encoding: 'utf-8', input: [0xE0, 0x00], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xE0, 0xC0], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xE0, 0x80, 0x00], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xE0, 0x80, 0xC0], name: 'invalid trail' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80], name: '> 0x10FFFF' }, |
+ { encoding: 'utf-8', input: [0xFE, 0x80, 0x80, 0x80, 0x80, 0x80], name: 'obsolete lead byte' }, |
+ |
+ // Overlong encodings |
+ { encoding: 'utf-8', input: [0xC0, 0x80], name: 'overlong U+0000 - 2 bytes' }, |
+ { encoding: 'utf-8', input: [0xE0, 0x80, 0x80], name: 'overlong U+0000 - 3 bytes' }, |
+ { encoding: 'utf-8', input: [0xF0, 0x80, 0x80, 0x80], name: 'overlong U+0000 - 4 bytes' }, |
+ { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x80, 0x80], name: 'overlong U+0000 - 5 bytes' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80], name: 'overlong U+0000 - 6 bytes' }, |
+ |
+ { encoding: 'utf-8', input: [0xC1, 0xBF], name: 'overlong U+007F - 2 bytes' }, |
+ { encoding: 'utf-8', input: [0xE0, 0x81, 0xBF], name: 'overlong U+007F - 3 bytes' }, |
+ { encoding: 'utf-8', input: [0xF0, 0x80, 0x81, 0xBF], name: 'overlong U+007F - 4 bytes' }, |
+ { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x81, 0xBF], name: 'overlong U+007F - 5 bytes' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x81, 0xBF], name: 'overlong U+007F - 6 bytes' }, |
+ |
+ { encoding: 'utf-8', input: [0xE0, 0x9F, 0xBF], name: 'overlong U+07FF - 3 bytes' }, |
+ { encoding: 'utf-8', input: [0xF0, 0x80, 0x9F, 0xBF], name: 'overlong U+07FF - 4 bytes' }, |
+ { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x9F, 0xBF], name: 'overlong U+07FF - 5 bytes' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x9F, 0xBF], name: 'overlong U+07FF - 6 bytes' }, |
+ |
+ { encoding: 'utf-8', input: [0xF0, 0x8F, 0xBF, 0xBF], name: 'overlong U+FFFF - 4 bytes' }, |
+ { encoding: 'utf-8', input: [0xF8, 0x80, 0x8F, 0xBF, 0xBF], name: 'overlong U+FFFF - 5 bytes' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x8F, 0xBF, 0xBF], name: 'overlong U+FFFF - 6 bytes' }, |
+ |
+ { encoding: 'utf-8', input: [0xF8, 0x84, 0x8F, 0xBF, 0xBF], name: 'overlong U+10FFFF - 5 bytes' }, |
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x84, 0x8F, 0xBF, 0xBF], name: 'overlong U+10FFFF - 6 bytes' }, |
+ |
+ // UTF-16 surrogates encoded as code points in UTF-8 |
+ { encoding: 'utf-8', input: [0xED, 0xA0, 0x80], name: 'lead surrogate' }, |
+ { encoding: 'utf-8', input: [0xED, 0xB0, 0x80], name: 'trail surrogate' }, |
+ { encoding: 'utf-8', input: [0xED, 0xA0, 0x80, 0xED, 0xB0, 0x80], name: 'surrogate pair' }, |
+ |
+ { encoding: 'utf-16le', input: [0x00], name: 'truncated code unit' }, |
+ // Mismatched UTF-16 surrogates are exercised in utf16-surrogates.html |
+ |
+ // FIXME: Add legacy encoding cases |
]; |
bad.forEach(function(t) { |
- shouldThrow("new TextDecoder('" + t.encoding + "', {fatal: true}).decode(new Uint8Array(" + t.input + "))"); |
+ test(function() { |
+ assert_throws({name: 'EncodingError'}, function() { |
+ new TextDecoder(t.encoding, {fatal: true}).decode(new Uint8Array(t.input)) |
+ }); |
+ }, 'Fatal flag: ' + t.encoding + " - " + t.name); |
}); |
</script> |