[tests] Update failing standalone_2/io/http_* tests for Dart 2
Change-Id: I80cff0d2f864828386f1b8711810e960bbe00f3d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/105729
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
diff --git a/tests/standalone_2/io/http_auth_digest_test.dart b/tests/standalone_2/io/http_auth_digest_test.dart
index 3b4418c..7161cf98 100644
--- a/tests/standalone_2/io/http_auth_digest_test.dart
+++ b/tests/standalone_2/io/http_auth_digest_test.dart
@@ -210,7 +210,7 @@
client.authenticate = (Uri url, String scheme, String realm) {
Expect.equals("Digest", scheme);
Expect.equals("test", realm);
- Completer completer = new Completer();
+ Completer completer = new Completer<bool>();
new Timer(const Duration(milliseconds: 10), () {
client.addCredentials(
Uri.parse("http://127.0.0.1:${server.port}/digest"),
@@ -277,8 +277,7 @@
}
void testNextNonce() {
- Server
- .start("MD5", "auth", nonceStaleAfter: 2, useNextNonce: true)
+ Server.start("MD5", "auth", nonceStaleAfter: 2, useNextNonce: true)
.then((server) {
HttpClient client = new HttpClient();
diff --git a/tests/standalone_2/io/http_auth_test.dart b/tests/standalone_2/io/http_auth_test.dart
index 9ab8161..8d4ba43 100644
--- a/tests/standalone_2/io/http_auth_test.dart
+++ b/tests/standalone_2/io/http_auth_test.dart
@@ -162,7 +162,7 @@
String username = url.path.substring(1, 6);
String password = url.path.substring(1, 6);
if (passwordChanged) password = "${password}1";
- Completer completer = new Completer();
+ Completer completer = new Completer<bool>();
new Timer(const Duration(milliseconds: 10), () {
client.addCredentials(
url, realm, new HttpClientBasicCredentials(username, password));
diff --git a/tests/standalone_2/io/http_headers_test.dart b/tests/standalone_2/io/http_headers_test.dart
index 50a5fc6..3b2f9cb 100644
--- a/tests/standalone_2/io/http_headers_test.dart
+++ b/tests/standalone_2/io/http_headers_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-library dart.http;
+library dart._http;
import "dart:async";
import "dart:collection";
diff --git a/tests/standalone_2/io/http_parser_test.dart b/tests/standalone_2/io/http_parser_test.dart
index 7cef3723..9dc9311 100644
--- a/tests/standalone_2/io/http_parser_test.dart
+++ b/tests/standalone_2/io/http_parser_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-library dart.http;
+library dart._http;
import "dart:async";
import "dart:collection";
diff --git a/tests/standalone_2/io/http_redirect_test.dart b/tests/standalone_2/io/http_redirect_test.dart
index 9155a42..1e54bb9 100644
--- a/tests/standalone_2/io/http_redirect_test.dart
+++ b/tests/standalone_2/io/http_redirect_test.dart
@@ -8,7 +8,7 @@
import "dart:io";
Future<HttpServer> setupServer() {
- Completer completer = new Completer();
+ Completer completer = new Completer<HttpServer>();
HttpServer.bind("127.0.0.1", 0).then((server) {
var handlers = new Map<String, Function>();
addRequestHandler(
@@ -426,8 +426,8 @@
}
client
- .getUrl(Uri
- .parse("http://127.0.0.1:${server.port}/some/relativeToAbsolute"))
+ .getUrl(Uri.parse(
+ "http://127.0.0.1:${server.port}/some/relativeToAbsolute"))
.then((HttpClientRequest request) {
request.followRedirects = false;
return request.close();
diff --git a/tests/standalone_2/io/http_reuse_server_port_test.dart b/tests/standalone_2/io/http_reuse_server_port_test.dart
index e5a35b2..da90fe7 100644
--- a/tests/standalone_2/io/http_reuse_server_port_test.dart
+++ b/tests/standalone_2/io/http_reuse_server_port_test.dart
@@ -14,7 +14,7 @@
import "package:expect/expect.dart";
Future<int> runServer(int port, int connections, bool clean) {
- var completer = new Completer();
+ var completer = new Completer<int>();
HttpServer.bind("127.0.0.1", port).then((server) {
int i = 0;
server.listen((request) {
@@ -26,8 +26,7 @@
}
});
- Future
- .wait(new List.generate(connections, (_) {
+ Future.wait(new List.generate(connections, (_) {
var client = new HttpClient();
return client
.get("127.0.0.1", server.port, "/")
@@ -36,8 +35,7 @@
.catchError((e) {
if (clean) throw e;
});
- }))
- .then((_) {
+ })).then((_) {
if (clean) {
int port = server.port;
server.close().then((_) => completer.complete(port));
diff --git a/tests/standalone_2/io/http_server_response_test.dart b/tests/standalone_2/io/http_server_response_test.dart
index c231c4a..baa729b 100644
--- a/tests/standalone_2/io/http_server_response_test.dart
+++ b/tests/standalone_2/io/http_server_response_test.dart
@@ -103,7 +103,7 @@
}, bytes: bytes * 2);
testServerRequest((server, request) {
- var controller = new StreamController(sync: true);
+ var controller = new StreamController<List<int>>(sync: true);
request.response.addStream(controller.stream).then((response) {
response.close();
response.done.then((_) => server.close());
diff --git a/tests/standalone_2/io/secure_socket_argument_test.dart b/tests/standalone_2/io/secure_socket_argument_test.dart
index 330b309..676801e 100644
--- a/tests/standalone_2/io/secure_socket_argument_test.dart
+++ b/tests/standalone_2/io/secure_socket_argument_test.dart
@@ -5,6 +5,8 @@
import "package:expect/expect.dart";
import "dart:io";
+const SERVER_ADDRESS = "127.0.0.1";
+
void testServerSocketArguments() {
Expect.throws(() => SecureServerSocket.bind(SERVER_ADDRESS, 65536, null));
Expect.throws(() => SecureServerSocket.bind(SERVER_ADDRESS, -1, null));
diff --git a/tests/standalone_2/io/web_socket_protocol_processor_test.dart b/tests/standalone_2/io/web_socket_protocol_processor_test.dart
index 271d141..75ac75a 100644
--- a/tests/standalone_2/io/web_socket_protocol_processor_test.dart
+++ b/tests/standalone_2/io/web_socket_protocol_processor_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-library dart.io;
+library dart._http;
import "package:async_helper/async_helper.dart";
import "package:expect/expect.dart";
@@ -99,7 +99,7 @@
int messageCount = 0;
// Use the same web socket protocol transformer for all frames.
var transformer = new _WebSocketProtocolTransformer();
- var controller = new StreamController(sync: true);
+ var controller = new StreamController<List<int>>(sync: true);
WebSocketMessageCollector mc = new WebSocketMessageCollector(
controller.stream.transform(transformer), message);
@@ -161,7 +161,7 @@
void testFragmentedMessages() {
// Use the same web socket protocol transformer for all frames.
var transformer = new _WebSocketProtocolTransformer();
- var controller = new StreamController(sync: true);
+ var controller = new StreamController<List<int>>(sync: true);
WebSocketMessageCollector mc =
new WebSocketMessageCollector(controller.stream.transform(transformer));
@@ -222,7 +222,7 @@
void testUnmaskedMessage() {
var transformer = new _WebSocketProtocolTransformer(true);
- var controller = new StreamController(sync: true);
+ var controller = new StreamController<List<int>>(sync: true);
asyncStart();
controller.stream.transform(transformer).listen((_) {}, onError: (e) {
asyncEnd();
diff --git a/tests/standalone_2/standalone_2.status b/tests/standalone_2/standalone_2.status
index 10647f5..d229107f 100644
--- a/tests/standalone_2/standalone_2.status
+++ b/tests/standalone_2/standalone_2.status
@@ -111,18 +111,8 @@
[ $compiler == dartk || $compiler == dartkb || $compiler == dartkp ]
io/file_error_test: RuntimeError
io/file_test: RuntimeError
-io/http_auth_digest_test: RuntimeError
-io/http_auth_test: RuntimeError
-io/http_cookie_date_test: CompileTimeError
-io/http_headers_test: CompileTimeError
-io/http_parser_test: CompileTimeError
-io/http_redirect_test: RuntimeError
-io/http_reuse_server_port_test: RuntimeError
-io/http_server_response_test: RuntimeError
io/regress_10026_test: RuntimeError
-io/secure_socket_argument_test: CompileTimeError
io/web_socket_pipe_test: RuntimeError
-io/web_socket_protocol_processor_test: CompileTimeError
io/zlib_test: RuntimeError
[ $mode == product || $runtime == dart_precompiled ]
diff --git a/tests/standalone_2/standalone_2_analyzer.status b/tests/standalone_2/standalone_2_analyzer.status
index 6de6cbf..a5b12fb 100644
--- a/tests/standalone_2/standalone_2_analyzer.status
+++ b/tests/standalone_2/standalone_2_analyzer.status
@@ -5,15 +5,10 @@
[ $compiler == dart2analyzer ]
deferred_transitive_import_error_test: Skip # Contains intentional errors.
io/directory_invalid_arguments_test: CompileTimeError
-io/http_cookie_date_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-io/http_headers_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-io/http_parser_test: Pass, StaticWarning, CompileTimeError # Issue 28843
io/process_exit_negative_test: Skip
io/process_invalid_arguments_test: CompileTimeError
io/raw_secure_server_socket_argument_test: CompileTimeError
-io/secure_socket_argument_test: CompileTimeError
io/stdout_bad_argument_test: CompileTimeError
-io/web_socket_protocol_processor_test: Pass, StaticWarning, CompileTimeError # Issue 28843
package/package_isolate_test: CompileTimeError
package/scenarios/both_dir_and_file/prefers_packages_file_test: CompileTimeError
package/scenarios/invalid/invalid_package_name_test: Crash, OK # Analyzer exits on invalid package config
diff --git a/tests/standalone_2/standalone_2_kernel.status b/tests/standalone_2/standalone_2_kernel.status
index 1441048..dabc68f 100644
--- a/tests/standalone_2/standalone_2_kernel.status
+++ b/tests/standalone_2/standalone_2_kernel.status
@@ -17,21 +17,11 @@
[ $compiler == app_jitk ]
io/file_error_test: RuntimeError
io/file_test: RuntimeError
-io/http_auth_digest_test: RuntimeError
-io/http_auth_test: RuntimeError
-io/http_cookie_date_test: CompileTimeError
-io/http_headers_test: CompileTimeError
-io/http_parser_test: CompileTimeError
-io/http_redirect_test: RuntimeError
-io/http_reuse_server_port_test: RuntimeError
-io/http_server_response_test: RuntimeError
io/platform_test: RuntimeError
io/regress_10026_test: RuntimeError
-io/secure_socket_argument_test: CompileTimeError
io/test_extension_fail_test: RuntimeError
io/test_extension_test: RuntimeError
io/web_socket_pipe_test: RuntimeError
-io/web_socket_protocol_processor_test: CompileTimeError
io/zlib_test: RuntimeError
[ $compiler == dartkb ]
@@ -51,13 +41,6 @@
io/arguments_test: Fail # Test harness passes runtime arguments to the compiler
io/test_runner_test: SkipByDesign # Is not relevant for AOT.
-[ $compiler == fasta ]
-io/http_cookie_date_test: CompileTimeError
-io/http_headers_test: CompileTimeError
-io/http_parser_test: CompileTimeError
-io/secure_socket_argument_test: CompileTimeError
-io/web_socket_protocol_processor_test: CompileTimeError
-
[ $system == android ]
entrypoints_verification_test: Skip # Requires shared objects which the test script doesn't "adb push".
