Index: tests/lib/convert/chunked_conversion_utf87_test.dart |
diff --git a/tests/lib/convert/utf82_test.dart b/tests/lib/convert/chunked_conversion_utf87_test.dart |
similarity index 67% |
copy from tests/lib/convert/utf82_test.dart |
copy to tests/lib/convert/chunked_conversion_utf87_test.dart |
index b52f240ccdabc98b5a1f2b75c9ab6d4c92aa1fb7..60caf58e367c7af0ef31db86ad34238745a10eb1 100644 |
--- a/tests/lib/convert/utf82_test.dart |
+++ b/tests/lib/convert/chunked_conversion_utf87_test.dart |
@@ -2,30 +2,54 @@ |
// 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 utf8_test; |
import "package:expect/expect.dart"; |
import 'dart:convert'; |
-String decode(List<int> bytes) => new Utf8Decoder().convert(bytes); |
-String decodeAllowMalformed(List<int> bytes) { |
- return new Utf8Decoder(allowMalformed: true).convert(bytes); |
+String decode(List<int> inputBytes) { |
+ List<int> bytes; |
+ ChunkedConversionSink byteSink = |
+ new ByteConversionSink.withCallback((result) => bytes = result); |
+ var stringConversionSink = new Utf8Encoder().startChunkedConversion(byteSink); |
+ ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(false); |
+ inputByteSink.add(inputBytes); |
+ inputByteSink.close(); |
+ return UTF8.decode(bytes); |
} |
-String decode2(List<int> bytes) => UTF8.decode(bytes); |
-String decodeAllowMalformed2(List<int> bytes) { |
- return UTF8.decode(bytes, allowMalformed: true); |
+String decode2(List<int> inputBytes) { |
+ List<int> bytes; |
+ ChunkedConversionSink byteSink = |
+ new ByteConversionSink.withCallback((result) => bytes = result); |
+ var stringConversionSink = new Utf8Encoder().startChunkedConversion(byteSink); |
+ ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(false); |
+ inputBytes.forEach((b) => inputByteSink.addSlice([0, b, 1], 1, 2, false)); |
+ inputByteSink.close(); |
+ return UTF8.decode(bytes); |
} |
-String decode3(List<int> bytes) => new Utf8Codec().decode(bytes); |
-String decodeAllowMalformed3(List<int> bytes) { |
- return new Utf8Codec(allowMalformed: true).decode(bytes); |
+String decodeAllowMalformed(List<int> inputBytes) { |
+ List<int> bytes; |
+ ChunkedConversionSink byteSink = |
+ new ByteConversionSink.withCallback((result) => bytes = result); |
+ var stringConversionSink = new Utf8Encoder().startChunkedConversion(byteSink); |
+ ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(true); |
+ inputByteSink.add(inputBytes); |
+ inputByteSink.close(); |
+ return UTF8.decode(bytes); |
} |
-String decode4(List<int> bytes) => new Utf8Codec().decoder.convert(bytes); |
-String decodeAllowMalformed4(List<int> bytes) { |
- return new Utf8Codec(allowMalformed: true).decoder.convert(bytes); |
+String decodeAllowMalformed2(List<int> inputBytes) { |
+ List<int> bytes; |
+ ChunkedConversionSink byteSink = |
+ new ByteConversionSink.withCallback((result) => bytes = result); |
+ var stringConversionSink = new Utf8Encoder().startChunkedConversion(byteSink); |
+ ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(true); |
+ inputBytes.forEach((b) => inputByteSink.addSlice([0, b, 1], 1, 2, false)); |
+ inputByteSink.close(); |
+ return UTF8.decode(bytes); |
} |
+ |
final TESTS = [ |
// Unfinished UTF-8 sequences. |
[ 0xc3 ], |
@@ -122,13 +146,9 @@ main() { |
List<int> bytes = test[0]; |
Expect.throws(() => decode(bytes), (e) => e is FormatException); |
Expect.throws(() => decode2(bytes), (e) => e is FormatException); |
- Expect.throws(() => decode3(bytes), (e) => e is FormatException); |
- Expect.throws(() => decode4(bytes), (e) => e is FormatException); |
String expected = test[1]; |
Expect.equals(expected, decodeAllowMalformed(bytes)); |
Expect.equals(expected, decodeAllowMalformed2(bytes)); |
- Expect.equals(expected, decodeAllowMalformed3(bytes)); |
- Expect.equals(expected, decodeAllowMalformed4(bytes)); |
} |
} |