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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/encoding/api/basics.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/ascii-supersets-expected.txt ('k') | LayoutTests/fast/encoding/api/basics-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/encoding/api/basics.html
diff --git a/LayoutTests/fast/encoding/api/basics.html b/LayoutTests/fast/encoding/api/basics.html
index c8f157df762d91096c4e732c998aad2917b0f404..d95471265e0fc22add1a04c903ff2fa40e91ed1b 100644
--- a/LayoutTests/fast/encoding/api/basics.html
+++ b/LayoutTests/fast/encoding/api/basics.html
@@ -1,60 +1,59 @@
<!DOCTYPE html>
-<script src="../../../resources/js-test.js"></script>
+<title>Encoding API: Basics</title>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
<script>
-description("This tests the basics of the Encoding API.");
-
-shouldBeTrue("'TextEncoder' in window");
-shouldBeTrue("'TextDecoder' in window");
-
-shouldBeTrue("'encoding' in new TextEncoder");
-shouldBeTrue("'encoding' in new TextDecoder");
-
-shouldBeEqualToString("typeof (new TextEncoder).encoding", "string");
-shouldBeEqualToString("typeof (new TextDecoder).encoding", "string");
-
-shouldBeTrue("'encode' in new TextEncoder");
-shouldBeTrue("'decode' in new TextDecoder");
-
-shouldBeEqualToString("typeof (new TextEncoder).encode", "function");
-shouldBeEqualToString("typeof (new TextDecoder).decode", "function");
-
-
-shouldBeEqualToString("(new TextEncoder).encoding", "utf-8");
-shouldBeEqualToString("(new TextDecoder).encoding", "utf-8");
-
-function toArray(arrayLike) {
- return [].map.call(arrayLike, function(x) { return x; });
-}
-
-function testEncodeDecodeSample(encoding, string, bytes) {
- debug("");
- debug("test encode/decode sample - " + encoding);
-
- evalAndLog("encoded = new TextEncoder('" + encoding + "').encode(" + JSON.stringify(string) + ")");
- shouldBeEqualToString("JSON.stringify(toArray(encoded))", JSON.stringify(bytes));
- shouldBeEqualToString("new TextDecoder('" + encoding + "').decode(new Uint8Array(" + JSON.stringify(bytes) + "))", string);
-}
-
-testEncodeDecodeSample(
- "utf-8",
- "z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD", // z, cent, CJK water, G-Clef, Private-use character
- [0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4, 0xF0, 0x9D, 0x84, 0x9E, 0xF4, 0x8F, 0xBF, 0xBD]
-);
-testEncodeDecodeSample(
- "utf-16le",
- "z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD", // z, cent, CJK water, G-Clef, Private-use character
- [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xDB, 0xFD, 0xDF]
-);
-testEncodeDecodeSample(
- "utf-16be",
- "z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD", // z, cent, CJK water, G-Clef, Private-use character
- [0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34, 0xD8, 0x34, 0xDD, 0x1E, 0xDB, 0xFF, 0xDF, 0xFD]
-);
-testEncodeDecodeSample(
- "utf-16",
- "z\xA2\u6C34\uD834\uDD1E\uDBFF\uDFFD", // z, cent, CJK water, G-Clef, Private-use character
- [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xDB, 0xFD, 0xDF]
-);
+test(function() {
+
+ assert_true('TextEncoder' in window);
+ assert_true('TextDecoder' in window);
+
+ assert_true('encoding' in new TextEncoder);
+ assert_true('encoding' in new TextDecoder);
+ assert_equals(typeof (new TextEncoder).encoding, 'string');
+ assert_equals(typeof (new TextDecoder).encoding, 'string');
+
+ assert_true('encode' in new TextEncoder);
+ assert_true('decode' in new TextDecoder);
+
+ assert_equals(typeof (new TextEncoder).encode, 'function');
+ assert_equals(typeof (new TextDecoder).decode, 'function');
+
+ assert_equals((new TextEncoder).encoding, 'utf-8', 'default encoding is utf-8');
+ assert_equals((new TextDecoder).encoding, 'utf-8', 'default encoding is utf-8');
+
+ function testEncodeDecodeSample(encoding, string, bytes) {
+ var encoded = new TextEncoder(encoding).encode(string);
+ assert_array_equals([].slice.call(encoded), bytes);
+ assert_equals(new TextDecoder(encoding).decode(new Uint8Array(bytes)), string);
+ }
+
+ // z (ASCII U+007A), cent (Latin-1 U+00A2), CJK water (BMP U+6C34),
+ // G-Clef (non-BMP U+1D11E), PUA (BMP U+F8FF), PUA (non-BMP U+10FFFD)
+ // byte-swapped BOM (non-character U+FFFE)
+ var sample = 'z\xA2\u6C34\uD834\uDD1E\uF8FF\uDBFF\uDFFD\uFFFE';
+
+ testEncodeDecodeSample(
+ 'utf-8',
+ sample,
+ [0x7A, 0xC2, 0xA2, 0xE6, 0xB0, 0xB4, 0xF0, 0x9D, 0x84, 0x9E, 0xEF, 0xA3, 0xBF, 0xF4, 0x8F, 0xBF, 0xBD, 0xEF, 0xBF, 0xBE]
+ );
+ testEncodeDecodeSample(
+ 'utf-16le',
+ sample,
+ [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8, 0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF]
+ );
+ testEncodeDecodeSample(
+ 'utf-16be',
+ sample,
+ [0x00, 0x7A, 0x00, 0xA2, 0x6C, 0x34, 0xD8, 0x34, 0xDD, 0x1E, 0xF8, 0xFF, 0xDB, 0xFF, 0xDF, 0xFD, 0xFF, 0xFE]
+ );
+ testEncodeDecodeSample(
+ 'utf-16',
+ sample,
+ [0x7A, 0x00, 0xA2, 0x00, 0x34, 0x6C, 0x34, 0xD8, 0x1E, 0xDD, 0xFF, 0xF8, 0xFF, 0xDB, 0xFD, 0xDF, 0xFE, 0xFF]
+ );
+}, 'Encoding API basics');
</script>
« no previous file with comments | « LayoutTests/fast/encoding/api/ascii-supersets-expected.txt ('k') | LayoutTests/fast/encoding/api/basics-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698