[nnbd] Fix some IO strong mode tests

Fixes:
standalone/io/directory_test
standalone/io/file_test
standalone/io/http_read_test/*
standalone/io/http_reuse_server_port_test/*
standalone/io/http_server_early_client_close_test/*
standalone/io/regress_8828_test/*
standalone/io/socket_cancel_connect_test/*
standalone/io/socket_finalizer_test/*
standalone/io/web_socket_typed_data_test/*

Change-Id: I46b7d8691b66222b61b72bfe4d29ce81fadf511f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/143182
Commit-Queue: Liam Appelbe <[email protected]>
Reviewed-by: Jonas Termansen <[email protected]>
Reviewed-by: Régis Crelier <[email protected]>
Reviewed-by: Alexander Markov <[email protected]>

Author: liamappelbe

tests/standalone/io/directory_test.dart

@@ -196,8 +196,8 @@ class DirectoryTest {
           }
         }
 
-        long.delete().catchError(onError);
-        long.delete(recursive: true).catchError(onError);
+        Future<void>.value(long.delete()).catchError(onError);
+        Future<void>.value(long.delete(recursive: true)).catchError(onError);
       });
     });
   }
@@ -453,7 +453,7 @@ class DirectoryTest {
 class NestedTempDirectoryTest {
   List<Directory> createdDirectories;
 
-  NestedTempDirectoryTest.run() : createdDirectories = new List<Directory>() {
+  NestedTempDirectoryTest.run() : createdDirectories = <Directory>[] {
     Directory.systemTemp.createTemp('dart_directory').then(createPhaseCallback);
   }
 
@@ -511,7 +511,7 @@ testCreateTempError() {
 
   asyncStart();
   var future = new Directory(location).createTemp('dart_tempdir');
-  future.catchError((_) => asyncEnd());
+  Future<Directory?>.value(future).catchError((_) => asyncEnd());
 }
 
 testCreateExistingSync() {

tests/standalone/io/file_test.dart

@@ -74,7 +74,7 @@ class FileTest {
     File file = new File(filename);
     Expect.isTrue('$file'.contains(file.path));
     var subscription;
-    List<int> buffer = new List<int>();
+    List<int> buffer = <int>[];
     subscription = file.openRead().listen((d) {
       buffer.addAll(d);
       if (buffer.length >= 12) {
@@ -105,7 +105,7 @@ class FileTest {
     int bytesRead;
 
     var file1 = new File(inFilename);
-    List<int> buffer = new List<int>();
+    List<int> buffer = <int>[];
     file1.openRead().listen((d) {
       buffer.addAll(d);
     }, onDone: () {
@@ -118,7 +118,7 @@ class FileTest {
       output.flush().then((_) => output.close());
       output.done.then((_) {
         // Now read the contents of the file just written.
-        List<int> buffer2 = new List<int>();
+        List<int> buffer2 = <int>[];
         new File(outFilename).openRead().listen((d) {
           buffer2.addAll(d);
         }, onDone: () {
@@ -819,11 +819,11 @@ class FileTest {
     }
 
     read(0, 3, 3, [1, 2, 3]);
-    read(0, 2, 2, [1, 2, null]);
-    read(1, 2, 1, [null, 1, null]);
-    read(1, 3, 2, [null, 1, 2]);
-    read(2, 3, 1, [null, null, 1]);
-    read(0, 0, 0, [null, null, null]);
+    read(0, 2, 2, [1, 2, -1]);
+    read(1, 2, 1, [-1, 1, -1]);
+    read(1, 3, 2, [-1, 1, 2]);
+    read(2, 3, 1, [-1, -1, 1]);
+    read(0, 0, 0, [-1, -1, -1]);
 
     openedFile.closeSync();
   }
@@ -1296,7 +1296,7 @@ class FileTest {
     int done = 0;
     bool error = false;
     void getLength() {
-      file.length().catchError((e) {
+      Future<int?>.value(file.length()).catchError((e) {
         error = true;
       }).whenComplete(() {
         if (++done == 2) {
@@ -1564,9 +1564,12 @@ class FileTest {
         .then((_) => lift(Expect.isFalse)(newfile.exists()))
         .then((_) {
       if (Platform.operatingSystem != "windows") {
-        new Link(source).create(dest).then((_) => file.rename("xxx")).then((_) {
+        Future<File?>.value(new Link(source)
+            .create(dest)
+            .then((_) => file.rename("xxx"))
+            .then((_) {
           throw "Rename of broken link succeeded";
-        }).catchError((e) {
+        })).catchError((e) {
           Expect.isTrue(e is FileSystemException);
           asyncTestDone("testRename$targetExists");
         });

tests/standalone/io/http_read_test.dart

@@ -187,7 +187,7 @@ void testRead(bool chunkedEncoding) {
         return request.close();
       }).then((response) {
         Expect.equals(HttpStatus.ok, response.statusCode);
-        List<int> body = new List<int>();
+        List<int> body = <int>[];
         response.listen(body.addAll, onDone: () {
           Expect.equals(data, new String.fromCharCodes(body));
           count++;

tests/standalone/io/http_reuse_server_port_test.dart

@@ -49,7 +49,7 @@ void testReusePort() {
   asyncStart();
   runServer(0, 10, true).then((int port) {
     // Stress test the port reusing it 10 times.
-    Future.forEach(new List(10), (_) {
+    Future.forEach(List.filled(10, null), (_) {
       return runServer(port, 10, true);
     }).then((_) {
       asyncEnd();
@@ -61,7 +61,7 @@ void testUncleanReusePort() {
   asyncStart();
   runServer(0, 10, false).then((int port) {
     // Stress test the port reusing it 10 times.
-    Future.forEach(new List(10), (_) {
+    Future.forEach(List.filled(10, null), (_) {
       return runServer(port, 10, false);
     }).then((_) {
       asyncEnd();

tests/standalone/io/http_server_early_client_close_test.dart

@@ -75,7 +75,7 @@ class EarlyCloseTest {
 }
 
 void testEarlyClose1() {
-  List<EarlyCloseTest> tests = new List<EarlyCloseTest>();
+  List<EarlyCloseTest> tests = <EarlyCloseTest>[];
   void add(Object data, [String? exception, bool expectRequest = false]) {
     tests.add(new EarlyCloseTest(data, exception, expectRequest));
   }

tests/standalone/io/regress_8828_test.dart

@@ -24,7 +24,7 @@ void main() {
     client.get("127.0.0.1", server.port, "/").then((HttpClientRequest request) {
       return request.close();
     }).then((HttpClientResponse response) {
-      List<int> body = new List();
+      List<int> body = [];
       response.listen(body.addAll, onDone: () {
         Expect.equals(
             "first line\nsecond line\n", new String.fromCharCodes(body));

tests/standalone/io/socket_cancel_connect_test.dart

@@ -19,6 +19,7 @@ void main() {
   Socket.startConnect("8.8.8.7", 80).then((task) {
     task.socket.timeout(timeout, onTimeout: () {
       task.cancel();
+      return task.socket;
     });
     task.socket.then((socket) {
       Expect.fail("Unexpected connection made.");

tests/standalone/io/socket_finalizer_test.dart

@@ -48,6 +48,6 @@ main() async {
 }
 
 @pragma('vm:never-inline')
-produceGarbage() => all.add(List(1024));
+produceGarbage() => all.add(List.filled(1024, null));
 
 final all = [];

tests/standalone/io/web_socket_typed_data_test.dart

@@ -200,7 +200,7 @@ void testOutOfRangeServer({bool compression: false}) {
         webSocket.listen((message) => Expect.fail("No message expected"),
             onDone: () => completer.complete(true),
             onError: (e) => completer.completeError(e));
-        webSocket.add(new List()..add(i));
+        webSocket.add([i]);
       });
       return completer.future;
     }