| Index: tests/standalone/io/file_invalid_arguments_test.dart
|
| diff --git a/tests/standalone/io/file_invalid_arguments_test.dart b/tests/standalone/io/file_invalid_arguments_test.dart
|
| index f8196e6d4d46e284585aff05b99392a062141374..4be142ad7997d526fcf3c353e5b3221707d22a27 100644
|
| --- a/tests/standalone/io/file_invalid_arguments_test.dart
|
| +++ b/tests/standalone/io/file_invalid_arguments_test.dart
|
| @@ -3,113 +3,151 @@
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| import "dart:io";
|
| +import "dart:isolate";
|
|
|
| -class FileTest {
|
| - static void testReadListInvalidArgs(buffer, offset, length) {
|
| - String filename = getFilename("tests/vm/data/fixed_length_file");
|
| - var file = (new File(filename)).openSync();
|
| - try {
|
| - file.readListSync(buffer, offset, length);
|
| - Expect.fail('exception expected');
|
| - } catch (e) {
|
| - Expect.isTrue(e is FileIOException);
|
| - Expect.isTrue(e.toString().contains('Invalid arguments'));
|
| - }
|
| +void testReadInvalidArgs(arg) {
|
| + var port = new ReceivePort();
|
| + String filename = getFilename("tests/vm/data/fixed_length_file");
|
| + var file = (new File(filename)).openSync();
|
| + try {
|
| + file.readSync(arg);
|
| + Expect.fail('exception expected');
|
| + } catch (e) {
|
| + Expect.isTrue(e is FileIOException);
|
| + Expect.isTrue(e.toString().contains('Invalid arguments'));
|
| + }
|
|
|
| - var errors = 0;
|
| - var readListFuture = file.readList(buffer, offset, length);
|
| - readListFuture.then((bytes) {
|
| - Expect.fail('read list invalid arguments');
|
| - }).catchError((e) {
|
| - errors++;
|
| - Expect.isTrue(e.error is FileIOException);
|
| - Expect.isTrue(e.error.toString().contains('Invalid arguments'));
|
| - file.close().then((ignore) {
|
| - Expect.equals(1, errors);
|
| - });
|
| + var errors = 0;
|
| + var readFuture = file.read(arg);
|
| + readFuture.then((bytes) {
|
| + Expect.fail('exception expected');
|
| + }).catchError((e) {
|
| + errors++;
|
| + Expect.isTrue(e.error is FileIOException);
|
| + Expect.isTrue(e.error.toString().contains('Invalid arguments'));
|
| + file.close().then((ignore) {
|
| + Expect.equals(1, errors);
|
| + port.close();
|
| });
|
| - }
|
| + });
|
| +}
|
|
|
| - static void testWriteByteInvalidArgs(value) {
|
| - String filename = getFilename("tests/vm/data/fixed_length_file");
|
| - var file = (new File(filename.concat("_out"))).openSync(FileMode.WRITE);
|
| - try {
|
| - file.writeByteSync(value);
|
| - Expect.fail('exception expected');
|
| - } catch (e) {
|
| - Expect.isTrue(e is FileIOException);
|
| - Expect.isTrue(e.toString().contains('Invalid argument'));
|
| - }
|
| +void testReadListInvalidArgs(buffer, offset, length) {
|
| + var port = new ReceivePort();
|
| + String filename = getFilename("tests/vm/data/fixed_length_file");
|
| + var file = (new File(filename)).openSync();
|
| + try {
|
| + file.readListSync(buffer, offset, length);
|
| + Expect.fail('exception expected');
|
| + } catch (e) {
|
| + Expect.isTrue(e is FileIOException);
|
| + Expect.isTrue(e.toString().contains('Invalid arguments'));
|
| + }
|
|
|
| - var writeByteFuture = file.writeByte(value);
|
| - writeByteFuture.then((ignore) {
|
| - Expect.fail('write byte invalid argument');
|
| - }).catchError((s) {
|
| - Expect.isTrue(s.error is FileIOException);
|
| - Expect.isTrue(s.error.toString().contains('Invalid argument'));
|
| - file.close();
|
| + var errors = 0;
|
| + var readListFuture = file.readList(buffer, offset, length);
|
| + readListFuture.then((bytes) {
|
| + Expect.fail('exception expected');
|
| + }).catchError((e) {
|
| + errors++;
|
| + Expect.isTrue(e.error is FileIOException);
|
| + Expect.isTrue(e.error.toString().contains('Invalid arguments'));
|
| + file.close().then((ignore) {
|
| + Expect.equals(1, errors);
|
| + port.close();
|
| });
|
| - }
|
| + });
|
| +}
|
|
|
| - static void testWriteListInvalidArgs(buffer, offset, bytes) {
|
| - String filename = getFilename("tests/vm/data/fixed_length_file");
|
| - var file = (new File(filename.concat("_out"))).openSync(FileMode.WRITE);
|
| - try {
|
| - file.writeListSync(buffer, offset, bytes);
|
| - Expect.fail('exception expected');
|
| - } catch (e) {
|
| - Expect.isTrue(e is FileIOException);
|
| - Expect.isTrue(e.toString().contains('Invalid arguments'));
|
| - }
|
| +void testWriteByteInvalidArgs(value) {
|
| + var port = new ReceivePort();
|
| + String filename = getFilename("tests/vm/data/fixed_length_file");
|
| + var file = (new File(filename.concat("_out"))).openSync(FileMode.WRITE);
|
| + try {
|
| + file.writeByteSync(value);
|
| + Expect.fail('exception expected');
|
| + } catch (e) {
|
| + Expect.isTrue(e is FileIOException);
|
| + Expect.isTrue(e.toString().contains('Invalid argument'));
|
| + }
|
|
|
| - var writeListFuture = file.writeList(buffer, offset, bytes);
|
| - writeListFuture.then((ignore) {
|
| - Expect.fail('write list invalid argument');
|
| - }).catchError((s) {
|
| - Expect.isTrue(s.error is FileIOException);
|
| - Expect.isTrue(s.error.toString().contains('Invalid arguments'));
|
| - file.close();
|
| + var writeByteFuture = file.writeByte(value);
|
| + writeByteFuture.then((ignore) {
|
| + Expect.fail('exception expected');
|
| + }).catchError((s) {
|
| + Expect.isTrue(s.error is FileIOException);
|
| + Expect.isTrue(s.error.toString().contains('Invalid argument'));
|
| + file.close().then((ignore) {
|
| + port.close();
|
| });
|
| + });
|
| +}
|
| +
|
| +void testWriteListInvalidArgs(buffer, offset, bytes) {
|
| + var port = new ReceivePort();
|
| + String filename = getFilename("tests/vm/data/fixed_length_file");
|
| + var file = (new File(filename.concat("_out"))).openSync(FileMode.WRITE);
|
| + try {
|
| + file.writeListSync(buffer, offset, bytes);
|
| + Expect.fail('exception expected');
|
| + } catch (e) {
|
| + Expect.isTrue(e is FileIOException);
|
| + Expect.isTrue(e.toString().contains('Invalid arguments'));
|
| }
|
|
|
| - static void testWriteStringInvalidArgs(string) {
|
| - String filename = getFilename("tests/vm/data/fixed_length_file");
|
| - var file = new File(filename.concat("_out"));
|
| - file.openSync(FileMode.WRITE);
|
| - try {
|
| - file.writeString(string);
|
| - Expect.fail('exception expected');
|
| - } catch (e) {
|
| - Expect.isTrue(e is FileIOException);
|
| - Expect.isTrue(e.toString().contains('writeString failed'));
|
| - }
|
| + var writeListFuture = file.writeList(buffer, offset, bytes);
|
| + writeListFuture.then((ignore) {
|
| + Expect.fail('exception expected');
|
| + }).catchError((s) {
|
| + Expect.isTrue(s.error is FileIOException);
|
| + Expect.isTrue(s.error.toString().contains('Invalid arguments'));
|
| + file.close().then((ignore) {
|
| + port.close();
|
| + });
|
| + });
|
| +}
|
|
|
| - var errors = 0;
|
| - file.onError = (s) {
|
| - errors++;
|
| - Expect.isTrue(s.contains('writeString failed'));
|
| - };
|
| - var calls = 0;
|
| - file.onNoPendingWrites = () {
|
| - if (++calls > 1) Expect.fail('write list invalid argument');
|
| - };
|
| +void testWriteStringInvalidArgs(string) {
|
| + var port = new ReceivePort();
|
| + String filename = getFilename("tests/vm/data/fixed_length_file");
|
| + var file = new File(filename.concat("_out"));
|
| + file.openSync(FileMode.WRITE);
|
| + try {
|
| file.writeString(string);
|
| - file.onClosed = () {
|
| - Expect.equals(1, errors);
|
| - };
|
| - file.close();
|
| + Expect.fail('exception expected');
|
| + } catch (e) {
|
| + Expect.isTrue(e is FileIOException);
|
| + Expect.isTrue(e.toString().contains('writeString failed'));
|
| }
|
|
|
| - static String getFilename(String path) =>
|
| - new File(path).existsSync() ? path : 'runtime/$path';
|
| + var errors = 0;
|
| + file.onError = (s) {
|
| + errors++;
|
| + Expect.isTrue(s.contains('writeString failed'));
|
| + };
|
| + var calls = 0;
|
| + file.onNoPendingWrites = () {
|
| + if (++calls > 1) Expect.fail('write list invalid argument');
|
| + };
|
| + file.writeString(string);
|
| + file.onClosed = () {
|
| + Expect.equals(1, errors);
|
| + port.close();
|
| + };
|
| + file.close();
|
| +}
|
| +
|
| +String getFilename(String path) {
|
| + return new File(path).existsSync() ? path : 'runtime/$path';
|
| }
|
|
|
| main() {
|
| - FileTest.testReadListInvalidArgs(12, 0, 1);
|
| - FileTest.testReadListInvalidArgs(new List.fixedLength(10), '0', 1);
|
| - FileTest.testReadListInvalidArgs(new List.fixedLength(10), 0, '1');
|
| - FileTest.testWriteByteInvalidArgs('asdf');
|
| - FileTest.testWriteListInvalidArgs(12, 0, 1);
|
| - FileTest.testWriteListInvalidArgs(new List.fixedLength(10), '0', 1);
|
| - FileTest.testWriteListInvalidArgs(new List.fixedLength(10), 0, '1');
|
| + testReadInvalidArgs('asdf');
|
| + testReadListInvalidArgs(12, 0, 1);
|
| + testReadListInvalidArgs(new List.fixedLength(10), '0', 1);
|
| + testReadListInvalidArgs(new List.fixedLength(10), 0, '1');
|
| + testWriteByteInvalidArgs('asdf');
|
| + testWriteListInvalidArgs(12, 0, 1);
|
| + testWriteListInvalidArgs(new List.fixedLength(10), '0', 1);
|
| + testWriteListInvalidArgs(new List.fixedLength(10), 0, '1');
|
| }
|
|
|