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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: utils/tests/string_encoding/utf32_tests.dart

Issue 9410001: restructure string decoding to support iterable use and include benchmarks for UTF-8 decoding. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 10 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
« utils/string_encoding/utf16.dart ('K') | « utils/tests/string_encoding/utf16_tests.dart ('k') | utils/tests/string_encoding/utf8_benchmarks.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/tests/string_encoding/utf32_tests.dart
diff --git a/utils/tests/string_encoding/utf32_tests.dart b/utils/tests/string_encoding/utf32_tests.dart
index e1c4e4abce49b45420bd02a03309f9bd97ff471e..09cf5f1db47e03e560b40294735841897fdd7a47 100755
--- a/utils/tests/string_encoding/utf32_tests.dart
+++ b/utils/tests/string_encoding/utf32_tests.dart
@@ -5,6 +5,7 @@
#library("utf32_tests");
#import("dunit.dart");
+#import("../../string_encoding/unicode_core.dart");
#import("../../string_encoding/utf32.dart");
void main() {
@@ -20,7 +21,7 @@ class Utf32Tests extends TestClass {
갸갹갺갻갼갽갾갿걀걁걂걃걄걅걆걇걈걉걊걋걌걍걎걏걐걑걒걓""";
static final String testHanTwice = "二";
- static final List<int> testKoreanCharSubsetUtf32be = const<int>[
+ static final List<int> testKoreanCharSubsetUtf32beBom = const<int>[
0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0xac, 0x00,
0x00, 0x00, 0xac, 0x01, 0x00, 0x00, 0xac, 0x02,
0x00, 0x00, 0xac, 0x03, 0x00, 0x00, 0xac, 0x04,
@@ -66,93 +67,122 @@ class Utf32Tests extends TestClass {
0x00, 0x00, 0xac, 0x51, 0x00, 0x00, 0xac, 0x52,
0x00, 0x00, 0xac, 0x53];
+ static final List<int> testKoreanCharSubsetUtf32le = const<int>[
+ 0x00, 0xac, 0x00, 0x00, 0x01, 0xac, 0x00, 0x00,
+ 0x02, 0xac, 0x00, 0x00, 0x03, 0xac, 0x00, 0x00,
+ 0x04, 0xac, 0x00, 0x00, 0x05, 0xac, 0x00, 0x00,
+ 0x06, 0xac, 0x00, 0x00, 0x07, 0xac, 0x00, 0x00,
+ 0x08, 0xac, 0x00, 0x00, 0x09, 0xac, 0x00, 0x00,
+ 0x0a, 0xac, 0x00, 0x00, 0x0b, 0xac, 0x00, 0x00,
+ 0x0c, 0xac, 0x00, 0x00, 0x0d, 0xac, 0x00, 0x00,
+ 0x0e, 0xac, 0x00, 0x00, 0x0f, 0xac, 0x00, 0x00,
+ 0x10, 0xac, 0x00, 0x00, 0x11, 0xac, 0x00, 0x00,
+ 0x12, 0xac, 0x00, 0x00, 0x13, 0xac, 0x00, 0x00,
+ 0x14, 0xac, 0x00, 0x00, 0x15, 0xac, 0x00, 0x00,
+ 0x16, 0xac, 0x00, 0x00, 0x17, 0xac, 0x00, 0x00,
+ 0x18, 0xac, 0x00, 0x00, 0x19, 0xac, 0x00, 0x00,
+ 0x1a, 0xac, 0x00, 0x00, 0x1b, 0xac, 0x00, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x1c, 0xac, 0x00, 0x00,
+ 0x1d, 0xac, 0x00, 0x00, 0x1e, 0xac, 0x00, 0x00,
+ 0x1f, 0xac, 0x00, 0x00, 0x20, 0xac, 0x00, 0x00,
+ 0x21, 0xac, 0x00, 0x00, 0x22, 0xac, 0x00, 0x00,
+ 0x23, 0xac, 0x00, 0x00, 0x24, 0xac, 0x00, 0x00,
+ 0x25, 0xac, 0x00, 0x00, 0x26, 0xac, 0x00, 0x00,
+ 0x27, 0xac, 0x00, 0x00, 0x28, 0xac, 0x00, 0x00,
+ 0x29, 0xac, 0x00, 0x00, 0x2a, 0xac, 0x00, 0x00,
+ 0x2b, 0xac, 0x00, 0x00, 0x2c, 0xac, 0x00, 0x00,
+ 0x2d, 0xac, 0x00, 0x00, 0x2e, 0xac, 0x00, 0x00,
+ 0x2f, 0xac, 0x00, 0x00, 0x30, 0xac, 0x00, 0x00,
+ 0x31, 0xac, 0x00, 0x00, 0x32, 0xac, 0x00, 0x00,
+ 0x33, 0xac, 0x00, 0x00, 0x34, 0xac, 0x00, 0x00,
+ 0x35, 0xac, 0x00, 0x00, 0x36, 0xac, 0x00, 0x00,
+ 0x37, 0xac, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+ 0x38, 0xac, 0x00, 0x00, 0x39, 0xac, 0x00, 0x00,
+ 0x3a, 0xac, 0x00, 0x00, 0x3b, 0xac, 0x00, 0x00,
+ 0x3c, 0xac, 0x00, 0x00, 0x3d, 0xac, 0x00, 0x00,
+ 0x3e, 0xac, 0x00, 0x00, 0x3f, 0xac, 0x00, 0x00,
+ 0x40, 0xac, 0x00, 0x00, 0x41, 0xac, 0x00, 0x00,
+ 0x42, 0xac, 0x00, 0x00, 0x43, 0xac, 0x00, 0x00,
+ 0x44, 0xac, 0x00, 0x00, 0x45, 0xac, 0x00, 0x00,
+ 0x46, 0xac, 0x00, 0x00, 0x47, 0xac, 0x00, 0x00,
+ 0x48, 0xac, 0x00, 0x00, 0x49, 0xac, 0x00, 0x00,
+ 0x4a, 0xac, 0x00, 0x00, 0x4b, 0xac, 0x00, 0x00,
+ 0x4c, 0xac, 0x00, 0x00, 0x4d, 0xac, 0x00, 0x00,
+ 0x4e, 0xac, 0x00, 0x00, 0x4f, 0xac, 0x00, 0x00,
+ 0x50, 0xac, 0x00, 0x00, 0x51, 0xac, 0x00, 0x00,
+ 0x52, 0xac, 0x00, 0x00, 0x53, 0xac, 0x00, 0x00];
+
void registerTests(TestSuite suite) {
- register("testUtf32BytesToString", testUtf32BytesToString, suite);
- register("testEncodeToUtf32", testEncodeToUtf32, suite);
+ register("Utf32Tests.testUtf32BytesToString", testUtf32BytesToString,
+ suite);
+ register("Utf32Tests.testEncodeToUtf32", testEncodeToUtf32, suite);
+ register("Utf32Tests.testIterableMethods", testIterableMethods, suite);
}
void testEncodeToUtf32() {
- Expect.listEquals(testKoreanCharSubsetUtf32be,
- encodeAsUtf32(testKoreanCharSubset),
+ Expect.listEquals([], encodeUtf32le(""), "no input"); // TODO(dcarlson) skip bom on empty?
+ Expect.listEquals(testKoreanCharSubsetUtf32beBom,
+ encodeUtf32(testKoreanCharSubset),
"encode UTF-32(BE by default) Korean");
- Expect.listEquals([
- 0x00, 0xac, 0x00, 0x00, 0x01, 0xac, 0x00, 0x00,
- 0x02, 0xac, 0x00, 0x00, 0x03, 0xac, 0x00, 0x00,
- 0x04, 0xac, 0x00, 0x00, 0x05, 0xac, 0x00, 0x00,
- 0x06, 0xac, 0x00, 0x00, 0x07, 0xac, 0x00, 0x00,
- 0x08, 0xac, 0x00, 0x00, 0x09, 0xac, 0x00, 0x00,
- 0x0a, 0xac, 0x00, 0x00, 0x0b, 0xac, 0x00, 0x00,
- 0x0c, 0xac, 0x00, 0x00, 0x0d, 0xac, 0x00, 0x00,
- 0x0e, 0xac, 0x00, 0x00, 0x0f, 0xac, 0x00, 0x00,
- 0x10, 0xac, 0x00, 0x00, 0x11, 0xac, 0x00, 0x00,
- 0x12, 0xac, 0x00, 0x00, 0x13, 0xac, 0x00, 0x00,
- 0x14, 0xac, 0x00, 0x00, 0x15, 0xac, 0x00, 0x00,
- 0x16, 0xac, 0x00, 0x00, 0x17, 0xac, 0x00, 0x00,
- 0x18, 0xac, 0x00, 0x00, 0x19, 0xac, 0x00, 0x00,
- 0x1a, 0xac, 0x00, 0x00, 0x1b, 0xac, 0x00, 0x00,
- 0x0a, 0x00, 0x00, 0x00, 0x1c, 0xac, 0x00, 0x00,
- 0x1d, 0xac, 0x00, 0x00, 0x1e, 0xac, 0x00, 0x00,
- 0x1f, 0xac, 0x00, 0x00, 0x20, 0xac, 0x00, 0x00,
- 0x21, 0xac, 0x00, 0x00, 0x22, 0xac, 0x00, 0x00,
- 0x23, 0xac, 0x00, 0x00, 0x24, 0xac, 0x00, 0x00,
- 0x25, 0xac, 0x00, 0x00, 0x26, 0xac, 0x00, 0x00,
- 0x27, 0xac, 0x00, 0x00, 0x28, 0xac, 0x00, 0x00,
- 0x29, 0xac, 0x00, 0x00, 0x2a, 0xac, 0x00, 0x00,
- 0x2b, 0xac, 0x00, 0x00, 0x2c, 0xac, 0x00, 0x00,
- 0x2d, 0xac, 0x00, 0x00, 0x2e, 0xac, 0x00, 0x00,
- 0x2f, 0xac, 0x00, 0x00, 0x30, 0xac, 0x00, 0x00,
- 0x31, 0xac, 0x00, 0x00, 0x32, 0xac, 0x00, 0x00,
- 0x33, 0xac, 0x00, 0x00, 0x34, 0xac, 0x00, 0x00,
- 0x35, 0xac, 0x00, 0x00, 0x36, 0xac, 0x00, 0x00,
- 0x37, 0xac, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
- 0x38, 0xac, 0x00, 0x00, 0x39, 0xac, 0x00, 0x00,
- 0x3a, 0xac, 0x00, 0x00, 0x3b, 0xac, 0x00, 0x00,
- 0x3c, 0xac, 0x00, 0x00, 0x3d, 0xac, 0x00, 0x00,
- 0x3e, 0xac, 0x00, 0x00, 0x3f, 0xac, 0x00, 0x00,
- 0x40, 0xac, 0x00, 0x00, 0x41, 0xac, 0x00, 0x00,
- 0x42, 0xac, 0x00, 0x00, 0x43, 0xac, 0x00, 0x00,
- 0x44, 0xac, 0x00, 0x00, 0x45, 0xac, 0x00, 0x00,
- 0x46, 0xac, 0x00, 0x00, 0x47, 0xac, 0x00, 0x00,
- 0x48, 0xac, 0x00, 0x00, 0x49, 0xac, 0x00, 0x00,
- 0x4a, 0xac, 0x00, 0x00, 0x4b, 0xac, 0x00, 0x00,
- 0x4c, 0xac, 0x00, 0x00, 0x4d, 0xac, 0x00, 0x00,
- 0x4e, 0xac, 0x00, 0x00, 0x4f, 0xac, 0x00, 0x00,
- 0x50, 0xac, 0x00, 0x00, 0x51, 0xac, 0x00, 0x00,
- 0x52, 0xac, 0x00, 0x00, 0x53, 0xac, 0x00, 0x00],
- encodeAsUtf32le(testKoreanCharSubset),
+ Expect.listEquals(testKoreanCharSubsetUtf32le,
+ encodeUtf32le(testKoreanCharSubset),
"encode UTF-32(LE by default) Korean");
}
void testUtf32BytesToString() {
- Expect.stringEquals("\ufffd", decodeFromUtf32([0]), "single byte");
- Expect.stringEquals("\ufffd", decodeFromUtf32([0, 0, 0x4e]),
+ Expect.stringEquals("", decodeUtf32([]), "no input");
+ Expect.stringEquals("\ufffd", decodeUtf32([0]), "single byte");
+ Expect.stringEquals("\ufffd", decodeUtf32([0, 0, 0x4e]),
"short a byte");
- Expect.stringEquals("\u4e8c\ufffd", decodeFromUtf32([0, 0, 0x4e, 0x8c, 0]),
+ Expect.stringEquals("\u4e8c\ufffd", decodeUtf32([0, 0, 0x4e, 0x8c, 0]),
"extra byte");
- Expect.stringEquals(testHanTwice, decodeFromUtf32([0, 0, 0x4e, 0x8c]),
+ Expect.stringEquals(testHanTwice, decodeUtf32([0, 0, 0x4e, 0x8c]),
"twice variation 1");
Expect.stringEquals(testHanTwice,
- decodeFromUtf32([0, 0, 0xfe, 0xff, 0, 0, 0x4e, 0x8c]),
+ decodeUtf32([0, 0, 0xfe, 0xff, 0, 0, 0x4e, 0x8c]),
"twice variation 2");
Expect.stringEquals(testHanTwice,
- decodeFromUtf32([0xff, 0xfe, 0, 0, 0x8c, 0x4e, 0, 0]),
+ decodeUtf32([0xff, 0xfe, 0, 0, 0x8c, 0x4e, 0, 0]),
"twice variation 3");
- Expect.stringEquals(testHanTwice, decodeFromUtf32be([0, 0, 0x4e, 0x8c]),
+ Expect.stringEquals(testHanTwice, decodeUtf32be([0, 0, 0x4e, 0x8c]),
"twice variation 4");
Expect.stringEquals(testHanTwice,
- decodeFromUtf32be([0, 0, 0xfe, 0xff, 0, 0, 0x4e, 0x8c]),
+ decodeUtf32be([0, 0, 0xfe, 0xff, 0, 0, 0x4e, 0x8c]),
"twice variation 5");
- Expect.stringEquals(testHanTwice, decodeFromUtf32le([0x8c, 0x4e, 0, 0]),
+ Expect.stringEquals(testHanTwice, decodeUtf32le([0x8c, 0x4e, 0, 0]),
"twice variation 6");
Expect.stringEquals(testHanTwice,
- decodeFromUtf32le([0xff, 0xfe, 0, 0, 0x8c, 0x4e, 0, 0]),
+ decodeUtf32le([0xff, 0xfe, 0, 0, 0x8c, 0x4e, 0, 0]),
"twice variation 7");
Expect.stringEquals(testKoreanCharSubset,
- decodeFromUtf32(testKoreanCharSubsetUtf32be),
+ decodeUtf32(testKoreanCharSubsetUtf32beBom),
"UTF-32BE Korean");
}
+
+ void testIterableMethods() {
+ // empty input
+ Expect.isFalse(decodeUtf32AsIterable([]).iterator().hasNext());
+
+ IterableUtf32Decoder koreanDecoder =
+ decodeUtf32AsIterable(testKoreanCharSubsetUtf32beBom);
+ // get the first character
+ Expect.equals(testKoreanCharSubset.charCodes()[0],
+ koreanDecoder.iterator().next());
+ // get the whole translation using the Iterable interface
+ Expect.stringEquals(testKoreanCharSubset,
+ new String.fromCharCodes(new List<int>.from(koreanDecoder)));
+
+ // specify types
+ Expect.equals(44032, (new List<int>
+ .from(decodeUtf32beAsIterable(testKoreanCharSubsetUtf32beBom)))[0]);
+ Expect.equals(44032, (new List<int>
+ .from(decodeUtf32leAsIterable(testKoreanCharSubsetUtf32le)))[0]);
+ Expect.equals(UNICODE_BOM, (new List<int>
+ .from(decodeUtf32beAsIterable(testKoreanCharSubsetUtf32beBom,
+ stripBom: false)))[0]);
+ }
}
« utils/string_encoding/utf16.dart ('K') | « utils/tests/string_encoding/utf16_tests.dart ('k') | utils/tests/string_encoding/utf8_benchmarks.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698