| Index: tests/standalone/io/http_session_test.dart
|
| diff --git a/tests/standalone/io/http_session_test.dart b/tests/standalone/io/http_session_test.dart
|
| index 0b83bf4fb5935931f8f3bd624de9d0a4f63668a8..b6f64f8ed797deacfb1f27e29221e322127987eb 100644
|
| --- a/tests/standalone/io/http_session_test.dart
|
| +++ b/tests/standalone/io/http_session_test.dart
|
| @@ -21,33 +21,26 @@ String getSessionId(List<Cookie> cookies) {
|
| }
|
|
|
| Future<String> connectGetSession(int port, [String session]) {
|
| - var c = new Completer();
|
| var client = new HttpClient();
|
| - var conn = client.get("127.0.0.1", port, "/");
|
| - conn.onRequest = (request) {
|
| - if (session != null) {
|
| - request.cookies.add(new Cookie(SESSION_ID, session));
|
| - }
|
| - request.outputStream.close();
|
| - };
|
| - conn.onResponse = (response) {
|
| - response.inputStream.onData = response.inputStream.read;
|
| - response.inputStream.onClosed = () {
|
| - client.shutdown();
|
| - c.complete(getSessionId(response.cookies));
|
| - };
|
| - };
|
| - return c.future;
|
| + return client.get("127.0.0.1", port, "/")
|
| + .then((request) {
|
| + if (session != null) {
|
| + request.cookies.add(new Cookie(SESSION_ID, session));
|
| + }
|
| + return request.close();
|
| + })
|
| + .then((response) {
|
| + return response.reduce(getSessionId(response.cookies), (v, _) => v);
|
| + });
|
| }
|
|
|
| void testSessions(int sessionCount) {
|
| - HttpServer server = new HttpServer();
|
| - server.listen("127.0.0.1", 0);
|
| + HttpServer server = new HttpServer("127.0.0.1", 0);
|
| var sessions = new Set();
|
| - server.defaultRequestHandler = (request, response) {
|
| + server.listen((request) {
|
| sessions.add(request.session().id);
|
| - response.outputStream.close();
|
| - };
|
| + request.response.close();
|
| + });
|
|
|
| var futures = [];
|
| for (int i = 0; i < sessionCount; i++) {
|
| @@ -69,18 +62,17 @@ void testSessions(int sessionCount) {
|
| }
|
|
|
| void testTimeout(int sessionCount) {
|
| - HttpServer server = new HttpServer();
|
| + HttpServer server = new HttpServer("127.0.0.1", 0);
|
| server.sessionTimeout = 0;
|
| - server.listen("127.0.0.1", 0);
|
| var timeouts = [];
|
| - server.defaultRequestHandler = (request, response) {
|
| + server.listen((request) {
|
| var c = new Completer();
|
| timeouts.add(c.future);
|
| request.session().onTimeout = () {
|
| c.complete(null);
|
| };
|
| - response.outputStream.close();
|
| - };
|
| + request.response.close();
|
| + });
|
|
|
| var futures = [];
|
| for (int i = 0; i < sessionCount; i++) {
|
|
|