Pass a Uri to package:http APIs (#29)

Prepare for dart-lang/http#375
dart-lang · Dec 9, 2020 · 22c93ae · 22c93ae
1 parent f1d1c9c
commit 22c93ae
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/test/http_multi_server_test.dart b/test/http_multi_server_test.dart
@@ -171,12 +171,12 @@ void main() {
       });
 
       if (await supportsIPv4) {
-        expect(http.read('http://127.0.0.1:${server.port}/'),
+        expect(http.read(Uri.http('127.0.0.1:${server.port}', '/')),
             completion(equals('got request')));
       }
 
       if (await supportsIPv6) {
-        expect(http.read('http://[::1]:${server.port}/'),
+        expect(http.read(Uri.http('[::1]:${server.port}', '/')),
             completion(equals('got request')));
       }
     });
@@ -191,12 +191,12 @@ void main() {
       });
 
       if (await supportsIPv4) {
-        expect(http.read('http://127.0.0.1:${server.port}/'),
+        expect(http.read(Uri.http('127.0.0.1:${server.port}', '/')),
             completion(equals('got request')));
       }
 
       if (await supportsIPv6) {
-        expect(http.read('http://[::1]:${server.port}/'),
+        expect(http.read(Uri.http('[::1]:${server.port}', '/')),
             completion(equals('got request')));
       }
     });
@@ -209,12 +209,12 @@ void main() {
       });
 
       if (await supportsIPv4) {
-        expect(http.read('http://127.0.0.1:${server.port}/'),
+        expect(http.read(Uri.http('127.0.0.1:${server.port}', '/')),
             completion(equals('got request')));
       }
 
       if (await supportsIPv6) {
-        expect(http.read('http://[::1]:${server.port}/'),
+        expect(http.read(Uri.http('[::1]:${server.port}', '/')),
             completion(equals('got request')));
       }
     });
@@ -227,12 +227,12 @@ void main() {
       });
 
       if (await supportsIPv4) {
-        expect(http.read('http://127.0.0.1:${server.port}/'),
+        expect(http.read(Uri.http('127.0.0.1:${server.port}', '/')),
             completion(equals('got request')));
       }
 
       if (await supportsIPv6) {
-        expect(http.read('http://[::1]:${server.port}/'),
+        expect(http.read(Uri.http('[::1]:${server.port}', '/')),
             throwsA(isA<SocketException>()));
       }
     });
@@ -246,5 +246,5 @@ Future<http.Response> _get(HttpServer server) => http.get(_urlFor(server));
 Future<String> _read(HttpServer server) => http.read(_urlFor(server));
 
 /// Returns the URL for the root of [server].
-String _urlFor(HttpServer server) =>
-    'http://${server.address.host}:${server.port}/';
+Uri _urlFor(HttpServer server) =>
+    Uri.http('${server.address.host}:${server.port}', '/');