pkg/http_server: 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';
 
 Future<int> getStatusCode(int port,
                           String path,
                           {String host,
                            bool secure: false,
                            DateTime ifModifiedSince,
                            bool rawPath: false}) {
-  var uri;
+  Uri uri;

[Siggi Cherem (dart-lang), 2014/01/06 17:40:23]

note that we prefer 'var' for local variables. Was this triggering some warning?

[kevmoo, 2014/01/06 18:11:33]

I'm a big fan of being explicit w/ the local var type if it is not immediately
assigned.

Keeps the intent clear if one has a big if block, case statement, etc

   if (rawPath) {
     uri = new Uri(scheme: secure ? 'https' : 'http',
                   host: 'localhost',
                   port: port,
                   path: path);
   } else {
     uri = (secure ?
         new Uri.https('localhost:$port', path) :
         new Uri.http('localhost:$port', path));
   }
+  
   return new HttpClient().getUrl(uri)
       .then((request) {
         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(int port, String path) {
-  return new HttpClient().get('localhost', port, path)
+Future<HttpHeaders> getHeaders(int port, String path) =>
+    new HttpClient()
+      .get('localhost', port, path)
       .then((request) => request.close())
       .then((response) => response.drain().then(
           (_) => response.headers));
-}
 
 
-Future<String> getAsString(int port, String path) {
-  return new HttpClient().get('localhost', port, path)
+
+Future<String> getAsString(int port, String path) =>
+    new HttpClient()
+      .get('localhost', port, path)
       .then((request) => request.close())
       .then((response) => UTF8.decodeStream(response));
-}
 
 
 const CERTIFICATE = "localhost_cert";
 
 
-setupSecure() {
+void setupSecure() {
   String certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: certificateDatabase,
                           password: 'dartdart');
 }