analyzer tests: Remove the WithNullSafety mixin

Two remaining test files are modified to use the TestCases structure.
In each case, the tests are unchanged, but the classes are renamed.

Additionally, each file had a *WtihNonFunctionTypes variant. Each of
these classes just specified more test cases that include some form of
"typeAlias" in the name, and can be safely merged with the null safety
test cases.

Fixes #44666

Bug: #44666
Change-Id: Id7db1038e64f8bbc12764cb558670b23427a5a86
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/209763
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart

@@ -414,16 +414,6 @@ mixin WithNoImplicitCastsMixin on PubPackageResolutionTest {
   }
 }
 
-mixin WithNullSafetyMixin on PubPackageResolutionTest {
-  // TODO(https://github.com/dart-lang/sdk/issues/44666): This mixin is a no-op
-  // on PubPackageResolutionTest; remove its usage and remove it.
-  @override
-  String? get testPackageLanguageVersion => '2.14';
-
-  @override
-  bool get typeToStringWithNullability => true;
-}
-
 mixin WithoutConstructorTearoffsMixin on PubPackageResolutionTest {
   @override
   String? get testPackageLanguageVersion => '2.13';

pkg/analyzer/test/src/dart/resolution/language_version_test.dart

@@ -101,9 +101,6 @@ var z = pi;
 
 @reflectiveTest
 class NullSafetyUsingAllowedExperimentsTest extends _FeaturesTest {
-  @override
-  bool get typeToStringWithNullability => true;
-
   test_jsonConfig_disable_bin() async {
     _configureAllowedExperimentsTestNullSafety();
 

pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart

@@ -11,16 +11,132 @@ import 'context_collection_resolution.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(PrefixedIdentifierResolutionTest);
-    defineReflectiveTests(PrefixedIdentifierResolutionWithNullSafetyTest);
-    defineReflectiveTests(
-      PrefixedIdentifierResolutionWithNonFunctionTypeAliasesTest,
-    );
+    defineReflectiveTests(PrefixedIdentifierResolutionWithoutNullSafetyTest);
   });
 }
 
 @reflectiveTest
 class PrefixedIdentifierResolutionTest extends PubPackageResolutionTest
-    with WithoutNullSafetyMixin {
+    with PrefixedIdentifierResolutionTestCases {
+  test_deferredImportPrefix_loadLibrary_optIn_fromOptOut() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+class A {}
+''');
+
+    await assertErrorsInCode(r'''
+// @dart = 2.7
+import 'a.dart' deferred as a;
+
+main() {
+  a.loadLibrary;
+}
+''', [
+      error(HintCode.UNUSED_IMPORT, 22, 8),
+    ]);
+
+    var import = findElement.importFind('package:test/a.dart');
+
+    assertPrefixedIdentifier(
+      findNode.prefixed('a.loadLibrary'),
+      element: elementMatcher(
+        import.importedLibrary.loadLibraryFunction,
+        isLegacy: true,
+      ),
+      type: 'Future<dynamic>* Function()*',
+    );
+  }
+
+  test_hasReceiver_typeAlias_staticGetter() async {
+    await assertNoErrorsInCode(r'''
+class A {
+  static int get foo => 0;
+}
+
+typedef B = A;
+
+void f() {
+  B.foo;
+}
+''');
+
+    assertPrefixedIdentifier(
+      findNode.prefixed('B.foo'),
+      element: findElement.getter('foo'),
+      type: 'int',
+    );
+
+    assertTypeAliasRef(
+      findNode.simple('B.foo'),
+      findElement.typeAlias('B'),
+    );
+
+    assertSimpleIdentifier(
+      findNode.simple('foo;'),
+      element: findElement.getter('foo'),
+      type: 'int',
+    );
+  }
+
+  test_implicitCall_tearOff_nullable() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+class A {
+  int call() => 0;
+}
+
+A? a;
+''');
+    await assertErrorsInCode('''
+import 'a.dart';
+
+int Function() foo() {
+  return a;
+}
+''', [
+      error(CompileTimeErrorCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION, 50, 1),
+    ]);
+
+    var identifier = findNode.simple('a;');
+    assertElement(
+      identifier,
+      findElement.importFind('package:test/a.dart').topGet('a'),
+    );
+    assertType(identifier, 'A?');
+  }
+
+  test_read_typedef_interfaceType() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+typedef A = List<int>;
+''');
+
+    await assertNoErrorsInCode('''
+import 'a.dart' as p;
+
+void f() {
+  p.A;
+}
+''');
+
+    var importFind = findElement.importFind('package:test/a.dart');
+    var A = importFind.typeAlias('A');
+
+    var prefixed = findNode.prefixed('p.A');
+    assertPrefixedIdentifier(
+      prefixed,
+      element: A,
+      type: 'Type',
+    );
+
+    assertImportPrefix(prefixed.prefix, importFind.prefix);
+
+    assertSimpleIdentifier(
+      prefixed.identifier,
+      element: A,
+      type: 'Type',
+    );
+  }
+}
+
+mixin PrefixedIdentifierResolutionTestCases on PubPackageResolutionTest {
   test_dynamic_explicitCore_withPrefix() async {
     await assertNoErrorsInCode(r'''
 import 'dart:core' as mycore;
@@ -289,126 +405,6 @@ void f(A a) {
 }
 
 @reflectiveTest
-class PrefixedIdentifierResolutionWithNonFunctionTypeAliasesTest
-    extends PubPackageResolutionTest {
-  test_hasReceiver_typeAlias_staticGetter() async {
-    await assertNoErrorsInCode(r'''
-class A {
-  static int get foo => 0;
-}
-
-typedef B = A;
-
-void f() {
-  B.foo;
-}
-''');
-
-    assertPrefixedIdentifier(
-      findNode.prefixed('B.foo'),
-      element: findElement.getter('foo'),
-      type: 'int',
-    );
-
-    assertTypeAliasRef(
-      findNode.simple('B.foo'),
-      findElement.typeAlias('B'),
-    );
-
-    assertSimpleIdentifier(
-      findNode.simple('foo;'),
-      element: findElement.getter('foo'),
-      type: 'int',
-    );
-  }
-
-  test_read_typedef_interfaceType() async {
-    newFile('$testPackageLibPath/a.dart', content: r'''
-typedef A = List<int>;
-''');
-
-    await assertNoErrorsInCode('''
-import 'a.dart' as p;
-
-void f() {
-  p.A;
-}
-''');
-
-    var importFind = findElement.importFind('package:test/a.dart');
-    var A = importFind.typeAlias('A');
-
-    var prefixed = findNode.prefixed('p.A');
-    assertPrefixedIdentifier(
-      prefixed,
-      element: A,
-      type: 'Type',
-    );
-
-    assertImportPrefix(prefixed.prefix, importFind.prefix);
-
-    assertSimpleIdentifier(
-      prefixed.identifier,
-      element: A,
-      type: 'Type',
-    );
-  }
-}
-
-@reflectiveTest
-class PrefixedIdentifierResolutionWithNullSafetyTest
-    extends PrefixedIdentifierResolutionTest with WithNullSafetyMixin {
-  test_deferredImportPrefix_loadLibrary_optIn_fromOptOut() async {
-    newFile('$testPackageLibPath/a.dart', content: r'''
-class A {}
-''');
-
-    await assertErrorsInCode(r'''
-// @dart = 2.7
-import 'a.dart' deferred as a;
-
-main() {
-  a.loadLibrary;
-}
-''', [
-      error(HintCode.UNUSED_IMPORT, 22, 8),
-    ]);
-
-    var import = findElement.importFind('package:test/a.dart');
-
-    assertPrefixedIdentifier(
-      findNode.prefixed('a.loadLibrary'),
-      element: elementMatcher(
-        import.importedLibrary.loadLibraryFunction,
-        isLegacy: true,
-      ),
-      type: 'Future<dynamic>* Function()*',
-    );
-  }
-
-  test_implicitCall_tearOff_nullable() async {
-    newFile('$testPackageLibPath/a.dart', content: r'''
-class A {
-  int call() => 0;
-}
-
-A? a;
-''');
-    await assertErrorsInCode('''
-import 'a.dart';
-
-int Function() foo() {
-  return a;
-}
-''', [
-      error(CompileTimeErrorCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION, 50, 1),
-    ]);
-
-    var identifier = findNode.simple('a;');
-    assertElement(
-      identifier,
-      findElement.importFind('package:test/a.dart').topGet('a'),
-    );
-    assertType(identifier, 'A?');
-  }
-}
+class PrefixedIdentifierResolutionWithoutNullSafetyTest
+    extends PubPackageResolutionTest
+    with PrefixedIdentifierResolutionTestCases, WithoutNullSafetyMixin {}