Copy fixtures when edits are needed

Author: srujzs

dwds/pubspec.yaml

@@ -53,6 +53,7 @@ dev_dependencies:
   graphs: ^2.1.0
   frontend_server_common:
     path: ../frontend_server_common
+  io: ^1.0.5
   js: '>=0.6.4 <0.8.0'
   pubspec_parse: ^1.2.0
   puppeteer: ^3.1.1

dwds/test/common/hot_restart_common.dart

@@ -54,13 +54,6 @@ void runTests({
     await recompile(hasEdits: true);
   }
 
-  void undoEdit() {
-    context.makeEditToDartEntryFile(
-      toReplace: newString,
-      replaceWith: originalString,
-    );
-  }
-
   /// Wait for main to finish executing before checking expectations by checking
   /// for a log output.
   ///
@@ -98,7 +91,6 @@ void runTests({
         });
 
         tearDown(() async {
-          undoEdit();
           await context.tearDown();
         });
 
@@ -131,7 +123,6 @@ void runTests({
         });
 
         tearDown(() async {
-          undoEdit();
           await context.tearDown();
         });
 
@@ -166,7 +157,6 @@ void runTests({
 
         tearDown(() async {
           await context.tearDown();
-          undoEdit();
         });
 
         test('can live reload changes ', () async {
@@ -204,7 +194,6 @@ void runTests({
 
     tearDown(() async {
       await context.tearDown();
-      undoEdit();
     });
 
     test('destroys and recreates the isolate during a hot restart', () async {
@@ -501,7 +490,6 @@ void runTests({
 
         tearDown(() async {
           await context.tearDown();
-          undoEdit();
         });
 
         test('can hot restart changes ', () async {
@@ -562,7 +550,6 @@ void runTests({
 
         tearDown(() async {
           await context.tearDown();
-          undoEdit();
         });
 
         test('can hot restart changes ', () async {
@@ -609,7 +596,6 @@ void runTests({
 
     tearDown(() async {
       await context.tearDown();
-      undoEdit();
     });
 
     test(

dwds/test/common/hot_restart_correctness_common.dart

@@ -51,14 +51,6 @@ void runTests({
     }
   }
 
-  void undoEdit() {
-    context.makeEditToDartLibFile(
-      libFileName: 'library2.dart',
-      toReplace: newString,
-      replaceWith: originalString,
-    );
-  }
-
   group('Injected client', () {
     VmService? fakeClient;
 
@@ -78,7 +70,6 @@ void runTests({
 
     tearDown(() async {
       await context.tearDown();
-      undoEdit();
     });
 
     test(
@@ -145,7 +136,6 @@ void runTests({
 
         tearDown(() async {
           await context.tearDown();
-          undoEdit();
         });
 
         test('properly compares constants after hot restart', () async {
@@ -189,7 +179,6 @@ void runTests({
 
         tearDown(() async {
           await context.tearDown();
-          undoEdit();
         });
 
         test('properly compares constants after hot restart', () async {

dwds/test/devtools_test.dart

@@ -132,11 +132,6 @@ void main() {
         await context.webDriver.driver.refresh();
 
         await eventsDone;
-        // Re-set the edited file:
-        context.makeEditToDartEntryFile(
-          toReplace: 'Bonjour le monde!',
-          replaceWith: 'Hello World!',
-        );
       },
       skip: 'https://github.com/dart-lang/webdev/issues/1888',
     );

dwds/test/fixtures/context.dart

@@ -129,18 +129,7 @@ class TestContext {
   /// External VM service.
   VmService get vmService => debugConnection.vmService;
 
-  TestContext(this.project, this.sdkConfigurationProvider) {
-    DartUri.currentDirectory = project.absolutePackageDirectory;
-
-    project.validate();
-
-    _logger.info(
-      'Serving: ${project.directoryToServe}/${project.filePathToServe}',
-    );
-    _logger.info('Project: ${project.absolutePackageDirectory}');
-    _logger.info('Packages: ${project.packageConfigFile}');
-    _logger.info('Entry: ${project.dartEntryFilePath}');
-  }
+  TestContext(this.project, this.sdkConfigurationProvider);
 
   Future<void> setUp({
     TestSettings testSettings = const TestSettings(),
@@ -160,10 +149,17 @@ class TestContext {
       final sdkLayout = sdkConfigurationProvider.sdkLayout;
       final configuration = await sdkConfigurationProvider.configuration;
       configuration.validate();
-      await project.cleanUp();
+      await project.setUp();
 
       DartUri.currentDirectory = project.absolutePackageDirectory;
 
+      _logger.info(
+        'Serving: ${project.directoryToServe}/${project.filePathToServe}',
+      );
+      _logger.info('Project: ${project.absolutePackageDirectory}');
+      _logger.info('Packages: ${project.packageConfigFile}');
+      _logger.info('Entry: ${project.dartEntryFilePath}');
+
       configureLogWriter();
 
       _client = IOClient(
@@ -552,6 +548,7 @@ class TestContext {
     _client?.close();
     await _outputDir?.delete(recursive: true);
     stopLogWriter();
+    project.tearDown();
 
     // clear the state for next setup
     _webDriver = null;
@@ -568,6 +565,10 @@ class TestContext {
     required String toReplace,
     required String replaceWith,
   }) {
+    assert(
+      project.editable,
+      'Project ${project.packageName} is not marked as editable',
+    );
     final file = File(project.dartEntryFilePath);
     final fileContents = file.readAsStringSync();
     file.writeAsStringSync(fileContents.replaceAll(toReplace, replaceWith));
@@ -578,23 +579,26 @@ class TestContext {
     required String toReplace,
     required String replaceWith,
   }) {
+    assert(
+      project.editable,
+      'Project ${project.packageName} is not marked as editable',
+    );
     final file = File(project.dartLibFilePath(libFileName));
     final fileContents = file.readAsStringSync();
     file.writeAsStringSync(fileContents.replaceAll(toReplace, replaceWith));
   }
 
   void addLibraryFile({required String libFileName, required String contents}) {
+    assert(
+      project.editable,
+      'Project ${project.packageName} is not marked as editable',
+    );
     final file = File(project.dartLibFilePath(libFileName));
     // Library folder may not exist yet, so create it.
     file.createSync(recursive: true);
     file.writeAsStringSync(contents);
   }
 
-  void removeLibraryFile({required String libFileName}) {
-    final file = File(project.dartLibFilePath(libFileName));
-    file.deleteSync();
-  }
-
   Future<void> recompile({required bool fullRestart}) async {
     await webRunner.run(
       frontendServerFileSystem,