From 311a738884238dbb6925d2235a8f63b30e5e37d8 Mon Sep 17 00:00:00 2001
From: Bob Nystrom <robert@stuffwithstuff.com>
Date: Thu, 2 Nov 2017 17:41:15 -0700
Subject: [PATCH 1/2] Fix fuzzy arrow warnings since they will become errors
 before too long.

---
 lib/src/runner/browser/browser_manager.dart | 2 +-
 lib/src/runner/configuration/load.dart      | 3 ++-
 lib/src/runner/loader.dart                  | 1 -
 pubspec.yaml                                | 2 +-
 test/frontend/add_tear_down_test.dart       | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index 9f9e3c9ad..d44e598c1 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -272,7 +272,7 @@ class BrowserManager {
   }
 
   /// The callback for handling messages received from the host page.
-  void _onMessage(Map message) {
+  void _onMessage(message) {
     switch (message["command"]) {
       case "ping":
         break;
diff --git a/lib/src/runner/configuration/load.dart b/lib/src/runner/configuration/load.dart
index cd9acf99c..eee575ff1 100644
--- a/lib/src/runner/configuration/load.dart
+++ b/lib/src/runner/configuration/load.dart
@@ -286,7 +286,8 @@ class _ConfigurationLoader {
 
     var paths = _getList("paths", (pathNode) {
       _validate(pathNode, "Paths must be strings.", (value) => value is String);
-      _validate(pathNode, "Paths must be relative.", p.url.isRelative);
+      _validate(pathNode, "Paths must be relative.",
+          (value) => p.url.isRelative(value));
 
       return _parseNode(pathNode, "path", p.fromUri);
     });
diff --git a/lib/src/runner/loader.dart b/lib/src/runner/loader.dart
index 5f0e8ae53..31b1a9952 100644
--- a/lib/src/runner/loader.dart
+++ b/lib/src/runner/loader.dart
@@ -15,7 +15,6 @@ import '../backend/group.dart';
 import '../backend/invoker.dart';
 import '../backend/test_platform.dart';
 import '../util/io.dart';
-import '../utils.dart';
 import 'browser/platform.dart';
 import 'configuration.dart';
 import 'configuration/suite.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index a73064298..96ac40379 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test
-version: 0.12.27
+version: 0.12.27+1
 author: Dart Team <misc@dartlang.org>
 description: A library for writing dart unit tests.
 homepage: https://github.com/dart-lang/test
diff --git a/test/frontend/add_tear_down_test.dart b/test/frontend/add_tear_down_test.dart
index 3a63ff80c..c638b7da3 100644
--- a/test/frontend/add_tear_down_test.dart
+++ b/test/frontend/add_tear_down_test.dart
@@ -7,8 +7,6 @@ import 'dart:async';
 import 'package:async/async.dart';
 import 'package:test/test.dart';
 
-import 'package:test/src/backend/declarer.dart';
-
 import '../utils.dart';
 
 void main() {

From 442b19a8a85dea0ed68ef40c39870d0058006245 Mon Sep 17 00:00:00 2001
From: Bob Nystrom <robert@stuffwithstuff.com>
Date: Mon, 6 Nov 2017 11:19:53 -0800
Subject: [PATCH 2/2] Keep type on _onMessage() parameter.

---
 lib/src/runner/browser/browser_manager.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index d44e598c1..347232519 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -188,7 +188,7 @@ class BrowserManager {
     }));
 
     _environment = _loadBrowserEnvironment();
-    _channel.stream.listen(_onMessage, onDone: close);
+    _channel.stream.listen((message) => _onMessage(message), onDone: close);
   }
 
   /// Loads [_BrowserEnvironment].
@@ -272,7 +272,7 @@ class BrowserManager {
   }
 
   /// The callback for handling messages received from the host page.
-  void _onMessage(message) {
+  void _onMessage(Map message) {
     switch (message["command"]) {
       case "ping":
         break;