Modify currentDirectoryUri when currentDirectory is updated and fix up some tests

Author: srujzs

dwds/lib/src/utilities/dart_uri.dart

@@ -161,15 +161,24 @@ class DartUri {
   /// Returns resolved path for a package, app, or dart uri.
   static String? toResolvedUri(String uri) => _uriToResolvedUri[uri];
 
+  static String _currentDirectory = p.current;
+
   /// The directory in which we're running.
   ///
   /// We store this here because for tests we may want to act as if we're
   /// running in the directory of a target package, even if the current
   /// directory of the tests is actually the main dwds directory.
-  static String currentDirectory = p.current;
+  static String get currentDirectory => _currentDirectory;
+
+  static set currentDirectory(String newDir) {
+    _currentDirectory = newDir;
+    _currentDirectoryUri = '${p.toUri(newDir)}';
+  }
+
+  static String _currentDirectoryUri = '${p.toUri(currentDirectory)}';
 
   /// The current directory as a file: Uri, saved here to avoid re-computing.
-  static final String currentDirectoryUri = '${p.toUri(currentDirectory)}';
+  static String get currentDirectoryUri => _currentDirectoryUri;
 
   /// Record library and script uris to enable resolving library and script paths.
   static Future<void> initialize() async {

dwds/test/dart_uri_file_uri_test.dart

@@ -65,8 +65,8 @@ void main() {
           test('file path to org-dartlang-app', () {
             final webMain = Uri.file(
               p.join(
-                // The directory for the _testPackage package (contained within
-                // dwds), which imports _test.
+                // The directory for the _testPackage package which imports
+                // _test.
                 testPackageProject.absolutePackageDirectory,
                 'web',
                 'main.dart',
@@ -91,7 +91,8 @@ void main() {
           test('file path to another package', () {
             final testLib = Uri.file(
               p.join(
-                // The directory for the general _test package.
+                // The directory for the general _test package. This is going to
+                // be relative to the project in the `TestContext`.
                 testPackageProject.absolutePackageDirectory,
                 '..',
                 testProject.packageDirectory,

dwds/test/fixtures/project.dart

@@ -169,13 +169,14 @@ class TestProject {
     required this.htmlEntryFileName,
   });
 
-  static void _copyPackageAndPathDependenciesIntoTempDirectory(
+  static Future<void> _copyPackageAndPathDependenciesIntoTempDirectory(
     Directory tempDirectory,
-    String packageDirectory,
+    String absolutePackageDirectory,
     Set<String> copiedPackageDirectories,
-  ) {
+  ) async {
     // There may be cycles in dependencies, so check that we already copied this
     // package.
+    final packageDirectory = p.basename(absolutePackageDirectory);
     if (copiedPackageDirectories.contains(packageDirectory)) return;
     final currentPath = absolutePath(pathFromFixtures: packageDirectory);
     final newPath = p.join(tempDirectory.absolute.path, packageDirectory);
@@ -199,13 +200,22 @@ class TestProject {
           '${dependencyDirectory.path} is not an immediate directory in '
           '`fixtures`.',
         );
-        _copyPackageAndPathDependenciesIntoTempDirectory(
+        await _copyPackageAndPathDependenciesIntoTempDirectory(
           tempDirectory,
-          p.basename(dependencyDirectory.path),
+          dependencyDirectory.path,
           copiedPackageDirectories,
         );
       }
     }
+
+    // Clean up the project.
+    // Called when we need to rebuild sdk and the app from previous test
+    // configurations.
+    await Process.run('dart', [
+      'run',
+      'build_runner',
+      'clean',
+    ], workingDirectory: absolutePackageDirectory);
   }
 
   Future<void> setUp() async {
@@ -219,20 +229,11 @@ class TestProject {
       Directory.systemTemp.resolveSymbolicLinksSync(),
     );
     _fixturesCopy = systemTempDir.createTempSync();
-    _copyPackageAndPathDependenciesIntoTempDirectory(
+    await _copyPackageAndPathDependenciesIntoTempDirectory(
       _fixturesCopy,
-      packageDirectory,
+      absolutePackageDirectory,
       {},
     );
-
-    // Clean up the project.
-    // Called when we need to rebuild sdk and the app from previous test
-    // configurations.
-    await Process.run('dart', [
-      'run',
-      'build_runner',
-      'clean',
-    ], workingDirectory: absolutePackageDirectory);
   }
 
   /// Delete the copy of the project.

dwds/test/package_uri_mapper_test.dart

@@ -35,19 +35,23 @@ void main() {
 
       final resolvedPath = '${project.packageDirectory}/lib/test_library.dart';
 
-      final testPackageSoundPath = project.absolutePackageDirectory;
-      final packageConfigFile = Uri.file(
-        p.join(testPackageSoundPath, '.dart_tool', 'package_config.json'),
-      );
-
       late final PackageUriMapper packageUriMapper;
       setUpAll(() async {
+        await project.setUp();
         // Note: Run `dart pub upgrade` before the test cases to fix
         // https://github.com/dart-lang/webdev/issues/1834:
         await Process.run('dart', [
           'pub',
           'upgrade',
-        ], workingDirectory: testPackageSoundPath);
+        ], workingDirectory: project.absolutePackageDirectory);
+
+        final packageConfigFile = Uri.file(
+          p.join(
+            project.absolutePackageDirectory,
+            '.dart_tool',
+            'package_config.json',
+          ),
+        );
 
         packageUriMapper = await PackageUriMapper.create(
           fileSystem,
@@ -56,6 +60,8 @@ void main() {
         );
       });
 
+      tearDownAll(project.tearDown);
+
       test('Can convert package urls to server paths', () {
         expect(packageUriMapper.packageUriToServerPath(packageUri), serverPath);
       });