Clean up debug prints, move sync calls to async, and set currentDirectory to p.current before project setUp

Author: srujzs

dwds/lib/src/utilities/dart_uri.dart

@@ -168,26 +168,18 @@ class DartUri {
   /// 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 get currentDirectory {
-    print('Getting current directory: $_currentDirectory');
-    return _currentDirectory;
-  }
+  static String get currentDirectory => _currentDirectory;
 
   static set currentDirectory(String newDir) {
-    print('Setting current directory: $newDir');
     _currentDirectory = newDir;
-    print('Setting current directory uri: ${p.toUri(newDir)}');
     _currentDirectoryUri = '${p.toUri(newDir)}';
   }
 
   static String _currentDirectoryUri = '${p.toUri(currentDirectory)}';
 
   /// The current directory as a file: Uri, saved in a field to avoid
   /// re-computing.
-  static String get currentDirectoryUri {
-    print('Getting current directory uri: $_currentDirectoryUri');
-    return _currentDirectoryUri;
-  }
+  static String get currentDirectoryUri => _currentDirectoryUri;
 
   /// Record library and script uris to enable resolving library and script paths.
   static Future<void> initialize() async {

dwds/test/fixtures/context.dart

@@ -137,6 +137,7 @@ class TestContext {
     TestDebugSettings debugSettings = const TestDebugSettings.noDevTools(),
   }) async {
     try {
+      DartUri.currentDirectory = p.current;
       // Build settings to return from load strategy.
       final buildSettings = TestBuildSettings(
         appEntrypoint: project.dartEntryFilePackageUri,
@@ -541,7 +542,6 @@ class TestContext {
     await _webDriver?.quit(closeSession: true);
     _chromeDriver?.kill();
     DartUri.currentDirectory = p.current;
-    print('Setting currentDirectory in tearDown: ${DartUri.currentDirectory}');
     await _daemonClient?.close();
     await ddcService?.stop();
     await _webRunner?.stop();

dwds/test/fixtures/project.dart

@@ -171,20 +171,19 @@ class TestProject {
 
   static Future<void> _copyPackageAndPathDependenciesIntoTempDirectory(
     Directory tempDirectory,
-    String absolutePackageDirectory,
+    String packageDirectory,
     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);
-    Directory(newPath).createSync();
-    copyPathSync(currentPath, newPath);
+    await Directory(newPath).create();
+    await copyPath(currentPath, newPath);
     copiedPackageDirectories.add(packageDirectory);
     final pubspec = Pubspec.parse(
-      File(p.join(currentPath, 'pubspec.yaml')).readAsStringSync(),
+      await File(p.join(currentPath, 'pubspec.yaml')).readAsString(),
     );
     for (final dependency in pubspec.dependencies.values) {
       if (dependency is PathDependency) {
@@ -202,7 +201,7 @@ class TestProject {
         );
         await _copyPackageAndPathDependenciesIntoTempDirectory(
           tempDirectory,
-          dependencyDirectory.path,
+          p.basename(dependencyDirectory.path),
           copiedPackageDirectories,
         );
       }
@@ -215,7 +214,7 @@ class TestProject {
       'run',
       'build_runner',
       'clean',
-    ], workingDirectory: absolutePackageDirectory);
+    ], workingDirectory: newPath);
   }
 
   Future<void> setUp() async {
@@ -226,25 +225,25 @@ class TestProject {
     final systemTempDir = Directory(
       // Resolve symbolic links as build_daemon tests rely on paths matching
       // between the client and the daemon.
-      Directory.systemTemp.resolveSymbolicLinksSync(),
+      await Directory.systemTemp.resolveSymbolicLinks(),
     );
-    _fixturesCopy = systemTempDir.createTempSync();
+    _fixturesCopy = await systemTempDir.createTemp();
     await _copyPackageAndPathDependenciesIntoTempDirectory(
       _fixturesCopy,
-      absolutePackageDirectory,
+      packageDirectory,
       {},
     );
   }
 
   /// Delete the copy of the project.
   Future<void> tearDown() async {
     try {
-      _fixturesCopy.deleteSync(recursive: true);
+      await _fixturesCopy.delete(recursive: true);
     } on FileSystemException catch (_) {
       // On Windows, the build daemon process might still be accessing the
       // working directory, so wait a second and then try again.
       await Future.delayed(const Duration(seconds: 1));
-      _fixturesCopy.deleteSync(recursive: true);
+      await _fixturesCopy.delete(recursive: true);
     }
   }
 

test_common/lib/utilities.dart

@@ -16,7 +16,6 @@ const newDdcTypeSystemVersion = '3.3.0-242.0.dev';
 /// '/workstation/webdev'.
 String get webdevPath {
   final pathParts = p.split(p.current);
-  print('Path parts: $pathParts');
   // We expect all tests to be run from the webdev mono-repo:
   assert(pathParts.contains(webdevDirName));
   return p.joinAll(