Use pubspec_parse to copy dependencies instead of relying on the project to declare it

Author: srujzs

dwds/test/dart_uri_file_uri_test.dart

@@ -26,13 +26,6 @@ void main() {
   final testProject = TestProject.test;
   final testPackageProject = TestProject.testPackage();
 
-  /// The directory for the general _test package.
-  final testDir = testProject.absolutePackageDirectory;
-
-  /// The directory for the _testPackage package (contained within dwds),
-  /// which imports _test.
-  final testPackageDir = testPackageProject.absolutePackageDirectory;
-
   final context = TestContext(testPackageProject, provider);
 
   for (final compilationMode in CompilationMode.values) {
@@ -71,22 +64,41 @@ void main() {
 
           test('file path to org-dartlang-app', () {
             final webMain = Uri.file(
-              p.join(testPackageDir, 'web', 'main.dart'),
+              p.join(
+                // The directory for the _testPackage package (contained within
+                // dwds), which imports _test.
+                testPackageProject.absolutePackageDirectory,
+                'web',
+                'main.dart',
+              ),
             );
             final uri = DartUri('$webMain');
             expect(uri.serverPath, appServerPath);
           });
 
           test('file path to this package', () {
             final testPackageLib = Uri.file(
-              p.join(testPackageDir, 'lib', 'test_library.dart'),
+              p.join(
+                testPackageProject.absolutePackageDirectory,
+                'lib',
+                'test_library.dart',
+              ),
             );
             final uri = DartUri('$testPackageLib');
             expect(uri.serverPath, serverPath);
           });
 
           test('file path to another package', () {
-            final testLib = Uri.file(p.join(testDir, 'lib', 'library.dart'));
+            final testLib = Uri.file(
+              p.join(
+                // The directory for the general _test package.
+                testPackageProject.absolutePackageDirectory,
+                '..',
+                testProject.packageDirectory,
+                'lib',
+                'library.dart',
+              ),
+            );
             final dartUri = DartUri('$testLib');
             expect(dartUri.serverPath, anotherServerPath);
           });

dwds/test/fixtures/project.dart

@@ -6,6 +6,7 @@ import 'dart:io';
 
 import 'package:io/io.dart';
 import 'package:path/path.dart' as p;
+import 'package:pubspec_parse/pubspec_parse.dart';
 import 'package:test_common/utilities.dart';
 
 enum IndexBaseMode { noBase, base }
@@ -17,7 +18,6 @@ class TestProject {
   final String webAssetsPath;
   final String dartEntryFileName;
   final String htmlEntryFileName;
-  final List<TestProject> dependencies;
   final bool editable;
 
   late Directory _fixturesCopy;
@@ -74,7 +74,6 @@ class TestProject {
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
-        dependencies: [TestProject.test],
       );
 
   static final testCircular1 = TestProject._(
@@ -83,7 +82,6 @@ class TestProject {
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
-    dependencies: [TestProject.testCircular2()],
   );
 
   TestProject.testCircular2({IndexBaseMode baseMode = IndexBaseMode.noBase})
@@ -94,7 +92,6 @@ class TestProject {
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
-        dependencies: [TestProject.testCircular1],
       );
 
   static final test = TestProject._(
@@ -147,7 +144,6 @@ class TestProject {
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
-    dependencies: [TestProject.testHotRestart1],
     editable: true,
   );
 
@@ -184,18 +180,45 @@ class TestProject {
     required this.webAssetsPath,
     required this.dartEntryFileName,
     required this.htmlEntryFileName,
-    this.dependencies = const <TestProject>[],
     this.editable = false,
   });
 
-  static void _copyPackageIntoTempDirectory(
+  static void _copyPackageAndPathDependenciesIntoTempDirectory(
     Directory tempDirectory,
     String packageDirectory,
+    Set<String> copiedPackageDirectories,
   ) {
+    // There may be cycles in dependencies, so check that we already copied this
+    // package.
+    if (copiedPackageDirectories.contains(packageDirectory)) return;
     final currentPath = absolutePath(pathFromFixtures: packageDirectory);
     final newPath = p.join(tempDirectory.absolute.path, packageDirectory);
     Directory(newPath).createSync();
     copyPathSync(currentPath, newPath);
+    copiedPackageDirectories.add(packageDirectory);
+    final pubspec = Pubspec.parse(
+      File(p.join(currentPath, 'pubspec.yaml')).readAsStringSync(),
+    );
+    for (final package in pubspec.dependencies.keys) {
+      final dependency = pubspec.dependencies[package]!;
+      if (dependency is PathDependency) {
+        final dependencyDirectory = Directory(dependency.path);
+        // It may be okay to do some more complicated copying here for path
+        // dependencies that aren't immediately under `fixtures`, but for now,
+        // only support those that are.
+        assert(
+          dependencyDirectory.parent == Directory(currentPath).parent,
+          'Path dependency of $packageDirectory: '
+          '${dependencyDirectory.absolute.path} is not an immediate directory '
+          'in `fixtures`.',
+        );
+        _copyPackageAndPathDependenciesIntoTempDirectory(
+          tempDirectory,
+          p.dirname(dependencyDirectory.path),
+          copiedPackageDirectories,
+        );
+      }
+    }
   }
 
   Future<void> setUp() async {
@@ -210,19 +233,11 @@ class TestProject {
         Directory.systemTemp.resolveSymbolicLinksSync(),
       );
       _fixturesCopy = systemTempDir.createTempSync();
-      _copyPackageIntoTempDirectory(_fixturesCopy, packageDirectory);
-      // Also copy any of its dependencies, recursively.
-      final copiedPackages = <TestProject>{this};
-      final dependencyQueue = List<TestProject>.from(dependencies);
-      while (dependencyQueue.isNotEmpty) {
-        final dependency = dependencyQueue.removeAt(0);
-        if (copiedPackages.contains(dependency)) continue;
-        _copyPackageIntoTempDirectory(
-          _fixturesCopy,
-          dependency.packageDirectory,
-        );
-        dependencyQueue.addAll(dependency.dependencies);
-      }
+      _copyPackageAndPathDependenciesIntoTempDirectory(
+        _fixturesCopy,
+        packageDirectory,
+        {},
+      );
     }
 
     // Clean up the project.

dwds/test/load_strategy_test.dart

@@ -31,7 +31,7 @@ void main() {
     group(
       'When the packageConfigLocator does not specify a package config path',
       () {
-        final strategy = FakeStrategy(FakeAssetReader());
+        late final strategy = FakeStrategy(FakeAssetReader());
 
         test('defaults to "./dart_tool/package_config.json"', () {
           expect(
@@ -43,7 +43,7 @@ void main() {
     );
 
     group('When a custom package config path is specified', () {
-      final strategy = FakeStrategy(
+      late final strategy = FakeStrategy(
         FakeAssetReader(),
         packageConfigPath: 'custom/package_config/path',
       );
@@ -57,7 +57,7 @@ void main() {
     });
 
     group('When default build settings defined', () {
-      final strategy = FakeStrategy(
+      late final strategy = FakeStrategy(
         FakeAssetReader(),
         buildSettings: TestBuildSettings.dart(),
       );
@@ -85,7 +85,7 @@ void main() {
       final isFlutterApp = true;
       final experiments = ['records'];
 
-      final strategy = FakeStrategy(
+      late final strategy = FakeStrategy(
         FakeAssetReader(),
         buildSettings: BuildSettings(
           appEntrypoint: appEntrypoint,

dwds/test/readers/frontend_server_asset_reader_test.dart

@@ -22,9 +22,9 @@ void main() {
   late Directory tempFixtures;
   late File jsonOriginal;
   late File mapOriginal;
+  late String packagesDir;
 
   final testProject = TestProject.test;
-  final packagesDir = testProject.absolutePackageDirectory;
 
   Future<void> createTempFixtures() async {
     tempFixtures = await Directory.systemTemp.createTemp('dwds_test_fixtures');
@@ -37,15 +37,14 @@ void main() {
     ).copy(p.join(tempFixtures.path, 'main.dart.dill.map'));
   }
 
-  setUpAll(() async {
+  setUp(() async {
+    await testProject.setUp();
+    packagesDir = testProject.absolutePackageDirectory;
     final sdkLayout = TestSdkLayout.defaultSdkLayout;
     await Process.run(sdkLayout.dartPath, [
       'pub',
       'upgrade',
     ], workingDirectory: packagesDir);
-  });
-
-  setUp(() async {
     await createTempFixtures();
     assetReader = FrontendServerAssetReader(
       outputPath: p.join(tempFixtures.path, 'main.dart.dill'),
@@ -55,6 +54,7 @@ void main() {
   });
 
   tearDown(() async {
+    testProject.tearDown();
     if (await tempFixtures.exists()) await tempFixtures.delete(recursive: true);
   });