From 09d1de9edb7548e4c8ff874fccf2ace645039c55 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jsimmons@google.com>
Date: Mon, 4 May 2020 16:23:54 -0700
Subject: [PATCH] [web] Upgrade the test package to remove the dependency on
 package_resolver

Fixes https://github.com/flutter/flutter/issues/56289
---
 lib/web_ui/dev/browser.dart            | 2 +-
 lib/web_ui/dev/test_platform.dart      | 8 ++++++--
 lib/web_ui/pubspec.yaml                | 4 ++--
 web_sdk/web_engine_tester/pubspec.yaml | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/web_ui/dev/browser.dart b/lib/web_ui/dev/browser.dart
index 71d7de547a603..a63aa9bfc999b 100644
--- a/lib/web_ui/dev/browser.dart
+++ b/lib/web_ui/dev/browser.dart
@@ -11,7 +11,7 @@ import 'package:pedantic/pedantic.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:typed_data/typed_buffers.dart';
 
-import 'package:test_api/src/utils.dart';
+import 'package:test_api/src/utils.dart' show getErrorMessage;
 
 import 'common.dart'; // ignore: unused_import
 
diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart
index 922b432cabe04..0d76ed97de3c7 100644
--- a/lib/web_ui/dev/test_platform.dart
+++ b/lib/web_ui/dev/test_platform.dart
@@ -11,7 +11,7 @@ import 'dart:isolate';
 import 'package:async/async.dart';
 import 'package:http_multi_server/http_multi_server.dart';
 import 'package:image/image.dart';
-import 'package:package_resolver/package_resolver.dart';
+import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;
 import 'package:pool/pool.dart';
 import 'package:shelf/shelf.dart' as shelf;
@@ -816,10 +816,14 @@ class BrowserManager {
           'build',
           '$path.browser_test.dart.js.map',
         );
+        PackageConfig packageConfig = await loadPackageConfigUri(
+          await Isolate.packageConfig);
+        Map<String, Uri> packageMap =
+          {for (var p in packageConfig.packages) p.name: p.packageUriRoot};
         final JSStackTraceMapper mapper = JSStackTraceMapper(
           await File(mapPath).readAsString(),
           mapUrl: p.toUri(mapPath),
-          packageResolver: await PackageResolver.current.asSync,
+          packageMap: packageMap,
           sdkRoot: p.toUri(sdkDir),
         );
 
diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml
index 75743250398be..75d29f2221f85 100644
--- a/lib/web_ui/pubspec.yaml
+++ b/lib/web_ui/pubspec.yaml
@@ -12,10 +12,10 @@ dev_dependencies:
   image: 2.1.4
   mockito: 4.1.1
   path: 1.6.4
-  test: 1.6.5
+  test: 1.14.3
   quiver: 2.0.5
   build_runner: 1.7.2
-  build_test: 0.10.8
+  build_test: 1.0.0
   build_web_compilers: 2.7.1
   yaml: 2.2.0
   watcher: 0.9.7+12
diff --git a/web_sdk/web_engine_tester/pubspec.yaml b/web_sdk/web_engine_tester/pubspec.yaml
index e92c50ff1d71d..4bb4079035a29 100644
--- a/web_sdk/web_engine_tester/pubspec.yaml
+++ b/web_sdk/web_engine_tester/pubspec.yaml
@@ -6,7 +6,7 @@ environment:
 dependencies:
   js: 0.6.1+1
   stream_channel: 2.0.0
-  test: 1.6.5
+  test: 1.14.3
   webkit_inspection_protocol: 0.5.0
   ui:
     path: ../../lib/web_ui