| Index: pkg/utf/test/unicode_core_test.dart
|
| diff --git a/pkg/utf/test/unicode_core_test.dart b/pkg/utf/test/unicode_core_test.dart
|
| index 129273b9a939aaeb790d1ac42dd569ff711b2fb7..6e13e965eb4508e70649ecdd90c2664e78d1fb3d 100755
|
| --- a/pkg/utf/test/unicode_core_test.dart
|
| +++ b/pkg/utf/test/unicode_core_test.dart
|
| @@ -2,91 +2,90 @@
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| -library utf;
|
| +library utf.unicode_core_test;
|
| +
|
| import 'package:expect/expect.dart';
|
| -import 'dart:collection';
|
|
|
| -part '../lib/constants.dart';
|
| -part '../lib/list_range.dart';
|
| -part '../lib/utf16.dart';
|
| +import 'package:utf/utf.dart';
|
| +import 'package:utf/src/util.dart';
|
|
|
| -main() {
|
| +void main() {
|
| testCodepointsToUtf16CodeUnits();
|
| testUtf16bytesToCodepoints();
|
| }
|
|
|
| void testCodepointsToUtf16CodeUnits() {
|
| // boundary conditions
|
| - Expect.listEquals([], _codepointsToUtf16CodeUnits([]), "no input");
|
| - Expect.listEquals([0x0], _codepointsToUtf16CodeUnits([0x0]), "0");
|
| + Expect.listEquals([], codepointsToUtf16CodeUnits([]), "no input");
|
| + Expect.listEquals([0x0], codepointsToUtf16CodeUnits([0x0]), "0");
|
| Expect.listEquals([0xd800, 0xdc00],
|
| - _codepointsToUtf16CodeUnits([0x10000]), "10000");
|
| + codepointsToUtf16CodeUnits([0x10000]), "10000");
|
|
|
| Expect.listEquals([0xffff],
|
| - _codepointsToUtf16CodeUnits([0xffff]), "ffff");
|
| + codepointsToUtf16CodeUnits([0xffff]), "ffff");
|
| Expect.listEquals([0xdbff, 0xdfff],
|
| - _codepointsToUtf16CodeUnits([0x10ffff]), "10ffff");
|
| + codepointsToUtf16CodeUnits([0x10ffff]), "10ffff");
|
|
|
| Expect.listEquals([0xd7ff],
|
| - _codepointsToUtf16CodeUnits([0xd7ff]), "d7ff");
|
| + codepointsToUtf16CodeUnits([0xd7ff]), "d7ff");
|
| Expect.listEquals([0xe000],
|
| - _codepointsToUtf16CodeUnits([0xe000]), "e000");
|
| + codepointsToUtf16CodeUnits([0xe000]), "e000");
|
|
|
| Expect.listEquals([UNICODE_REPLACEMENT_CHARACTER_CODEPOINT],
|
| - _codepointsToUtf16CodeUnits([0xd800]), "d800");
|
| + codepointsToUtf16CodeUnits([0xd800]), "d800");
|
| Expect.listEquals([UNICODE_REPLACEMENT_CHARACTER_CODEPOINT],
|
| - _codepointsToUtf16CodeUnits([0xdfff]), "dfff");
|
| + codepointsToUtf16CodeUnits([0xdfff]), "dfff");
|
| }
|
|
|
| void testUtf16bytesToCodepoints() {
|
| // boundary conditions: First possible values
|
| - Expect.listEquals([], _utf16CodeUnitsToCodepoints([]), "no input");
|
| - Expect.listEquals([0x0], _utf16CodeUnitsToCodepoints([0x0]), "0");
|
| + Expect.listEquals([], utf16CodeUnitsToCodepoints([]), "no input");
|
| + Expect.listEquals([0x0], utf16CodeUnitsToCodepoints([0x0]), "0");
|
| Expect.listEquals([0x10000],
|
| - _utf16CodeUnitsToCodepoints([0xd800, 0xdc00]), "10000");
|
| + utf16CodeUnitsToCodepoints([0xd800, 0xdc00]), "10000");
|
|
|
| // boundary conditions: Last possible sequence of a certain length
|
| Expect.listEquals([0xffff],
|
| - _utf16CodeUnitsToCodepoints([0xffff]), "ffff");
|
| + utf16CodeUnitsToCodepoints([0xffff]), "ffff");
|
| Expect.listEquals([0x10ffff],
|
| - _utf16CodeUnitsToCodepoints([0xdbff, 0xdfff]), "10ffff");
|
| + utf16CodeUnitsToCodepoints([0xdbff, 0xdfff]), "10ffff");
|
|
|
| // other boundary conditions
|
| Expect.listEquals([0xd7ff],
|
| - _utf16CodeUnitsToCodepoints([0xd7ff]), "d7ff");
|
| + utf16CodeUnitsToCodepoints([0xd7ff]), "d7ff");
|
| Expect.listEquals([0xe000],
|
| - _utf16CodeUnitsToCodepoints([0xe000]), "e000");
|
| + utf16CodeUnitsToCodepoints([0xe000]), "e000");
|
|
|
| // unexpected continuation bytes
|
| Expect.listEquals([0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xdc00]),
|
| + utf16CodeUnitsToCodepoints([0xdc00]),
|
| "dc00 first unexpected continuation byte");
|
| Expect.listEquals([0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xdfff]),
|
| + utf16CodeUnitsToCodepoints([0xdfff]),
|
| "dfff last unexpected continuation byte");
|
| Expect.listEquals([0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xdc00]),
|
| + utf16CodeUnitsToCodepoints([0xdc00]),
|
| "1 unexpected continuation bytes");
|
| Expect.listEquals([0xfffd, 0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xdc00, 0xdc00]),
|
| + utf16CodeUnitsToCodepoints([0xdc00, 0xdc00]),
|
| "2 unexpected continuation bytes");
|
| Expect.listEquals([0xfffd, 0xfffd ,0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xdc00, 0xdc00, 0xdc00]),
|
| + utf16CodeUnitsToCodepoints([0xdc00, 0xdc00, 0xdc00]),
|
| "3 unexpected continuation bytes");
|
|
|
| // incomplete sequences
|
| - Expect.listEquals([0xfffd], _utf16CodeUnitsToCodepoints([0xd800]),
|
| + Expect.listEquals([0xfffd], utf16CodeUnitsToCodepoints([0xd800]),
|
| "d800 last byte missing");
|
| - Expect.listEquals([0xfffd], _utf16CodeUnitsToCodepoints([0xdbff]),
|
| + Expect.listEquals([0xfffd], utf16CodeUnitsToCodepoints([0xdbff]),
|
| "dbff last byte missing");
|
|
|
| // concatenation of incomplete sequences
|
| Expect.listEquals([0xfffd, 0xfffd],
|
| - _utf16CodeUnitsToCodepoints([0xd800, 0xdbff]),
|
| + utf16CodeUnitsToCodepoints([0xd800, 0xdbff]),
|
| "d800 dbff last byte missing");
|
|
|
| // impossible bytes
|
| - Expect.listEquals([0xfffd], _utf16CodeUnitsToCodepoints([0x110000]),
|
| + Expect.listEquals([0xfffd], utf16CodeUnitsToCodepoints([0x110000]),
|
| "110000 out of bounds");
|
|
|
| // overlong sequences not possible in utf16 (nothing < x10000)
|
|
|