pkg/http_server: messed up one test, fixed whitespace

pkg/http_server/test/virtual_directory_test.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.
 
 import 'dart:async';
 import 'dart:io';
 
 import "package:http_server/http_server.dart";
 import 'package:path/path.dart' as pathos;
 import "package:unittest/unittest.dart";
 
 import 'utils.dart';
 
 void _testVirDir(String name, dynamic func(HttpServer server, Directory dir)) {
   test(name, () {
     HttpServer server;
     Directory dir;
-    
+
     return HttpServer.bind('localhost', 0)
         .then((value) {
           server = value;
           dir = Directory.systemTemp.createTempSync('http_server_virtual_');
-          return func(server, dir);          
+          return func(server, dir);
         })
         .whenComplete(() {
           return Future.wait([server.close(), dir.delete(recursive: true)]);
         });
   });
 }
 
 void _testEncoding(name, expected, [bool create = true]) {
   _testVirDir('encode-$name', (server, dir) {
       if (create) new File('${dir.path}/$name').createSync();
@@ skipping 32 matching lines @@
             expect(result, HttpStatus.NOT_FOUND);
           });
     });
   });
 
   group('serve-file', () {
     group('top-level', () {
       _testVirDir('file-exists', (server, dir) {
         var file = new File('${dir.path}/file')..createSync();
         var virDir = new VirtualDirectory(dir.path);
-  
+
         virDir.serve(server);
-  
+
         return getStatusCode(server.port, '/file')
             .then((result) {
               expect(result, HttpStatus.OK);
             });
       });
 
       _testVirDir('file-not-exists', (server, dir) {
         var virDir = new VirtualDirectory(dir.path);
 
         virDir.serve(server);
 
         return getStatusCode(server.port, '/file')
           .then((result) {
             expect(result, HttpStatus.NOT_FOUND);
           });
       });
     });
 
     group('in-dir', () {
       _testVirDir('file-exists', (server, dir) {
               var dir2 = new Directory('${dir.path}/dir')..createSync();
               var file = new File('${dir2.path}/file')..createSync();
               var virDir = new VirtualDirectory(dir.path);
-    
+
               virDir.serve(server);
-    
+
               return getStatusCode(server.port, '/dir/file')
             .then((result) {
               expect(result, HttpStatus.OK);
             });
       });
 
       _testVirDir('file-not-exists', (server, dir) {
               var dir2 = new Directory('${dir.path}/dir')..createSync();
               var file = new File('${dir.path}/file')..createSync();
               var virDir = new VirtualDirectory(dir.path);
-    
+
               virDir.serve(server);
-    
+
               return getStatusCode(server.port, '/dir/file')
                 .then((result) {
                   expect(result, HttpStatus.NOT_FOUND);
                 });
       });
     });
   });
 
   group('serve-dir', () {
     group('top-level', () {
       _testVirDir('simple', (server, dir) {
         var virDir = new VirtualDirectory(dir.path);
         virDir.allowDirectoryListing = true;
-  
+
         virDir.serve(server);
-  
+
         return getAsString(server.port, '/')
           .then((result) {
             expect(result, contains('Index of /'));
           });
       });
 
       _testVirDir('files', (server, dir) {
         var virDir = new VirtualDirectory(dir.path);
         for (int i = 0; i < 10; i++) {
           new File('${dir.path}/$i').createSync();
         }
         virDir.allowDirectoryListing = true;
-  
+
         virDir.serve(server);
-  
+
         return getAsString(server.port, '/')
           .then((result) {
             expect(result, contains('Index of /'));
           });
       });
 
       _testVirDir('dirs', (server, dir) {
         var virDir = new VirtualDirectory(dir.path);
         for (int i = 0; i < 10; i++) {
           new Directory('${dir.path}/$i').createSync();
         }
         virDir.allowDirectoryListing = true;
 
         virDir.serve(server);
 
         return getAsString(server.port, '/')
           .then((result) {
             expect(result, contains('Index of /'));
           });
       });
 
       if (!Platform.isWindows) {
         _testVirDir('recursive-link', (server, dir) {
           var link = new Link('${dir.path}/recursive')..createSync('.');
           var virDir = new VirtualDirectory(dir.path);
           virDir.allowDirectoryListing = true;
-  
+
           virDir.serve(server);
-  
+
           return Future.wait([
               getAsString(server.port, '/').then(
                   (s) => s.contains('recursive/')),
               getAsString(server.port, '/').then(
                   (s) => !s.contains('../')),
               getAsString(server.port, '/').then(
                   (s) => s.contains('Index of /')),
               getAsString(server.port, '/recursive').then(
                   (s) => s.contains('recursive/')),
               getAsString(server.port, '/recursive').then(
@@ skipping 10 matching lines @@
     group('custom', () {
       _testVirDir('simple', (server, dir) {
         var virDir = new VirtualDirectory(dir.path);
         virDir.allowDirectoryListing = true;
         virDir.directoryHandler = (dir2, request) {
           expect(dir2, isNotNull);
           expect(FileSystemEntity.identicalSync(dir.path, dir2.path), isTrue);
           request.response.write('My handler ${request.uri.path}');
           request.response.close();
         };
-  
+
         virDir.serve(server);
-  
+
         return getAsString(server.port, '/')
           .then((result) {
             expect(result, 'My handler /');
           });
       });
     });
   });
 
   group('links', () {
     if (!Platform.isWindows) {
       group('follow-links', () {
         _testVirDir('dir-link', (server, dir) {
           var dir2 = new Directory('${dir.path}/dir2')..createSync();
           var link = new Link('${dir.path}/dir3')..createSync('dir2');
           var file = new File('${dir2.path}/file')..createSync();
           var virDir = new VirtualDirectory(dir.path);
           virDir.followLinks = true;
-  
+
           virDir.serve(server);
-  
+
           return getStatusCode(server.port, '/dir3/file')
             .then((result) {
               expect(result, HttpStatus.OK);
             });
         });
 
         _testVirDir('root-link', (server, dir) {
           var link = new Link('${dir.path}/dir3')..createSync('.');
           var file = new File('${dir.path}/file')..createSync();
           var virDir = new VirtualDirectory(dir.path);
           virDir.followLinks = true;
-  
+
           virDir.serve(server);
-  
+
           return getStatusCode(server.port, '/dir3/file')
             .then((result) {
               expect(result, HttpStatus.OK);
             });
         });
 
         group('bad-links', () {
           _testVirDir('absolute-link', (server, dir) {
               var file = new File('${dir.path}/file')..createSync();
               var link = new Link('${dir.path}/file2')
                   ..createSync('${dir.path}/file');
               var virDir = new VirtualDirectory(dir.path);
               virDir.followLinks = true;
-  
+
               virDir.serve(server);
-  
+
               return new HttpClient().get('localhost',
                                           server.port,
                                           '/file2')
                   .then((request) => request.close())
                   .then((response) => response.drain().then(
                       (_) => response.statusCode))
                 .then((result) {
                   expect(result, HttpStatus.NOT_FOUND);
                 });
           });
@@ skipping 16 matching lines @@
                       (_) => response.statusCode))
                   .then((result) {
                     expect(result, HttpStatus.NOT_FOUND);
                   });
           });
         });
       });
 
       group('not-follow-links', () {
         _testVirDir('dir-link', (server, dir) {
-          return HttpServer.bind('localhost', 0).then((server) {
-            var dir =
-                Directory.systemTemp.createTempSync('http_server_virtual_');
             var dir2 = new Directory('${dir.path}/dir2')..createSync();
             var link = new Link('${dir.path}/dir3')..createSync('dir2');
             var file = new File('${dir2.path}/file')..createSync();
             var virDir = new VirtualDirectory(dir.path);
             virDir.followLinks = false;
 
             virDir.serve(server);
 
             return getStatusCode(server.port, '/dir3/file')
-                .whenComplete(() {
-                  server.close();
-                  dir.deleteSync(recursive: true);
+                .then((result) {
+                  expect(result, HttpStatus.NOT_FOUND);
                 });
-          })
-          .then((result) {
-            expect(result, HttpStatus.NOT_FOUND);
-          });
         });
       });
 
       group('follow-links', () {
         group('no-root-jail', () {
           _testVirDir('absolute-link', (server, dir) {
               var file = new File('${dir.path}/file')..createSync();
               var link = new Link('${dir.path}/file2')
                   ..createSync('${dir.path}/file');
               var virDir = new VirtualDirectory(dir.path);
@@ skipping 248 matching lines @@
 
         virDir.serve(server);
 
         return getAsString(server.port, '/')
           .then((result) {
             expect(result, 'file contents');
           });
     });
   });
 }