pkg/http_server more virtual dir test cleanup

pkg/http_server/test/utils.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // 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 utils;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import "package:unittest/unittest.dart";
+
+import 'package:http_server/http_server.dart';
+
+void testVirtualDir(String name, Future func(Directory dir)) {
+  test(name, () {
+    var dir = Directory.systemTemp.createTempSync('http_server_virtual_');
+
+    return func(dir)
+        .whenComplete(() {
+          return dir.delete(recursive: true);
+        });
+  });
+}
+
+Future<int> getStatusCodeForVirtDir(VirtualDirectory virtualDir,
+                           String path,

[Anders Johnsen, 2014/01/07 07:42:10]

Indentation

[kevmoo, 2014/01/07 19:36:52]

Done.

+                           {String host,
+                            bool secure: false,
+                            DateTime ifModifiedSince,
+                            bool rawPath: false}) =>
+    _withServer((server) {
+
+      virtualDir.serve(server);
+      return getStatusCode(server.port, path, host: host, secure: secure,
+          ifModifiedSince: ifModifiedSince, rawPath: rawPath);
+    });
 
 Future<int> getStatusCode(int port,
                           String path,
                           {String host,
                            bool secure: false,
                            DateTime ifModifiedSince,
                            bool rawPath: false}) {
   Uri uri;
   if (rawPath) {
     uri = new Uri(scheme: secure ? 'https' : 'http',
@@ skipping 11 matching lines @@
         if (host != null) request.headers.host = host;
         if (ifModifiedSince != null) {
           request.headers.ifModifiedSince = ifModifiedSince;
         }
         return request.close();
       })
       .then((response) => response.drain().then(
           (_) => response.statusCode));
 }
 
+Future<HttpHeaders> getHeaders(VirtualDirectory virDir, String path) =>

[Anders Johnsen, 2014/01/07 07:42:10]

Please use { ... } for multiline body.

[kevmoo, 2014/01/07 19:36:52]

Done.

+    _withServer((server) {
+      virDir.serve(server);
 
-Future<HttpHeaders> getHeaders(int port, String path) =>
-    new HttpClient()
-      .get('localhost', port, path)
-      .then((request) => request.close())
-      .then((response) => response.drain().then(
-          (_) => response.headers));
+      return new HttpClient()
+          .get('localhost', server.port, path)
+          .then((request) => request.close())
+          .then((response) => response.drain().then((_) => response.headers));
+    });
 
+Future<String> getAsString(VirtualDirectory virtualDir, String path) =>
+    _withServer((server) {
+      virtualDir.serve(server);
 
+      return new HttpClient()
+          .get('localhost', server.port, path)
+          .then((request) => request.close())
+          .then((response) => UTF8.decodeStream(response));
+    });
 
-Future<String> getAsString(int port, String path) =>
-    new HttpClient()
-      .get('localhost', port, path)
-      .then((request) => request.close())
-      .then((response) => UTF8.decodeStream(response));
+Future _withServer(Future func(HttpServer server)) {

[Anders Johnsen, 2014/01/07 07:42:10]

Consider:

{
  return HttpServer.bind('localhost', 0)
      .then((server) {
        return func(server).whenComplete(server.close);
      });
}

[kevmoo, 2014/01/07 19:36:52]

I'll argue against this.

If func throws an error (and not a Future with an error) then whenComplete will
not be called.

I will modify the call to whenComplete to be a bit tighter, though

+  HttpServer server;
+  return HttpServer.bind('localhost', 0)
+      .then((value) {
+        server = value;
+        return func(server);
+      })
+      .whenComplete(() => server.close());
+}
 
 
 const CERTIFICATE = "localhost_cert";
 
 
 void setupSecure() {
   String certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: certificateDatabase,
                           password: 'dartdart');
 }