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..229ed865862091173afeb18252bf11a44c1e4a7e 100644 |
--- a/LayoutTests/fast/encoding/api/fatal-flag.html |
+++ b/LayoutTests/fast/encoding/api/fatal-flag.html |
@@ -1,29 +1,35 @@ |
<!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 |
+ { 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' }, |
jungshik at Google
2014/04/29 16:51:04
Please, add overlong sequences here.
<= U+007F r
jsbell
2014/04/29 21:41:18
Done.
|
+ { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80], name: '> 0x10FFFF' }, |
jungshik at Google
2014/04/29 16:51:04
Pls, also add a 6-byte sequence (valid in the orig
jsbell
2014/04/29 21:41:18
Done.
|
+ { encoding: 'utf-16le', input: [0x00], name: 'truncated code unit' }, |
+ { encoding: 'utf-16le', input: [0x00, 0xd8], name: 'surrogate half' }, |
+ { encoding: 'utf-16le', input: [0x00, 0xd8, 0x00, 0x00], name: 'surrogate half' }, |
+ { encoding: 'utf-16le', input: [0x00, 0xdc, 0x00, 0x00], name: 'trail surrogate' }, |
+ { encoding: 'utf-16le', input: [0x00, 0xdc, 0x00, 0xd8], name: 'swapped surrogates' } |
// FIXME: 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> |