Clean up INVALID_EXPORT_OF_INTERNAL_ELEMENT and INVALID_INTERNAL_ANNOTATION tests.

R=brianwilkerson@google.com

Change-Id: I38810fdf5fe05c5a18f003055b1bd5a8842ebb4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/164255
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart
index 3ffe641..542262d 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart
@@ -2,12 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/analysis/analysis_context.dart';
-import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/test_utilities/mock_packages.dart';
-import 'package:analyzer/src/workspace/bazel.dart';
-import 'package:analyzer/src/workspace/package_build.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../dart/resolution/context_collection_resolution.dart';
@@ -25,9 +21,6 @@
 class InvalidExportOfInternalElement_BazelPackageTest
     extends BazelWorkspaceResolutionTest
     with InvalidExportOfInternalElementTest {
-  /// A cached analysis context for resolving sources via the same [Workspace].
-  AnalysisContext analysisContext;
-
   String get testPackageBazelBinPath => '$workspaceRootPath/bazel-bin/dart/my';
 
   String get testPackageGenfilesPath =>
@@ -37,13 +30,6 @@
   String get testPackageLibPath => myPackageLibPath;
 
   @override
-  Future<ResolvedUnitResult> resolveFile(String path) {
-    analysisContext ??= contextFor(path);
-    assert(analysisContext.workspace is BazelWorkspace);
-    return analysisContext.currentSession.getResolvedUnit(path);
-  }
-
-  @override
   void setUp() async {
     super.setUp();
     var metaPath = '$workspaceThirdPartyDartPath/meta';
@@ -59,14 +45,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    newFile('$testPackageBazelBinPath/lib/bar.dart', content: r'''
+    await resolveFileCode('$testPackageBazelBinPath/lib/bar.dart', r'''
 export 'src/foo.dart';
 ''');
-    await resolveFile2('$testPackageBazelBinPath/lib/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 22),
     ]);
   }
@@ -76,14 +60,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    newFile('$testPackageBazelBinPath/lib/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageBazelBinPath/lib/src/bar.dart', r'''
 export 'foo.dart';
 ''');
-    await resolveFile2('$testPackageBazelBinPath/lib/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_exporterIsInGenfilesLib() async {
@@ -91,14 +73,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    newFile('$testPackageGenfilesPath/lib/bar.dart', content: r'''
+    await resolveFileCode('$testPackageGenfilesPath/lib/bar.dart', r'''
 export 'src/foo.dart';
 ''');
-    await resolveFile2('$testPackageGenfilesPath/lib/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 22),
     ]);
   }
@@ -108,14 +88,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    newFile('$testPackageGenfilesPath/lib/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageGenfilesPath/lib/src/bar.dart', r'''
 export 'foo.dart';
 ''');
-    await resolveFile2('$testPackageGenfilesPath/lib/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_exporterIsInLib() async {
@@ -124,12 +102,11 @@
 @internal class One {}
 ''');
 
-    newFile('$testPackageLibPath/bar.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/bar.dart', r'''
 export 'src/foo.dart';
 ''');
-    await resolveFile2('$testPackageLibPath/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 22),
     ]);
   }
@@ -140,12 +117,11 @@
 @internal class One {}
 ''');
 
-    newFile('$testPackageLibPath/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/src/bar.dart', r'''
 export 'foo.dart';
 ''');
-    await resolveFile2('$testPackageLibPath/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_exporterIsInTest() async {
@@ -154,12 +130,11 @@
 @internal class One {}
 ''');
 
-    newFile('$myPackageRootPath/test/foo_test.dart', content: r'''
+    await resolveFileCode('$myPackageRootPath/test/foo_test.dart', r'''
 export 'package:dart.my/src/foo.dart';
 ''');
-    await resolveFile2('$myPackageRootPath/test/foo_test.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_internalIsInBazelBin() async {
@@ -205,56 +180,43 @@
 @reflectiveTest
 class InvalidExportOfInternalElement_PackageBuildPackageTest
     extends InvalidExportOfInternalElement_PubPackageTest {
-  /// A cached analysis context for resolving sources via the same [Workspace].
-  AnalysisContext analysisContext;
-
   String get testPackageDartToolPath =>
       '$testPackageRootPath/.dart_tool/build/generated/test';
 
-  @override
-  Future<ResolvedUnitResult> resolveFile(String path) {
-    analysisContext ??= contextFor(path);
-    assert(analysisContext.workspace is PackageBuildWorkspace);
-    return analysisContext.currentSession.getResolvedUnit(path);
-  }
-
-  @override
-  void setUp() async {
-    analysisContext = null;
-    super.setUp();
-    newFolder(testPackageDartToolPath);
-  }
-
+  @FailingTest(reason: r'''
+We try to analyze a file in .dart_tool, which is implicitly excluded from
+analysis. So, there is no context to analyze it.
+''')
   void test_exporterInGeneratedLib() async {
     newFile('$testPackageRootPath/lib/src/foo.dart', content: r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageRootPath/lib/src/foo.dart');
 
-    newFile('$testPackageDartToolPath/lib/bar.dart', content: r'''
+    await resolveFileCode('$testPackageDartToolPath/lib/bar.dart', r'''
 export 'package:test/src/foo.dart';
 ''');
-    await resolveFile2('$testPackageDartToolPath/lib/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 35),
     ]);
   }
 
+  @FailingTest(reason: r'''
+We try to analyze a file in .dart_tool, which is implicitly excluded from
+analysis. So, there is no context to analyze it.
+''')
   void test_exporterInGeneratedLibSrc() async {
     newFile('$testPackageRootPath/lib/src/foo.dart', content: r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageRootPath/lib/src/foo.dart');
 
-    newFile('$testPackageDartToolPath/lib/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageDartToolPath/lib/src/bar.dart', r'''
 export 'package:test/src/foo.dart';
 ''');
-    await resolveFile2('$testPackageDartToolPath/lib/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_exporterInLib() async {
@@ -262,14 +224,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageRootPath/lib/src/foo.dart');
 
-    newFile('$testPackageRootPath/lib/bar.dart', content: r'''
+    await resolveFileCode('$testPackageRootPath/lib/bar.dart', r'''
 export 'package:test/src/foo.dart';
 ''');
-    await resolveFile2('$testPackageRootPath/lib/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 35),
     ]);
   }
@@ -279,14 +239,12 @@
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageRootPath/lib/src/foo.dart');
 
-    newFile('$testPackageRootPath/lib/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageRootPath/lib/src/bar.dart', r'''
 export 'package:test/src/foo.dart';
 ''');
-    await resolveFile2('$testPackageRootPath/lib/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_internalIsInGeneratedLibSrc() async {
@@ -336,12 +294,11 @@
 @internal class One {}
 ''');
 
-    newFile('$testPackageLibPath/bar.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/bar.dart', r'''
 export 'src/foo.dart';
 ''');
-    await resolveFile2('$testPackageLibPath/bar.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_EXPORT_OF_INTERNAL_ELEMENT, 0, 22),
     ]);
   }
@@ -352,12 +309,11 @@
 @internal class One {}
 ''');
 
-    newFile('$testPackageLibPath/src/bar.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/src/bar.dart', r'''
 export 'foo.dart';
 ''');
-    await resolveFile2('$testPackageLibPath/src/bar.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_exporterIsInTest() async {
@@ -366,12 +322,11 @@
 @internal class One {}
 ''');
 
-    newFile('$testPackageRootPath/test/foo_test.dart', content: r'''
+    await resolveFileCode('$testPackageRootPath/test/foo_test.dart', r'''
 export 'package:test/src/foo.dart';
 ''');
-    await resolveFile2('$testPackageRootPath/test/foo_test.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_internalIsLibSrc() async {
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_internal_annotation_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_internal_annotation_test.dart
index 7de20a1..8a3ca44 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_internal_annotation_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_internal_annotation_test.dart
@@ -15,8 +15,7 @@
 
 @reflectiveTest
 class InvalidInternalAnnotationTest extends PubPackageResolutionTest {
-  String get testPackageImplementationFilePath =>
-      '$testPackageLibPath/src/foo.dart';
+  String get testPackageLibSrcFilePath => '$testPackageLibPath/src/foo.dart';
 
   @override
   void setUp() async {
@@ -29,137 +28,126 @@
   }
 
   void test_annotationInLib() async {
-    newFile('$testPackageLibPath/foo.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/foo.dart', r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageLibPath/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
     ]);
   }
 
   void test_annotationInLib_onLibrary() async {
-    newFile('$testPackageLibPath/foo.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/foo.dart', r'''
 @internal
 library foo;
 import 'package:meta/meta.dart';
 ''');
-    await resolveFile2('$testPackageLibPath/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 0, 9),
     ]);
   }
 
   void test_annotationInLibSrc() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_annotationInLibSrcSubdirectory() async {
-    newFile('$testPackageLibPath/src/foo/foo.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/src/foo/foo.dart', r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo/foo.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_annotationInLibSubdirectory() async {
-    newFile('$testPackageLibPath/foo/foo.dart', content: r'''
+    await resolveFileCode('$testPackageLibPath/foo/foo.dart', r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageLibPath/foo/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
     ]);
   }
 
   void test_annotationInTest() async {
-    newFile('$testPackageRootPath/test/foo_test.dart', content: r'''
+    await resolveFileCode('$testPackageRootPath/test/foo_test.dart', r'''
 import 'package:meta/meta.dart';
 @internal class One {}
 ''');
-    await resolveFile2('$testPackageRootPath/test/foo_test.dart');
 
-    assertErrorsInResolvedUnit(result, []);
+    assertNoErrorsInResult();
   }
 
   void test_privateClass() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal class _One {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
       error(HintCode.UNUSED_ELEMENT, 49, 4),
     ]);
   }
 
   void test_privateClassConstructor_named() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class _C {
   @internal _C.named();
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_ELEMENT, 39, 2),
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 46, 9),
     ]);
   }
 
   void test_privateClassConstructor_unnamed() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class _C {
   @internal _C();
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_ELEMENT, 39, 2),
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 46, 9),
     ]);
   }
 
   void test_privateConstructor() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal C._f();
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 45, 9),
     ]);
   }
 
   void test_privateEnum() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal enum _E {one}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
       error(HintCode.UNUSED_ELEMENT, 48, 2),
       error(HintCode.UNUSED_FIELD, 52, 3),
@@ -167,193 +155,179 @@
   }
 
   void test_privateEnumValue() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 enum E {@internal _one}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 41, 9),
       error(HintCode.UNUSED_FIELD, 51, 4),
     ]);
   }
 
   void test_privateExtension() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal extension _One on String {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
     ]);
   }
 
   void test_privateExtension_unnamed() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal extension on String {}
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
     ]);
   }
 
   void test_privateField_instance() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal int _i = 0;
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_FIELD, 59, 2),
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 59, 6),
     ]);
   }
 
   void test_privateField_static() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal static int _i = 0;
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_FIELD, 66, 2),
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 66, 6),
     ]);
   }
 
   void test_privateGetter() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal int get _i => 0;
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 45, 9),
       error(HintCode.UNUSED_ELEMENT, 63, 2),
     ]);
   }
 
   void test_privateMethod_instance() async {
-    newFile(testPackageImplementationFilePath, content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal void _f() {}
 }
 ''');
-    await resolveFile2(testPackageImplementationFilePath);
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 45, 9),
       error(HintCode.UNUSED_ELEMENT, 60, 2),
     ]);
   }
 
   void test_privateMethod_static() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class C {
   @internal static void _f() {}
 }
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 45, 9),
       error(HintCode.UNUSED_ELEMENT, 67, 2),
     ]);
   }
 
   void test_privateMixin() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal mixin _One {}
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
       error(HintCode.UNUSED_ELEMENT, 49, 4),
     ]);
   }
 
   void test_privateTopLevelFunction() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal void _f() {}
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
       error(HintCode.UNUSED_ELEMENT, 48, 2),
     ]);
   }
 
   void test_privateTopLevelVariable() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal int _i = 1;
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 47, 6),
       error(HintCode.UNUSED_ELEMENT, 47, 2),
     ]);
   }
 
   void test_privateTypedef() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 @internal typedef _T = void Function();
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.INVALID_INTERNAL_ANNOTATION, 33, 9),
       error(HintCode.UNUSED_ELEMENT, 51, 2),
     ]);
   }
 
   void test_publicMethod_privateClass() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class _C {
   @internal void f() {}
 }
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_ELEMENT, 39, 2),
     ]);
   }
 
   void test_publicMethod_privateClass_static() async {
-    newFile('$testPackageLibPath/src/foo.dart', content: r'''
+    await resolveFileCode(testPackageLibSrcFilePath, r'''
 import 'package:meta/meta.dart';
 class _C {
   @internal static void f() {}
 }
 ''');
-    await resolveFile2('$testPackageLibPath/src/foo.dart');
 
-    assertErrorsInResolvedUnit(result, [
+    assertErrorsInResult([
       error(HintCode.UNUSED_ELEMENT, 39, 2),
       error(HintCode.UNUSED_ELEMENT, 68, 1),
     ]);