Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/encoding/api/byte-order-marks.html

Issue 240283013: Convert Encoding API tests to W3C testharness.js (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move UTF-16 surrogate tests to separate file Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/encoding/api/basics-expected.txt ('k') | LayoutTests/fast/encoding/api/byte-order-marks-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/encoding/api/byte-order-marks.html
diff --git a/LayoutTests/fast/encoding/api/byte-order-marks.html b/LayoutTests/fast/encoding/api/byte-order-marks.html
index 14a393384ff2dbed6bcc6538a45f8b546c170709..bf8516d793f9cbbff3e4a32839f708801bc9212b 100644
--- a/LayoutTests/fast/encoding/api/byte-order-marks.html
+++ b/LayoutTests/fast/encoding/api/byte-order-marks.html
@@ -1,38 +1,48 @@
<!DOCTYPE html>
-<script src="../../../resources/js-test.js"></script>
+<title>Encoding API: Byte-order marks</title>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
<script>
-description("Test the Encoding API's handling of byte-order marks (BOMs).");
-
-var utf8_bom = [0xEF, 0xBB, 0xBF];
-var utf8 = [0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4, 0xF0, 0x9D, 0x84, 0x9E, 0xF4, 0x8F, 0xBF, 0xBD];
-
-var utf16le_bom = [0xff, 0xfe];
-var utf16le = [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xDB, 0xFD, 0xDF];
-
-var utf16be_bom = [0xfe, 0xff];
-var utf16be = [0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34, 0xD8, 0x34, 0xDD, 0x1E, 0xDB, 0xFF, 0xDF, 0xFD];
-
-var string = "z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD"; // z, cent, CJK water, G-Clef, Private-use character
-
-// missing BOMs
-shouldBeEqualToString("new TextDecoder('utf-8').decode(new Uint8Array(utf8))", string);
-shouldBeEqualToString("new TextDecoder('utf-16le').decode(new Uint8Array(utf16le))", string);
-shouldBeEqualToString("new TextDecoder('utf-16be').decode(new Uint8Array(utf16be))", string);
-
-// matching BOMs
-shouldBeEqualToString("new TextDecoder('utf-8').decode(new Uint8Array(utf8_bom.concat(utf8)))", string);
-shouldBeEqualToString("new TextDecoder('utf-16le').decode(new Uint8Array(utf16le_bom.concat(utf16le)))", string);
-shouldBeEqualToString("new TextDecoder('utf-16be').decode(new Uint8Array(utf16be_bom.concat(utf16be)))", string);
-
-// mismatching BOMs
-shouldNotBe("new TextDecoder('utf-8').decode(new Uint8Array(utf16le_bom.concat(utf8)))", JSON.stringify(string));
-shouldNotBe("new TextDecoder('utf-8').decode(new Uint8Array(utf16be_bom.concat(utf8)))", JSON.stringify(string));
-shouldNotBe("new TextDecoder('utf-16le').decode(new Uint8Array(utf8_bom.concat(utf16le)))", JSON.stringify(string));
-shouldNotBe("new TextDecoder('utf-16le').decode(new Uint8Array(utf16be_bom.concat(utf16le)))", JSON.stringify(string));
-shouldNotBe("new TextDecoder('utf-16be').decode(new Uint8Array(utf8_bom.concat(utf16be)))", JSON.stringify(string));
-shouldNotBe("new TextDecoder('utf-16be').decode(new Uint8Array(utf16le_bom.concat(utf16be)))", JSON.stringify(string));
-
-// FIXME: Add tests where the BOM is split across buffers.
+var testCases = [
+ {
+ encoding: 'utf-8',
+ bom: [0xEF, 0xBB, 0xBF],
+ bytes: [0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4, 0xF0, 0x9D, 0x84, 0x9E, 0xF4, 0x8F, 0xBF, 0xBD]
+ },
+ {
+ encoding: 'utf-16le',
+ bom: [0xff, 0xfe],
+ bytes: [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xDB, 0xFD, 0xDF]
+ },
+ {
+ encoding: 'utf-16be',
+ bom: [0xfe, 0xff],
+ bytes: [0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34, 0xD8, 0x34, 0xDD, 0x1E, 0xDB, 0xFF, 0xDF, 0xFD]
+ }
+];
+
+var string = 'z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD'; // z, cent, CJK water, G-Clef, Private-use character
+
+testCases.forEach(function(t) {
+ test(function() {
+
+ var decoder = new TextDecoder(t.encoding);
+ assert_equals(decoder.decode(new Uint8Array(t.bytes)), string,
+ 'Sequence without BOM should decode successfully');
+
+ assert_equals(decoder.decode(new Uint8Array(t.bom.concat(t.bytes))), string,
+ 'Sequence with BOM should decode successfully (with no BOM present in output)');
+
+ testCases.forEach(function(o) {
+ if (o === t)
+ return;
+
+ assert_not_equals(decoder.decode(new Uint8Array(o.bom.concat(t.bytes))), string,
+ 'Mismatching BOM should not be ignored - treated as garbage bytes.');
+ });
+
+ }, 'Byte-order marks: ' + t.encoding);
+});
</script>
« no previous file with comments | « LayoutTests/fast/encoding/api/basics-expected.txt ('k') | LayoutTests/fast/encoding/api/byte-order-marks-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698