| Index: tests/standalone/io/directory_non_ascii_test.dart
|
| diff --git a/tests/standalone/io/directory_non_ascii_test.dart b/tests/standalone/io/directory_non_ascii_test.dart
|
| index c29e9cef4dc873c53a4b4b1830254870eae9c553..2745086eb043d8eb7181f18d1d2bd672a572fe60 100644
|
| --- a/tests/standalone/io/directory_non_ascii_test.dart
|
| +++ b/tests/standalone/io/directory_non_ascii_test.dart
|
| @@ -7,22 +7,28 @@ import 'dart:isolate';
|
|
|
| main() {
|
| var port = new ReceivePort();
|
| - Directory scriptDir = new File(new Options().script).directorySync();
|
| - var d = new Directory("${scriptDir.path}/æøå");
|
| +
|
| // 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]);
|
| - d.exists().then((e) {
|
| - Expect.isTrue(e);
|
| - d.create().then((_) {
|
| - new Directory('').createTemp().then((temp) {
|
| - new Directory("${temp.path}/æøå").createTemp().then((temp2) {
|
| - Expect.isTrue(temp2.path.contains(precomposed) ||
|
| - temp2.path.contains(decomposed));
|
| - temp2.delete().then((_) {
|
| - temp.delete(recursive: true).then((_) {
|
| - port.close();
|
| +
|
| + new Directory('').createTemp().then((tempDir) {
|
| + var nonAsciiDir = new Directory("${tempDir.path}/æøå");
|
| + nonAsciiDir.exists().then((e) {
|
| + Expect.isFalse(e);
|
| + nonAsciiDir.create().then((_) {
|
| + nonAsciiDir.exists().then((e) {
|
| + Expect.isTrue(e);
|
| + new Directory("${tempDir.path}/æøå").createTemp().then((temp) {
|
| + Expect.isTrue(temp.path.contains(precomposed) ||
|
| + temp.path.contains(decomposed));
|
| + temp.delete().then((_) {
|
| + tempDir.delete(recursive: true).then((_) {
|
| + Expect.isFalse(temp.existsSync());
|
| + Expect.isFalse(nonAsciiDir.existsSync());
|
| + port.close();
|
| + });
|
| });
|
| });
|
| });
|
|
|