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

Unified Diff: tests/standalone/io/file_non_ascii_sync_test.dart

Issue 11364232: Fix file test to test for both decomposed and precomposed utf16 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Merging in changes Created 8 years, 1 month 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 | « tests/standalone/io/directory_non_ascii_test.dart ('k') | tests/standalone/io/file_non_ascii_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/io/file_non_ascii_sync_test.dart
diff --git a/tests/standalone/io/file_non_ascii_sync_test.dart b/tests/standalone/io/file_non_ascii_sync_test.dart
index d2d56465a9bc1ebcfcfe6bc79120a46c7142309e..170865229b4e045c1c98c405fa5723ef32972353 100644
--- a/tests/standalone/io/file_non_ascii_sync_test.dart
+++ b/tests/standalone/io/file_non_ascii_sync_test.dart
@@ -7,11 +7,19 @@ import 'dart:io';
main() {
Directory scriptDir = new File(new Options().script).directorySync();
var f = new File("${scriptDir.path}/æøå/æøå.dat");
+ // On MacOS you get the decomposed utf8 form of file and directory
+ // names from the system. Therefore, we have to check for both here.
+ var precomposed = 'æøå';
+ var decomposed = new String.fromCharCodes([47, 230, 248, 97, 778]);
Expect.isTrue(f.existsSync());
f.createSync();
- Expect.isTrue(f.directorySync().path.endsWith('æøå'));;
+ var path = f.directorySync().path;
+ Expect.isTrue(f.directorySync().path.endsWith(precomposed) ||
+ f.directorySync().path.endsWith(decomposed));
Expect.equals(6, f.lengthSync());
f.lastModifiedSync();
- Expect.isTrue(f.fullPathSync().endsWith('æøå.dat'));
- Expect.equals('æøå', f.readAsTextSync());
+ Expect.isTrue(f.fullPathSync().endsWith('${precomposed}.dat') ||
+ f.fullPathSync().endsWith('${decomposed}.dat'));
+ // The contents of the file is precomposed utf8.
+ Expect.equals(precomposed, f.readAsTextSync());
}
« no previous file with comments | « tests/standalone/io/directory_non_ascii_test.dart ('k') | tests/standalone/io/file_non_ascii_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698