Remove WithNonFunctionTypeAliasesMixin from analysis_server/.
Change-Id: I3b25bf726d977984552ab361baf11eed28cafd7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/210651
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart
index fb9d441..94e46a7 100644
--- a/pkg/analysis_server/test/abstract_context.dart
+++ b/pkg/analysis_server/test/abstract_context.dart
@@ -300,20 +300,6 @@
}
}
-mixin WithNonFunctionTypeAliasesMixin on AbstractContextTest {
- @override
- String? get testPackageLanguageVersion => null;
-
- @override
- void setUp() {
- super.setUp();
-
- createAnalysisOptionsFile(
- experiments: [EnableString.nonfunction_type_aliases],
- );
- }
-}
-
mixin WithNullSafetyMixin on AbstractContextTest {
@override
String get testPackageLanguageVersion => '2.12';
diff --git a/pkg/analysis_server/test/plugin/protocol_dart_test.dart b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
index 2f7ae488..85c36ff 100644
--- a/pkg/analysis_server/test/plugin/protocol_dart_test.dart
+++ b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
@@ -9,7 +9,6 @@
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
-import '../abstract_context.dart';
import '../abstract_single_unit.dart';
void main() {
@@ -74,8 +73,7 @@
}
@reflectiveTest
-class ConvertElementTest extends AbstractSingleUnitTest
- with WithNonFunctionTypeAliasesMixin {
+class ConvertElementTest extends AbstractSingleUnitTest {
Future<void> test_CLASS() async {
await resolveTestCode('''
@deprecated
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index 546faf8..55a731a 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -63,8 +63,7 @@
}
}
-abstract class _BaseDartCompletionContributorTest extends AbstractContextTest
- with WithNonFunctionTypeAliasesMixin {
+abstract class _BaseDartCompletionContributorTest extends AbstractContextTest {
static const String _UNCHECKED = '__UNCHECKED__';
late String testFile;
int _completionOffset = -1;
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
index 1ab4b27..4fa30e3 100644
--- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
+++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
@@ -12,7 +12,6 @@
show RefactoringProblemSeverity, SourceChange, SourceEdit;
import 'package:test/test.dart';
-import '../../abstract_context.dart';
import '../../abstract_single_unit.dart';
int findIdentifierLength(String search) {
@@ -30,8 +29,7 @@
}
/// The base class for all [Refactoring] tests.
-abstract class RefactoringTest extends AbstractSingleUnitTest
- with WithNonFunctionTypeAliasesMixin {
+abstract class RefactoringTest extends AbstractSingleUnitTest {
late SearchEngine searchEngine;
late SourceChange refactoringChange;
diff --git a/pkg/analysis_server/test/services/search/search_engine_test.dart b/pkg/analysis_server/test/services/search/search_engine_test.dart
index 512db98..10cb93c 100644
--- a/pkg/analysis_server/test/services/search/search_engine_test.dart
+++ b/pkg/analysis_server/test/services/search/search_engine_test.dart
@@ -441,7 +441,7 @@
@reflectiveTest
class SearchEngineImplWithNonFunctionTypeAliasesTest
- extends SearchEngineImplTest with WithNonFunctionTypeAliasesMixin {
+ extends SearchEngineImplTest {
Future<void> test_searchReferences_typeAlias_interfaceType() async {
await resolveTestCode('''
typedef A<T> = Map<T, String>;
diff --git a/pkg/analysis_server/test/src/computer/outline_computer_test.dart b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
index a005ff2..185338f 100644
--- a/pkg/analysis_server/test/src/computer/outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
@@ -17,8 +17,7 @@
});
}
-class AbstractOutlineComputerTest extends AbstractContextTest
- with WithNonFunctionTypeAliasesMixin {
+class AbstractOutlineComputerTest extends AbstractContextTest {
late String testPath;
late String testCode;
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_function_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_function_test.dart
index fd2fea7..2d663fc 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_function_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_function_test.dart
@@ -7,7 +7,6 @@
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
-import '../../../../abstract_context.dart';
import 'fix_processor.dart';
void main() {
@@ -17,8 +16,7 @@
}
@reflectiveTest
-class CreateFunctionTest extends FixProcessorTest
- with WithNonFunctionTypeAliasesMixin {
+class CreateFunctionTest extends FixProcessorTest {
@override
FixKind get kind => DartFixKind.CREATE_FUNCTION;
