[analyzer] Fix windows paths again, and use ResourceProviderMixin.

The paths in the SourceEdits I was constructing needed to be converted,
and since it wasn't a "new failure," the windows trybot for the previous
CL passed anyway (and didn't include output of what went wrong).

Change-Id: I5bb2a52bf8cf112d6a2dae0b5749d1ae4e900e2a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138575
Auto-Submit: Mike Fairhurst <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Mike Fairhurst <[email protected]>

Author: MichaelRFairhurst

pkg/analysis_server/test/src/edit/preview/preview_site_test.dart

@@ -7,11 +7,11 @@ import 'package:analysis_server/src/edit/nnbd_migration/migration_info.dart';
 import 'package:analysis_server/src/edit/nnbd_migration/migration_state.dart';
 import 'package:analysis_server/src/edit/nnbd_migration/path_mapper.dart';
 import 'package:analysis_server/src/edit/preview/preview_site.dart';
-import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
+import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
 
 void main() {
   defineReflectiveSuite(() {
@@ -20,15 +20,11 @@ void main() {
 }
 
 @reflectiveTest
-class PreviewSiteTest {
+class PreviewSiteTest with ResourceProviderMixin {
   PreviewSite site;
-  MemoryResourceProvider resourceProvider;
   DartFixListener dartfixListener;
   MigrationState state;
 
-  File getFile(String path) =>
-      resourceProvider.getFile(resourceProvider.convertPath(path));
-
   void setUp() {
     dartfixListener = DartFixListener(null);
     resourceProvider = MemoryResourceProvider();
@@ -40,9 +36,10 @@ class PreviewSiteTest {
   }
 
   void test_applyChangesEmpty() {
-    getFile('/test.dart').writeAsStringSync('void main() {}');
+    final file = getFile('/test.dart');
+    file.writeAsStringSync('void main() {}');
     site.performApply();
-    expect(getFile('/test.dart').readAsStringSync(), 'void main() {}');
+    expect(file.readAsStringSync(), 'void main() {}');
     expect(state.hasBeenApplied, true);
   }
 
@@ -52,35 +49,38 @@ class PreviewSiteTest {
   }
 
   void test_applyMultipleChanges() {
-    getFile('/test.dart').writeAsStringSync('void main() {}');
+    final path = convertPath('/test.dart');
+    final file = getFile(path);
+    file.writeAsStringSync('void main() {}');
     dartfixListener.addSourceChange(
-        "test change",
-        Location('/test.dart', 10, 0, 1, 10),
-        SourceChange("test change", edits: [
-          SourceFileEdit('/test.dart', 0, edits: [
+        'test change',
+        Location(path, 10, 0, 1, 10),
+        SourceChange('test change', edits: [
+          SourceFileEdit(path, 0, edits: [
             SourceEdit(10, 0, 'List args'),
             SourceEdit(13, 0, '\n  print(args);\n')
           ])
         ]));
     site.performApply();
-    expect(getFile('/test.dart').readAsStringSync(), '''
+    expect(file.readAsStringSync(), '''
 void main(List args) {
   print(args);
 }''');
     expect(state.hasBeenApplied, true);
   }
 
   void test_applySingleChange() {
-    getFile('/test.dart').writeAsStringSync('void main() {}');
+    final path = convertPath('/test.dart');
+    final file = getFile(path);
+    file.writeAsStringSync('void main() {}');
     dartfixListener.addSourceChange(
-        "test change",
-        Location('/test.dart', 10, 0, 1, 10),
-        SourceChange("test change", edits: [
-          SourceFileEdit('/test.dart', 0,
-              edits: [SourceEdit(10, 0, 'List args')])
+        'test change',
+        Location(path, 10, 0, 1, 10),
+        SourceChange('test change', edits: [
+          SourceFileEdit(path, 0, edits: [SourceEdit(10, 0, 'List args')])
         ]));
     site.performApply();
-    expect(getFile('/test.dart').readAsStringSync(), 'void main(List args) {}');
+    expect(file.readAsStringSync(), 'void main(List args) {}');
     expect(state.hasBeenApplied, true);
   }
 }