Update the tests to run with Dart 1.13.

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';
 
 import 'http_mock.dart';
 
+SecurityContext serverContext;
+SecurityContext clientContext;
+
 /**
  *  Used to flag a given test case as being a mock or not.
  */
 final _isMockTestExpando = new Expando<bool>('isMockTest');
 
 void testVirtualDir(String name, Future func(Directory dir)) {
   _testVirtualDir(name, false, func);
   _testVirtualDir(name, true, func);
 }
 
@@ skipping 52 matching lines @@
                           String path,
                           {String host,
                            bool secure: false,
                            DateTime ifModifiedSince,
                            bool rawPath: false,
                            bool followRedirects: true,
                            int from,
                            int to}) {
   var uri = _getUri(port, path, secure: secure, rawPath: rawPath);
 
-  var client = new HttpClient();
+  if (secure) print(clientContext);

[Bill Hesse, 2015/11/11 17:43:22]

Debug printing?  Does a context print anything?

[Søren Gjesse, 2015/11/12 07:37:29]

Removed.

+  var client;
+  if (secure) {
+    client = new HttpClient(context: clientContext);

[Bill Hesse, 2015/11/11 17:43:22]

This is actually OK to call with clientContext null, which does the same as a
missing argument, so the whole if statement can be removed, since the case with
secure=false has clientContext null.

Unless you are always setting clientContext, and need to test the case with it
null or missing.

[Søren Gjesse, 2015/11/12 07:37:29]

There are tests which combine secure and non-secure, so I need to do it this
way.

+  } else {
+    client = new HttpClient();
+  }
   return client.getUrl(uri)
       .then((request) {
         if (!followRedirects) request.followRedirects = false;
         if (host != null) request.headers.host = host;
         if (ifModifiedSince != null) {
           request.headers.ifModifiedSince = ifModifiedSince;
         }
         _addRangeHeader(request, from, to);
         return request.close();
       })
@@ skipping 188 matching lines @@
   var toStr = to != null ? '$to' : '';
   if (fromStr.isNotEmpty || toStr.isNotEmpty) {
     request.headers.set(HttpHeaders.RANGE, 'bytes=$fromStr-$toStr');
   }
 }
 
 const CERTIFICATE = "localhost_cert";
 
 
 void setupSecure() {
-  String certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
-  SecureSocket.initialize(database: certificateDatabase,
-                          password: 'dartdart');
+  String localFile(path) => Platform.script.resolve(path).toFilePath();
+
+  serverContext = new SecurityContext()
+    ..useCertificateChain(localFile('certificates/server_chain.pem'))
+    ..usePrivateKey(localFile('certificates/server_key.pem'),
+                    password: 'dartdart');
+
+  clientContext = new SecurityContext()
+    ..setTrustedCertificates(file: localFile('certificates/trusted_certs.pem'));
 }