From c2ef69dff5f341aba89a110a43508cc2698cc724 Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Thu, 2 Nov 2023 20:15:42 +0000 Subject: [PATCH] Update resolveFile2() to accept File instead of String. Change-Id: I5ded2930457ef963fa3e53895ae3b46ace2b75c5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333700 Reviewed-by: Samuel Rawlins Commit-Queue: Konstantin Shcheglov --- .../src/dart/ast/element_locator_test.dart | 11 ++++----- .../dart/micro/simple_file_resolver_test.dart | 6 ++--- .../resolution/augmentation_import_test.dart | 12 +++++----- .../resolution/library_augmentation_test.dart | 2 +- .../dart/resolution/library_export_test.dart | 16 ++++++------- .../dart/resolution/library_import_test.dart | 16 ++++++------- .../src/dart/resolution/metadata_test.dart | 4 ++-- .../resolution/method_invocation_test.dart | 2 +- .../test/src/dart/resolution/resolution.dart | 14 +++++------ .../resolution/switch_statement_test.dart | 2 +- .../dart/resolution/this_expression_test.dart | 4 ++-- .../duplicate_definition_test.dart | 12 +++++----- ...lass_extended_outside_of_library_test.dart | 2 +- ...s_implemented_outside_of_library_test.dart | 2 +- .../import_internal_library_test.dart | 16 ++++++------- .../invalid_use_of_internal_member_test.dart | 8 +++---- .../mixin_on_sealed_class_test.dart | 24 +++++++++---------- .../part_of_different_library_test.dart | 5 ++-- ...base_is_not_base_final_or_sealed_test.dart | 4 ++-- ...inal_is_not_base_final_or_sealed_test.dart | 4 ++-- .../subtype_of_sealed_class_test.dart | 11 ++++----- 21 files changed, 84 insertions(+), 93 deletions(-) diff --git a/pkg/analyzer/test/src/dart/ast/element_locator_test.dart b/pkg/analyzer/test/src/dart/ast/element_locator_test.dart index 582d13a8273..698190d9654 100644 --- a/pkg/analyzer/test/src/dart/ast/element_locator_test.dart +++ b/pkg/analyzer/test/src/dart/ast/element_locator_test.dart @@ -347,21 +347,18 @@ void main() { } test_locate_PartOfDirective_withName() async { - var libPath = convertPath('$testPackageLibPath/lib.dart'); - var partPath = convertPath('$testPackageLibPath/test.dart'); - - newFile(libPath, r''' + final libFile = newFile('$testPackageLibPath/lib.dart', r''' library my.lib; part 'test.dart'; '''); - newFile(partPath, r''' + final partFile = newFile('$testPackageLibPath/test.dart', r''' part of my.lib; '''); - await resolveFile(libPath); + await resolveFile(libFile.path); - await resolveFile2(partPath); + await resolveFile2(partFile); var node = findNode.partOf('part of'); var element = ElementLocator.locate(node); expect(element, isLibraryElement); diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart index b34bcdba4a6..85ff9a0b5b5 100644 --- a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart +++ b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart @@ -2443,7 +2443,7 @@ void func() { // No resolved files yet. _assertResolvedFiles([]); - await resolveFile2(testFile.path); + await resolveFile2(testFile); var result1 = result; // The file was resolved. @@ -2453,7 +2453,7 @@ void func() { expect(fileResolver.cachedResults, contains(testFile.path)); // Ask again, no changes, not resolved. - await resolveFile2(testFile.path); + await resolveFile2(testFile); _assertResolvedFiles([]); // The same result was returned. @@ -2464,7 +2464,7 @@ void func() { fileResolver.changeFiles([a_path]); // The was a change to a file, no matter which, resolve again. - await resolveFile2(testFile.path); + await resolveFile2(testFile); _assertResolvedFiles([testFile]); // Get should get a new result. diff --git a/pkg/analyzer/test/src/dart/resolution/augmentation_import_test.dart b/pkg/analyzer/test/src/dart/resolution/augmentation_import_test.dart index 5273d88a00c..be7b209dd32 100644 --- a/pkg/analyzer/test/src/dart/resolution/augmentation_import_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/augmentation_import_test.dart @@ -30,7 +30,7 @@ import augment 'c.dart'; library augment 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertNoErrorsInResult(); final node = findNode.augmentationImportDirective('c.dart'); @@ -62,7 +62,7 @@ import augment 'c.dart' /*2*/; library augment 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.DUPLICATE_AUGMENTATION_IMPORT, 66, 8), ]); @@ -93,7 +93,7 @@ import augment 'c.dart'; newFile('$testPackageLibPath/c.dart', ''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.IMPORT_OF_NOT_AUGMENTATION, 41, 8), ]); @@ -122,7 +122,7 @@ library augment 'a.dart'; import augment ':net'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.INVALID_URI, 41, 6), ]); @@ -151,7 +151,7 @@ library augment 'a.dart'; import augment '${'foo'}.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_WITH_INTERPOLATION, 41, 15), ]); @@ -190,7 +190,7 @@ library augment 'a.dart'; import augment 'foo:bar'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_DOES_NOT_EXIST, 41, 9), ]); diff --git a/pkg/analyzer/test/src/dart/resolution/library_augmentation_test.dart b/pkg/analyzer/test/src/dart/resolution/library_augmentation_test.dart index 377b7563154..a7bd8e0ffe3 100644 --- a/pkg/analyzer/test/src/dart/resolution/library_augmentation_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/library_augmentation_test.dart @@ -27,7 +27,7 @@ library augment 'a.dart'; newFile('$testPackageLibPath/c.dart', ''); - await resolveFile2(b.path); + await resolveFile2(b); assertNoErrorsInResult(); final node = findNode.libraryAugmentation('a.dart'); diff --git a/pkg/analyzer/test/src/dart/resolution/library_export_test.dart b/pkg/analyzer/test/src/dart/resolution/library_export_test.dart index f1625be927c..89a82ab3dab 100644 --- a/pkg/analyzer/test/src/dart/resolution/library_export_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/library_export_test.dart @@ -28,7 +28,7 @@ export 'c.dart'; newFile('$testPackageLibPath/c.dart', ''); - await resolveFile2(b.path); + await resolveFile2(b); assertNoErrorsInResult(); final node = findNode.export('c.dart'); @@ -54,7 +54,7 @@ library augment 'a.dart'; export 'c.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_DOES_NOT_EXIST, 33, 8), ]); @@ -82,7 +82,7 @@ library augment 'a.dart'; export ':net'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.INVALID_URI, 33, 6), ]); @@ -110,7 +110,7 @@ library augment 'a.dart'; export '${'foo'}.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_WITH_INTERPOLATION, 33, 15), ]); @@ -148,7 +148,7 @@ library augment 'a.dart'; export 'foo:bar'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_DOES_NOT_EXIST, 33, 9), ]); @@ -180,7 +180,7 @@ export 'c.dart'; library augment 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY, 33, 8), ]); @@ -212,7 +212,7 @@ export 'c.dart'; part of my.lib; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY, 33, 8), ]); @@ -244,7 +244,7 @@ export 'c.dart'; part of 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY, 33, 8), ]); diff --git a/pkg/analyzer/test/src/dart/resolution/library_import_test.dart b/pkg/analyzer/test/src/dart/resolution/library_import_test.dart index 5ad8f1f0aa9..a1a3ed5ea15 100644 --- a/pkg/analyzer/test/src/dart/resolution/library_import_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/library_import_test.dart @@ -27,7 +27,7 @@ import 'c.dart'; newFile('$testPackageLibPath/c.dart', ''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(WarningCode.UNUSED_IMPORT, 33, 8), ]); @@ -55,7 +55,7 @@ library augment 'a.dart'; import 'c.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_DOES_NOT_EXIST, 33, 8), ]); @@ -83,7 +83,7 @@ library augment 'a.dart'; import ':net'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.INVALID_URI, 33, 6), ]); @@ -111,7 +111,7 @@ library augment 'a.dart'; import '${'foo'}.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_WITH_INTERPOLATION, 33, 15), ]); @@ -149,7 +149,7 @@ library augment 'a.dart'; import 'foo:bar'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.URI_DOES_NOT_EXIST, 33, 9), ]); @@ -181,7 +181,7 @@ import 'c.dart'; library augment 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY, 33, 8), ]); @@ -213,7 +213,7 @@ import 'c.dart'; part of my.lib; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY, 33, 8), ]); @@ -245,7 +245,7 @@ import 'c.dart'; part of 'b.dart'; '''); - await resolveFile2(b.path); + await resolveFile2(b); assertErrorsInResult([ error(CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY, 33, 8), ]); diff --git a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart index ec26c6f69b9..e764d621d84 100644 --- a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart @@ -216,7 +216,7 @@ const foo = 42; library augment 'test.dart'; '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); _assertAtFoo42(); @@ -357,7 +357,7 @@ const foo = 42; part of 'test.dart'; '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); _assertAtFoo42(); diff --git a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart index b9afdfbdb84..01aa7a78f8d 100644 --- a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart @@ -157,7 +157,7 @@ void foo() {} class A {} '''); - await resolveFile2(a.path); + await resolveFile2(a); final node = findNode.singleMethodInvocation; assertResolvedNodeText(node, r''' diff --git a/pkg/analyzer/test/src/dart/resolution/resolution.dart b/pkg/analyzer/test/src/dart/resolution/resolution.dart index 3d3ac844346..0f29bedd967 100644 --- a/pkg/analyzer/test/src/dart/resolution/resolution.dart +++ b/pkg/analyzer/test/src/dart/resolution/resolution.dart @@ -451,11 +451,9 @@ mixin ResolutionTest implements ResourceProviderMixin { Future resolveFile(String path); - /// Resolve the file with the [path] into [result]. - Future resolveFile2(String path) async { - path = convertPath(path); - - result = await resolveFile(path); + /// Resolve [file] into [result]. + Future resolveFile2(File file) async { + result = await resolveFile(file.path); findNode = FindNode(result.content, result.unit); findElement = FindElement(result.unit); @@ -463,8 +461,8 @@ mixin ResolutionTest implements ResourceProviderMixin { /// Create a new file with the [path] and [content], resolve it into [result]. Future resolveFileCode(String path, String content) { - newFile(path, content); - return resolveFile2(path); + final file = newFile(path, content); + return resolveFile2(file); } /// Put the [code] into the test file, and resolve it. @@ -474,7 +472,7 @@ mixin ResolutionTest implements ResourceProviderMixin { } Future resolveTestFile() { - return resolveFile2(testFile.path); + return resolveFile2(testFile); } /// Choose the type display string, depending on whether the [result] is diff --git a/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart b/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart index 731779b82a6..0f0cc7ed08a 100644 --- a/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart @@ -160,7 +160,7 @@ part 'a.dart'; error(CompileTimeErrorCode.INCONSISTENT_LANGUAGE_VERSION_OVERRIDE, 5, 8), ]); - await resolveFile2(a.path); + await resolveFile2(a); final node = findNode.switchStatement('switch'); assertResolvedNodeText(node, r''' diff --git a/pkg/analyzer/test/src/dart/resolution/this_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/this_expression_test.dart index 4ece4d57be7..446ca736c9b 100644 --- a/pkg/analyzer/test/src/dart/resolution/this_expression_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/this_expression_test.dart @@ -31,7 +31,7 @@ import augment 'a.dart'; class A {} '''); - await resolveFile2(a.path); + await resolveFile2(a); nodeTextConfiguration.withInterfaceTypeElements = true; @@ -61,7 +61,7 @@ import augment 'a.dart'; mixin M {} '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); nodeTextConfiguration.withInterfaceTypeElements = true; diff --git a/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart b/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart index 477f701005a..2363e98363f 100644 --- a/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart +++ b/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart @@ -172,7 +172,7 @@ class A { await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); } @@ -196,7 +196,7 @@ class A { await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertErrorsInResult([ error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 55, 3, contextMessages: [message('/home/test/lib/test.dart', 43, 3)]), @@ -1591,7 +1591,7 @@ mixin A { await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); } @@ -1615,7 +1615,7 @@ mixin A { await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertErrorsInResult([ error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 55, 3, contextMessages: [message('/home/test/lib/test.dart', 43, 3)]), @@ -2150,7 +2150,7 @@ class A {} await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); } @@ -2170,7 +2170,7 @@ mixin A {} await resolveTestFile(); assertNoErrorsInResult(); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); } diff --git a/pkg/analyzer/test/src/diagnostics/final_class_extended_outside_of_library_test.dart b/pkg/analyzer/test/src/diagnostics/final_class_extended_outside_of_library_test.dart index 0722850c757..d7225e5b6a1 100644 --- a/pkg/analyzer/test/src/diagnostics/final_class_extended_outside_of_library_test.dart +++ b/pkg/analyzer/test/src/diagnostics/final_class_extended_outside_of_library_test.dart @@ -48,7 +48,7 @@ class A implements MapEntry { } '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertNoErrorsInCode(r''' diff --git a/pkg/analyzer/test/src/diagnostics/final_class_implemented_outside_of_library_test.dart b/pkg/analyzer/test/src/diagnostics/final_class_implemented_outside_of_library_test.dart index 00646867927..38684ec242d 100644 --- a/pkg/analyzer/test/src/diagnostics/final_class_implemented_outside_of_library_test.dart +++ b/pkg/analyzer/test/src/diagnostics/final_class_implemented_outside_of_library_test.dart @@ -47,7 +47,7 @@ class A implements MapEntry { } '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertErrorsInCode(r''' diff --git a/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart b/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart index 6b2b14e1d68..ecb885b0ff7 100644 --- a/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart +++ b/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart @@ -30,28 +30,28 @@ import 'dart:_internal'; } test_wasm_fromJs() async { - var filePath = _inPackage('js'); - newFile(filePath, ''' + var filePath = _pathInPackage('js'); + final file = newFile(filePath, ''' import 'dart:_wasm'; '''); - await resolveFile2(filePath); + await resolveFile2(file); assertErrorsInResolvedUnit(result, [ error(WarningCode.UNUSED_IMPORT, 7, 12), ]); } test_wasm_fromUi() async { - var filePath = _inPackage('ui'); - newFile(filePath, ''' + var filePath = _pathInPackage('ui'); + final file = newFile(filePath, ''' import 'dart:_wasm'; '''); - await resolveFile2(filePath); + await resolveFile2(file); assertErrorsInResolvedUnit(result, [ error(WarningCode.UNUSED_IMPORT, 7, 12), ]); } - String _inPackage(String packageName) { + String _pathInPackage(String packageName) { var packageRoot = '$workspaceRootPath/$packageName'; var builder = PackageConfigFileBuilder(); builder.add( @@ -61,6 +61,6 @@ import 'dart:_wasm'; ); var path = '$packageRoot/.dart_tool/package_config.json'; writePackageConfig(path, builder); - return convertPath('$packageRoot/lib/$packageName.dart'); + return '$packageRoot/lib/$packageName.dart'; } } diff --git a/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart index 6fd24031cdc..0ec500ad1b0 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart @@ -45,12 +45,12 @@ import 'package:meta/meta.dart'; @internal class A {} '''); - newFile('$fooPackageRootPath/lib/a.dart', ''' + final a = newFile('$fooPackageRootPath/lib/a.dart', ''' import 'src/a.dart'; A a = A(); '''); - await resolveFile2('$fooPackageRootPath/lib/a.dart'); + await resolveFile2(a); assertNoErrorsInResult(); } @@ -61,12 +61,12 @@ import 'package:meta/meta.dart'; @internal extension type E(int i) {} '''); - newFile('$fooPackageRootPath/lib/a.dart', ''' + final a = newFile('$fooPackageRootPath/lib/a.dart', ''' import 'src/a.dart'; E e = E(1); '''); - await resolveFile2('$fooPackageRootPath/lib/a.dart'); + await resolveFile2(a); assertNoErrorsInResult(); } diff --git a/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart b/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart index e8dc8a4f3f1..f8a8bac2f7d 100644 --- a/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart +++ b/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart @@ -50,57 +50,57 @@ mixin Bar on Foo {} } test_withinPackageLibDirectory_OK() async { - newFile('$testPackageLibPath/lib1.dart', r''' + final lib1 = newFile('$testPackageLibPath/lib1.dart', r''' import 'package:meta/meta.dart'; @sealed class Foo {} '''); - newFile('$testPackageLibPath/src/lib2.dart', r''' + final lib2 = newFile('$testPackageLibPath/src/lib2.dart', r''' import '../lib1.dart'; mixin Bar on Foo {} '''); - await resolveFile2('$testPackageLibPath/lib1.dart'); + await resolveFile2(lib1); assertNoErrorsInResult(); - await resolveFile2('$testPackageLibPath/src/lib2.dart'); + await resolveFile2(lib2); assertNoErrorsInResult(); } test_withinPackageTestDirectory_OK() async { - newFile('$testPackageLibPath/lib1.dart', r''' + final lib1 = newFile('$testPackageLibPath/lib1.dart', r''' import 'package:meta/meta.dart'; @sealed class Foo {} '''); - newFile('$testPackageRootPath/test/lib2.dart', r''' + final lib2 = newFile('$testPackageRootPath/test/lib2.dart', r''' import 'package:test/lib1.dart'; mixin Bar on Foo {} '''); - await resolveFile2('$testPackageLibPath/lib1.dart'); + await resolveFile2(lib1); assertNoErrorsInResult(); - await resolveFile2('$testPackageRootPath/test/lib2.dart'); + await resolveFile2(lib2); assertNoErrorsInResult(); } test_withinPart_OK() async { - newFile('$testPackageLibPath/lib1.dart', r''' + final lib1 = newFile('$testPackageLibPath/lib1.dart', r''' import 'package:meta/meta.dart'; part 'part1.dart'; @sealed class Foo {} '''); - newFile('$testPackageLibPath/part1.dart', r''' + final lib2 = newFile('$testPackageLibPath/part1.dart', r''' part of 'lib1.dart'; mixin Bar on Foo {} '''); - await resolveFile2('$testPackageLibPath/lib1.dart'); + await resolveFile2(lib1); assertNoErrorsInResult(); - await resolveFile2('$testPackageLibPath/part1.dart'); + await resolveFile2(lib2); assertNoErrorsInResult(); } } diff --git a/pkg/analyzer/test/src/diagnostics/part_of_different_library_test.dart b/pkg/analyzer/test/src/diagnostics/part_of_different_library_test.dart index 8ba1f621398..6f4aaf9be46 100644 --- a/pkg/analyzer/test/src/diagnostics/part_of_different_library_test.dart +++ b/pkg/analyzer/test/src/diagnostics/part_of_different_library_test.dart @@ -42,12 +42,11 @@ part 'part.g.dart'; part of 'foo.dart'; '''); - var path = '$testPackageRootPath/example/foo.dart'; - newFile(path, ''' + final foo = newFile('$testPackageRootPath/example/foo.dart', ''' part 'foo.g.dart'; '''); - await resolveFile2(path); + await resolveFile2(foo); assertErrorsInResolvedUnit(result, const []); } diff --git a/pkg/analyzer/test/src/diagnostics/subtype_of_base_is_not_base_final_or_sealed_test.dart b/pkg/analyzer/test/src/diagnostics/subtype_of_base_is_not_base_final_or_sealed_test.dart index 41bd26622aa..1fd58336aab 100644 --- a/pkg/analyzer/test/src/diagnostics/subtype_of_base_is_not_base_final_or_sealed_test.dart +++ b/pkg/analyzer/test/src/diagnostics/subtype_of_base_is_not_base_final_or_sealed_test.dart @@ -64,7 +64,7 @@ import 'dart:collection'; abstract class A implements LinkedListEntry {} '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertErrorsInCode(r''' @@ -115,7 +115,7 @@ import 'dart:collection'; abstract class A implements LinkedListEntry {} '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertErrorsInCode(r''' diff --git a/pkg/analyzer/test/src/diagnostics/subtype_of_final_is_not_base_final_or_sealed_test.dart b/pkg/analyzer/test/src/diagnostics/subtype_of_final_is_not_base_final_or_sealed_test.dart index d18836d0ed9..ed044a98263 100644 --- a/pkg/analyzer/test/src/diagnostics/subtype_of_final_is_not_base_final_or_sealed_test.dart +++ b/pkg/analyzer/test/src/diagnostics/subtype_of_final_is_not_base_final_or_sealed_test.dart @@ -55,7 +55,7 @@ class A implements MapEntry { } '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertErrorsInCode(r''' @@ -113,7 +113,7 @@ class A implements MapEntry { } '''); - await resolveFile2(a.path); + await resolveFile2(a); assertNoErrorsInResult(); await assertErrorsInCode(r''' diff --git a/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart b/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart index 0e7a96f9a1e..facf717778d 100644 --- a/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart +++ b/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart @@ -193,17 +193,14 @@ mixin Bar5 implements Foo {} } test_withinPart_language219() async { - var libPath = '$testPackageLibPath/a.dart'; - var partPath = '$testPackageLibPath/b.dart'; - - newFile(libPath, r''' + final lib = newFile('$testPackageLibPath/a.dart', r''' // @dart = 2.19 import 'package:meta/meta.dart'; part 'b.dart'; @sealed class Foo {} '''); - newFile(partPath, r''' + final part = newFile('$testPackageLibPath/b.dart', r''' // @dart = 2.19 part of 'a.dart'; class Bar1 extends Foo {} @@ -212,10 +209,10 @@ class Bar4 = Bar1 with Foo; mixin Bar5 implements Foo {} '''); - await resolveFile2(libPath); + await resolveFile2(lib); assertNoErrorsInResult(); - await resolveFile2(partPath); + await resolveFile2(part); assertNoErrorsInResult(); } }