Fixed Issue #465: Refactoring of the tests, some typos corrected.
diff --git a/LanguageFeatures/nnbd/exports_A01_class_t01.dart b/LanguageFeatures/nnbd/exports_A01_class_t01.dart
index 33fc752..5aeacd9 100644
--- a/LanguageFeatures/nnbd/exports_A01_class_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_class_t01.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.equals(dynamic, GENERIC_NULLABLE().getParamType());
diff --git a/LanguageFeatures/nnbd/exports_A01_class_t02.dart b/LanguageFeatures/nnbd/exports_A01_class_t02.dart
index a652a4f..3228371 100644
--- a/LanguageFeatures/nnbd/exports_A01_class_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_class_t02.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.equals(int, GENERIC_NONNULLABLE_INT().getParamType());
diff --git a/LanguageFeatures/nnbd/exports_A01_class_t03.dart b/LanguageFeatures/nnbd/exports_A01_class_t03.dart
index 6498220..9661c44 100644
--- a/LanguageFeatures/nnbd/exports_A01_class_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_class_t03.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
GENERIC_NONNULLABLE_INT<int?>();
diff --git a/LanguageFeatures/nnbd/exports_A01_class_t04.dart b/LanguageFeatures/nnbd/exports_A01_class_t04.dart
index cd2d01e..1ba5745 100644
--- a/LanguageFeatures/nnbd/exports_A01_class_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_class_t04.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
GENERIC_NEVER<Null>();
diff --git a/LanguageFeatures/nnbd/exports_A01_class_t05.dart b/LanguageFeatures/nnbd/exports_A01_class_t05.dart
index 1ab5c52..b6fe50b 100644
--- a/LanguageFeatures/nnbd/exports_A01_class_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_class_t05.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.equals(Never, GENERIC_NEVER().getParamType());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t01.dart b/LanguageFeatures/nnbd/exports_A01_functions_t01.dart
index c528aa1..f359b85 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t01.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(testme is void Function());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t02.dart b/LanguageFeatures/nnbd/exports_A01_functions_t02.dart
index b91c5d9..3df9d77 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t02.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(test_nullable_int_arg is void Function(int?));
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t03.dart b/LanguageFeatures/nnbd/exports_A01_functions_t03.dart
index be43b41..8052552 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t03.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(test_int_arg is void Function(int));
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t04.dart b/LanguageFeatures/nnbd/exports_A01_functions_t04.dart
index 2c4ec67..16e7114 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t04.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
test_int_arg(null);
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t05.dart b/LanguageFeatures/nnbd/exports_A01_functions_t05.dart
index 146874e..d116af6 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t05.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(test_never_arg is void Function(Never));
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t06.dart b/LanguageFeatures/nnbd/exports_A01_functions_t06.dart
index a639cde..2cec46b 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t06.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t06.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
test_never_arg(1);
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t07.dart b/LanguageFeatures/nnbd/exports_A01_functions_t07.dart
index 36657e7..ce90520 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t07.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t07.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(test_required_arg is void Function({required int i}));
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t08.dart b/LanguageFeatures/nnbd/exports_A01_functions_t08.dart
index 9237de3..3d3ddb2 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t08.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t08.dart
@@ -16,7 +16,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
test_required_arg();
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t09.dart b/LanguageFeatures/nnbd/exports_A01_functions_t09.dart
index c4cfa41..cb1e68c 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t09.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t09.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(getNullableInt is int? Function());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t10.dart b/LanguageFeatures/nnbd/exports_A01_functions_t10.dart
index 47c880a..2859f5a 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t10.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t10.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(getInt is int Function());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t11.dart b/LanguageFeatures/nnbd/exports_A01_functions_t11.dart
index 52e07a2..f7f7134 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t11.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t11.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
late Never n;
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t12.dart b/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
index 46eef9e..73f9f3d 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(testGenericDynamic is void Function<T>());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t13.dart b/LanguageFeatures/nnbd/exports_A01_functions_t13.dart
index b16c514..0659127 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t13.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t13.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isTrue(testGenericInt is void Function<T extends int>());
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t14.dart b/LanguageFeatures/nnbd/exports_A01_functions_t14.dart
index 1479970..6d8c468 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t14.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t14.dart
@@ -16,7 +16,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
testGenericInt<Null>();
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t15.dart b/LanguageFeatures/nnbd/exports_A01_functions_t15.dart
index 0a24b1d..fc880af 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t15.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t15.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
testGenericNever();
diff --git a/LanguageFeatures/nnbd/exports_legacy_A01_aliases_lib.dart b/LanguageFeatures/nnbd/exports_A01_legacy_aliases_lib.dart
similarity index 88%
rename from LanguageFeatures/nnbd/exports_legacy_A01_aliases_lib.dart
rename to LanguageFeatures/nnbd/exports_A01_legacy_aliases_lib.dart
index 989b4bf..09f16e0 100644
--- a/LanguageFeatures/nnbd/exports_legacy_A01_aliases_lib.dart
+++ b/LanguageFeatures/nnbd/exports_A01_legacy_aliases_lib.dart
@@ -10,6 +10,6 @@
// @dart=2.6
library export_opted_aliases_lib;
-export "exports_opted_in_aliases_lib.dart";
+export "exports_A01_opted_in_aliases_lib.dart";
diff --git a/LanguageFeatures/nnbd/exports_legacy_A01_lib.dart b/LanguageFeatures/nnbd/exports_A01_legacy_lib.dart
similarity index 89%
rename from LanguageFeatures/nnbd/exports_legacy_A01_lib.dart
rename to LanguageFeatures/nnbd/exports_A01_legacy_lib.dart
index b3334df..b24c731 100644
--- a/LanguageFeatures/nnbd/exports_legacy_A01_lib.dart
+++ b/LanguageFeatures/nnbd/exports_A01_legacy_lib.dart
@@ -10,6 +10,6 @@
// @dart=2.6
library export_opted_lib;
-export "exports_opted_in_lib.dart";
+export "exports_A01_opted_in_lib.dart";
diff --git a/LanguageFeatures/nnbd/exports_opted_in_aliases_lib.dart b/LanguageFeatures/nnbd/exports_A01_opted_in_aliases_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/exports_opted_in_aliases_lib.dart
rename to LanguageFeatures/nnbd/exports_A01_opted_in_aliases_lib.dart
diff --git a/LanguageFeatures/nnbd/exports_opted_in_lib.dart b/LanguageFeatures/nnbd/exports_A01_opted_in_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/exports_opted_in_lib.dart
rename to LanguageFeatures/nnbd/exports_A01_opted_in_lib.dart
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t01.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t01.dart
index e92705b..070b0d1 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t01.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t02.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t02.dart
index 2604604..deb0fff 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t02.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_nullable_int_arg = void Function(int? i);
typedef exp_nullable_object_arg = void Function(int? i);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t03.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t03.dart
index 48bf5db..bf1b0a0 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t03.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_int_arg = void Function(int i);
typedef exp_object_arg = void Function(Object o);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t04.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t04.dart
index c1b9a99..887d5c3 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t04.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_never_arg = void Function(Never n);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t05.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t05.dart
index fb533f2..e0982a3 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t05.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_required_arg = void Function({required int i});
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t06.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t06.dart
index 9ad42f2..3db866c 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t06.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t06.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getNullableInt = int? Function();
typedef exp_getNullableObject = Object? Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t07.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t07.dart
index 15bcb59..a7b0b2c 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t07.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t07.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getInt = int Function();
typedef exp_getObject = Object Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t08.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t08.dart
index 5aa6901..1871bb3 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t08.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t08.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getNever = Never Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t09.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t09.dart
index 1922893..9e6f2de 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t09.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t09.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t10.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t10.dart
index f269165..8585547 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t10.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t10.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t11.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t11.dart
index 36c3335..8318e18 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t11.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t11.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t12.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t12.dart
index 382a67e..7b48340 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t12.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t12.dart
@@ -19,7 +19,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_dynamic <T> = void Function(T);
typedef exp_nullable_int <T extends int?> = void Function(T);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t13.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t13.dart
index 85cf387..7b95370 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t13.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t13.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_int <T> = void Function(T);
typedef exp_object <T extends Object> = void Function(T);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t14.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t14.dart
index 48bcf74..2f4f060 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t14.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t14.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function(Never);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t15.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t15.dart
index 222b48a..768dcff 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t15.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t15.dart
@@ -19,7 +19,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getDynamic <T> = T Function();
typedef exp_getNullableInt <T extends int?> = T Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t16.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t16.dart
index aca46ec..89a2c67 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t16.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t16.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getInt <T extends int> = T Function();
typedef exp_getObject <T extends Object> = T Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef1_t17.dart b/LanguageFeatures/nnbd/exports_A01_typedef1_t17.dart
index 3b46978..69d9352 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef1_t17.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef1_t17.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = Never Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t01.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t01.dart
index 4dde4cf..7b276e4 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t01.dart
@@ -16,7 +16,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
typedef exp_A = A? ;
typedef exp_Int = int? ;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t02.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t02.dart
index c3e1ecf..f7c644f 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t02.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t03.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t03.dart
index 958a8ca..11485ba 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t03.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
main() {
NullableAAlias a = null;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t04.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t04.dart
index a70bb06..b6af6fc 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t04.dart
@@ -17,7 +17,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
typedef exp_A = A ;
typedef exp_Int = int ;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t05.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t05.dart
index a5e8b83..c666e42 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t05.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t06.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t06.dart
index 7832ea5..7491190 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t06.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t06.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable,nonfunction-type-aliases
// Requirements=nnbd-strong
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
main() {
AAlias a = null;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t07.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t07.dart
index c6b7200..9851549 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t07.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t07.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
main() {
Expect.equals(Never, NeverAlias);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t08.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t08.dart
index ff03f7c..94ee705 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t08.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t08.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable,nonfunction-type-aliases
// Requirements=nnbd-strong
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
main() {
NeverAlias n1 = 1;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef2_t09.dart b/LanguageFeatures/nnbd/exports_A01_typedef2_t09.dart
index b6a6066..dbe43f2 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef2_t09.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef2_t09.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable,nonfunction-type-aliases
// Requirements=nnbd-strong
-import "exports_legacy_A01_aliases_lib.dart";
+import "exports_A01_legacy_aliases_lib.dart";
main() {
NeverAlias n = null;
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t01.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t01.dart
index 0ce29f8..99d8a38 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t01.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t02.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t02.dart
index fc7d46c..49c24f2 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t02.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_nullable_int_arg = void Function(int? i);
typedef exp_nullable_object_arg = void Function(int? i);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t03.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t03.dart
index d441039..91e1381 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t03.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_int_arg = void Function(int i);
typedef exp_object_arg = void Function(Object o);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t04.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t04.dart
index 3012ad9..0e66910 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t04.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_never_arg = void Function(Never n);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t05.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t05.dart
index 9097cca..419a524 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t05.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_required_arg = void Function({required int i});
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t06.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t06.dart
index 97317a2..66c12cd 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t06.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t06.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getNullableInt = int? Function();
typedef exp_getNullableObject = Object? Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t07.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t07.dart
index 2194234..45cc9bd 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t07.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t07.dart
@@ -18,7 +18,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getInt = int Function();
typedef exp_getObject = Object Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t08.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t08.dart
index 8b32847..570386f 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t08.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t08.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getNever = Never Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t09.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t09.dart
index ee3a3dc..11f9154 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t09.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t09.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t10.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t10.dart
index 94ceb52..5677299 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t10.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t10.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t11.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t11.dart
index 50f4c0e..bda124a 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t11.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t11.dart
@@ -17,7 +17,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t12.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t12.dart
index 4410255..d695909 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t12.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t12.dart
@@ -19,7 +19,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_dynamic <T> = void Function(T);
typedef exp_nullable_int <T extends int?> = void Function(T);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
index 0201edb..44ac45c 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_int <T> = void Function(T);
typedef exp_object <T extends Object> = void Function(T);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t14.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t14.dart
index 2724ddd..24d8050 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t14.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t14.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = void Function(Never);
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t15.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t15.dart
index 01d791e..4fd9131 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t15.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t15.dart
@@ -19,7 +19,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getDynamic <T> = T Function();
typedef exp_getNullableInt <T extends int?> = T Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t16.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t16.dart
index 59cac31..a69541d 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t16.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t16.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef exp_getInt <T extends int> = T Function();
typedef exp_getObject <T extends Object> = T Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t17.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t17.dart
index fd72903..39cd570 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t17.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t17.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
typedef expected = Never Function();
diff --git a/LanguageFeatures/nnbd/exports_A01_var_t01.dart b/LanguageFeatures/nnbd/exports_A01_var_t01.dart
index 3cad4f1..e435a00 100644
--- a/LanguageFeatures/nnbd/exports_A01_var_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A01_var_t01.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isNull(nullable_i1);
diff --git a/LanguageFeatures/nnbd/exports_A01_var_t02.dart b/LanguageFeatures/nnbd/exports_A01_var_t02.dart
index a4d1d52..e3fa8f3 100644
--- a/LanguageFeatures/nnbd/exports_A01_var_t02.dart
+++ b/LanguageFeatures/nnbd/exports_A01_var_t02.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
Expect.isNull(nullable_i2);
diff --git a/LanguageFeatures/nnbd/exports_A01_var_t03.dart b/LanguageFeatures/nnbd/exports_A01_var_t03.dart
index a01bb42..2bf58dc 100644
--- a/LanguageFeatures/nnbd/exports_A01_var_t03.dart
+++ b/LanguageFeatures/nnbd/exports_A01_var_t03.dart
@@ -16,7 +16,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
nullable_i3 = null;
diff --git a/LanguageFeatures/nnbd/exports_A01_var_t04.dart b/LanguageFeatures/nnbd/exports_A01_var_t04.dart
index c64e061..e35f3f9 100644
--- a/LanguageFeatures/nnbd/exports_A01_var_t04.dart
+++ b/LanguageFeatures/nnbd/exports_A01_var_t04.dart
@@ -15,7 +15,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
i = null;
diff --git a/LanguageFeatures/nnbd/exports_A01_var_t05.dart b/LanguageFeatures/nnbd/exports_A01_var_t05.dart
index c0ab4f2..117ebe5 100644
--- a/LanguageFeatures/nnbd/exports_A01_var_t05.dart
+++ b/LanguageFeatures/nnbd/exports_A01_var_t05.dart
@@ -15,7 +15,7 @@
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "exports_legacy_A01_lib.dart";
+import "exports_A01_legacy_lib.dart";
main() {
late Never n;
diff --git a/LanguageFeatures/nnbd/exports_legacy_lib.dart b/LanguageFeatures/nnbd/exports_A02_legacy_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/exports_legacy_lib.dart
rename to LanguageFeatures/nnbd/exports_A02_legacy_lib.dart
diff --git a/LanguageFeatures/nnbd/exports_A02_t01.dart b/LanguageFeatures/nnbd/exports_A02_t01.dart
index 73a0dbb..5739f7e 100644
--- a/LanguageFeatures/nnbd/exports_A02_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A02_t01.dart
@@ -13,7 +13,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-export "exports_legacy_lib.dart";
+export "exports_A02_legacy_lib.dart";
// ^^^^^^^^^^^^^^^^^^^^^^^
// [analyzer] unspecified
// [cfe] unspecified
diff --git a/LanguageFeatures/nnbd/generics_A01_t03.dart b/LanguageFeatures/nnbd/generics_A01_t03.dart
index 1d779c5..f6cc73a 100644
--- a/LanguageFeatures/nnbd/generics_A01_t03.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t03.dart
@@ -16,10 +16,10 @@
import "../../Utils/expect.dart";
class A<T> {}
-typedef AAlias<T> = A<T>
+typedef AAlias<T> = A<T>;
class B<T1, T2, T3> {}
-typedef BAlias<T1, T2, T3> = B<T1, T2, T3>
+typedef BAlias<T1, T2, T3> = B<T1, T2, T3>;
main() {
Expect.equals(
diff --git a/LanguageFeatures/nnbd/generics_A01_t04.dart b/LanguageFeatures/nnbd/generics_A01_t04.dart
index 01f39e4..21358e8 100644
--- a/LanguageFeatures/nnbd/generics_A01_t04.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t04.dart
@@ -16,10 +16,10 @@
import "../../Utils/expect.dart";
class A<T> {}
-typedef AAlias<T> = A<T>
+typedef AAlias<T> = A<T>;
class B<T1, T2, T3> {}
-typedef BAlias<T1, T2, T3> = B<T1, T2, T3>
+typedef BAlias<T1, T2, T3> = B<T1, T2, T3>;
main() {
AAlias? source;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart
index fc962b6..2df8e5a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart
index a1fc3ee..40b42f0 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart
index 2eacebb..4a7d53d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart
index aa05b07..767dcc4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
index b7ed7d7..014f4c5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
void test_never(Never i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart
index 0b957bb..a4c5ce1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
void test_never(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart
index b6ffe71..02a1f09 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart
index 5233f4c..c9a86ff 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart
index 00f8d5b..4efee3a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart
index b8a6ebe..8f6a6bf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart
index 9030771..e7ebe4c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_ARGS {
void test_never(Never i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart
index d4403dd..15c63d0 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
void test_never(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart
index ca51406..a182f1c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart
index e943ad6..2095fda 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart
index 3e74de0..09a70be 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart
index a43aca0..433d710 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_ARGS {
void test_int(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart
index fe9e6c5..562a1ae 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_ARGS {
void test_never(Never i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart
index d9e1a45..e3b05f7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_ARGS {
void test_never(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart
index 372fdd9..d78747f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends int> extends OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Object> extends OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
index ed88028..c85240e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> extends OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> extends OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart
index 8a323c7..3908fcf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends FutureOr<int>> extends OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart
index c4af116..d3ec909 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends Null> extends OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart
index dd9d77f..d8919fa 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> extends OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends dynamic> extends OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart
index c1e24a4..4ac5826 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> extends OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> extends OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart
index 7941d68..6069909 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends FutureOr> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends FutureOr<FutureOr>> extends OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart
index e12bd49..47023c4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends Null> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> extends OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
index e31a4ac..f4f7dc1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A<T extends Null> extends OPTED_NEVER<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart
index 50aeac1..7712679 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> extends OPTED_NEVER<T> {}
// ^
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart
index 03c446d..19376ee 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends int> implements OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Object> implements OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
index f9a75b8..e6c0d46 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> implements OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> implements OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart
index 6a02614..537beec 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends FutureOr<int>> implements OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart
index f765441..24b72b0 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends Null> implements OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart
index d0b865d..b936a6a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> implements OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends dynamic> implements OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart
index 25939df..1aba18c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> implements OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> implements OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart
index 09c55c8..f2b37c8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends FutureOr> implements OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends FutureOr<FutureOr>> implements OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart
index 7bc8c55..7e01593 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends Null> implements OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> implements OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
index 8a036f3..45c1071 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A<T extends Null> implements OPTED_NEVER<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t20.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t20.dart
index 431fb24..77fdea2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t20.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> implements OPTED_NEVER<T> {}
// ^
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart
index f992e28..483a3cf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends int> with OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Object> with OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
index 87da79a..7da6dd3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> with OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> with OPTED_NONNULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart
index 8fe2820..e21f165 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends FutureOr<int>> with OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart
index db5fbb2..f038295 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends Null> with OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart
index 0e123cb..edc0961 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> with OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends dynamic> with OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart
index 60b8039..006d91a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> with OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> with OPTED_DYNAMIC<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart
index 7374d3c..c031caa 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends FutureOr> with OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends FutureOr<FutureOr>> with OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart
index c399d34..eb19fa5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart
@@ -22,7 +22,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_futureor_lib.dart";
+import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends Null> with OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
class A2<T extends Null> with OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
index 69c105d..e147251 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A<T extends Null> with OPTED_NEVER<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t30.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t30.dart
index 4162490..f99465f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t30.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t30.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1<T> with OPTED_NEVER<T> {}
// ^
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart
index cba45ea..294a492 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart
index 818b92d..5626637 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart
index d39c960..cd899b3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart
index e6a689c..5eb5d06 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart
index 5bbed7f..41dbee1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart
index 9bf8435..1f9d5af 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart
index ace2040..316757c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart
index 4ae200d..3d4b594 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart
index 48a67ce..07b3494 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart
index 77c9f36..5a7abe8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart
index b5790ea..495073b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart
index 67a41be..4705b9c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart
index 0f5edd0..41cfe57 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart
index 51e4667..134c7ed 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart
index e153fc8..6786df2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart
index 37f54a3..62e3f61 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart
index 042f769..cbd19f6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_FIELD {
int i = null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart
index a57f8ab..8dd0bd7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
index 5c47156..f8cca08 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_FIELD {
Null n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart
index 029b48e..29c4ff4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 extends OPTED_NEVER_FIELD {
int n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
index 37e6dc2..3780eb9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_FIELD {
Null n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart
index cb424bf..dabf049 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 implements OPTED_NEVER_FIELD {
int n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
index fbb055a..a843650 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_FIELD {
Null n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart
index f53e2d2..43bd9b9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 with OPTED_NEVER_FIELD {
int n;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart
index 57bfeec..a6c397c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart
index 0d92d22..2a16ae2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart
index 8e9b80e..5582a48 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart
index 8d42b26..6d0439b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
index 235ea31..dd5fe97 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_GETTER {
int get getNever => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart
index 84e1346..256f73b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart
index f1f98ac..626f0ef 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart
index 742c3c1..60aaa6c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart
index 2c08e72..350af71 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart
index f475aa0..fa9aa60 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
index 356ce41..fdfec53 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_GETTER {
int get getNever => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart
index 24f1b07..9844a38 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart
index a2f67e6..0d211c9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart
index bc9e0c2..b905b65 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart
index 4d36e8e..b1cd415 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart
index 64b8b98..8f3dec6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_GETTER {
int get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
index 2ebcdac..bc7138e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_GETTER {
int get getNever => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart
index a676ac1..354c4b7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart
index 39365e8..7ba91b6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = -1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart
index 2f19804..cc90f35 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart
index bc3e825..d3bbdd6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart
index 156b2a0..b2f41f4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = null}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart
index 5c1eee9..ac85b2c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart
index 9e76324..f16a002 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart
index 32a5545..e1101fb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart
index 2cc46da..a360ea9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = -1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart
index 3df1490..ad08b41 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart
index 4fb1cae..30ffe43 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart
index 6a67a08..3ac6f89 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = null}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart
index 575f385..bd69aa7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart
index 97066de..5e439e7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart
index 8fe8383..624e467 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart
index 60a7087..1e9f539 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = -1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart
index 1cc0877..7e8102b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart
index 6a4b4e3..f19ab76 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = 1}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart
index aa3f2c3..b7d4f05 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i = null}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart
index e56deb6..f7c7bd6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart
index 3663bef..f6cc2c1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart
index 73f12b3..ba9ee98 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
void test_required_nonnullable({int i}) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart
index 165b383..4b67efe 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart
index 6497675..373dea3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart
index 15c5e1f..036065c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart
index 3b9cc83..c03ddd6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
index cc6b298..3c7eac4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_RETURN {
Null getNever() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart
index b424679..8fb0599 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 extends OPTED_NEVER_RETURN {
int getNever() { return 1; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart
index 87f101f..fcd4842 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart
index 0e3dfa7..b54a047 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart
index f6edbfa..b1abe07 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart
index faf6d0b..6df1fa2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
index 034569c..e985678 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_RETURN {
Null getNever() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart
index 7ece3dc..0a2e6c4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 implements OPTED_NEVER_RETURN {
int getNever() { return 1; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart
index b2a6365..d38b675 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart
index 521f73d..4eb48ec 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart
index e5caec1..a398066 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart
index 846970d..925ab54 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_RETURN {
int getInt() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
index 0601735..3ba41aa 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_RETURN {
Null getNever() { return null; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart
index 186d86c..87f11f8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A1 with OPTED_NEVER_RETURN {
int getNever() { return 1; }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart
index 8532db6..d16705b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart
index a9e91e7..0ea8496 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart
index 3d0eaff..af2c2f2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart
index fff5c5a..3c5adca 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart
@@ -20,7 +20,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart
index 4f7a93b..a9b09e8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_SETTER {
void set setNever(Null i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart
index 8aa9334..8c9c063 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart
index 30f30d3..49dbf74 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart
index 12386aa..0b6573b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart
index f2fbaa7..976c52c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart
index 450f579..bb78303 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart
index 88686ef..f1f9094 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_SETTER {
void set setNever(Null i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart
index 5d5e03f..39d0d2e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart
index ead08c4..59d9fa1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart
index 38d161c..d09f536 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart
index e2a27b3..3c32400 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart
index ee6dee3..6bd8e3f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_SETTER {
void set setInt(int i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart
index fca8876..ca0001b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_SETTER {
void set setNever(Null i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart
index 1fe07cb..58992a4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart
@@ -21,7 +21,7 @@
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_opted_in_lib.dart";
+import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_opted_in_futureor_lib.dart b/LanguageFeatures/nnbd/override_checking_A01_opted_in_futureor_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_opted_in_futureor_lib.dart
rename to LanguageFeatures/nnbd/override_checking_A01_opted_in_futureor_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_opted_in_lib.dart b/LanguageFeatures/nnbd/override_checking_A01_opted_in_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_opted_in_lib.dart
rename to LanguageFeatures/nnbd/override_checking_A01_opted_in_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart
index bc078bf..bca0d83 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart
index 68dee5f..506ef2c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_ARGS {
void test_int(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart
index d5a47fe..c5a1373 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A extends LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart
index 290493c..a000d6e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart
index 030fb1a..ea7fff6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart
index 3a5ca45..d6e3756 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart
index ad283ef..a8c0bad 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_ARGS {
void test_int(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart
index 474113d..bb767e0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A implements LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart
index a7b0937..09aa6d2 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart
index d30e157..8c78091 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart
index d5c5d69..f9903dd 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart
index 245d902..5282f43 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_ARGS {
void test_int(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart
index baa0860..b6bc8df 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A with LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart
index fd15897..b75ddf2 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart
index 41348ac..587b027 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_ARGS {
void test_futureOr(FutureOr i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart
index e28b1c1..81fc16e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart
index 9d1dd36..1318f94 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_int(int? i);
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart
index 447a001..91ba062 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_int(int i);
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart
index 7c835de..220de68 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_futureOr(FutureOr i);
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart
index 69eb226..d8b6360 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_futureOr(FutureOr i);
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart
index 0be9228..290730a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_ARGS {
void test_int(Never i) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart
index b4225a6..73ee6ea 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_ARGS {
void test_int(Never i) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart
index c7ae6e6..fb0f504 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_ARGS {
void test_int(Never i) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart
index bff505d..8b45de4 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart
@@ -18,7 +18,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class B {
void test_int (Never i) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart
index b5fab07..887efab 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T> extends LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart
index da181cb..9cc5b82 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart
@@ -21,8 +21,8 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> extends LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart
index 41ae796..6ca46dd 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OptedInt<T extends int> extends LEGACY_CLASS_INT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart
index 6e0feb1..aa1880b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> extends LEGACY_CLASS_FUTUREORINT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart
index 2039620..c71e5d3 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T extends Null> extends LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart
index c566126..7cfe0e1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends Null> extends LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart
index 13c0914..49d8205 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T> implements LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart
index 5f6ee33..8e0b289 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> implements LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart
index 4d83030..238bbb8 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OptedInt<T extends int> implements LEGACY_CLASS_INT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart
index 265e420..b32df26 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> implements LEGACY_CLASS_FUTUREORINT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart
index 54584c9..e280cd5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T extends Null> implements LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart
index e2bc0e6..846cd14 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends Null> implements LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart
index d440288..a538e8c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T> with LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart
index d3cedc0..d47c330 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> with LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart
index 7448d1d..b08c4c6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OptedInt<T extends int> with LEGACY_CLASS_INT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart
index 61e1c5c..23932db 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart
@@ -22,7 +22,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> with LEGACY_CLASS_FUTUREORINT<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart
index d99c7ff..eba3369 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class Opted<T extends Null> with LEGACY_CLASS<T> {
dynamic getParamType() => typeOf<T>();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart
index dbf453b..9a17709 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OptedFutureOr<T extends Null> extends LEGACY_CLASS_FUTUREOR<T> {
dynamic getParamType() => T;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart
index 6fb7916..3c368a9 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OPTED_CLASS<T> {}
class OPTED_CLASS_INT<T extends int?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart
index 054cbd5..e1cba2b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OPTED_CLASS_FUTUREOR<T extends FutureOr> {}
class OPTED_CLASS_FUTUREORINT<T extends FutureOr<int>?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart
index 8c63c26..3bfe091 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OPTED_CLASS_INT<T extends int> {}
class OPTED_CLASS_OBJECT<T extends Object> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart
index 297799c..fb94b4c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart
@@ -22,7 +22,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OPTED_CLASS_FUTUREORINT<T extends FutureOr<int>> {}
class OPTED_CLASS_FUTUREORFUNCTION<T extends FutureOr<Function>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart
index 6c29082..adff06e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class OPTED_CLASS<T> {}
class OPTED_CLASS_INT<T extends int?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart
index c4586c8..8b2b1ee 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_futureor_lib.dart";
+import "override_checking_A02_legacy_futureor_lib.dart";
class OPTED_CLASS_FUTUREOR<T extends FutureOr?> {}
class OPTED_CLASS_FUTUREORINT<T extends FutureOr<int>?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart
index f30a70e..59b236b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_FIELD {
int? i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart
index cfebb63..468da4f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart
index a1ea927..2cc765f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_FIELD {
int? i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart
index 0a62829..befebc0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart
index 8f22cfc..d39aad1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_FIELD {
int? i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart
index acb89d4..2f7ebf7 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart
index 9e04816..a47b6ba 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class AA {
int? i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart
index 331b8ad..9bbd311 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart
index f449a66..6da44ab 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 extends LEGACY_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart
index df6cf85..a4f8499 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 implements LEGACY_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart
index 2a31e9b..a6ab063 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 with LEGACY_FIELD {
int i;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart
index 75a936c..59415ca 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart
index 222dfae..4807c8d 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart
index b69b108..5b05d2f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_GETTER {
int? get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart
index d302d47..e73afd4 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart
index 230b081..6de27f9 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart
index 47d2eb2..630364ce 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_GETTER {
int? get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart
index 43eed51..b977ed8 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart
index 1556149..b46cc96 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart
index dab3525..0d06595 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_GETTER {
int? get getInt => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart
index fc1cba1..d71a31a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart
index 06d7979..eaaaac5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart
index 4be220a..c6fb273 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class AA {
int? get getInt;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart
index ad8c0ca..88f7f62 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart
index 31486d9..8e50015 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_REQUIRED_ARGS {
void test_default({required int? i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart
index a54fcc9..e6a36c6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_REQUIRED_ARGS {
void test_default({int? i = 1}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart
index 00cccfa..90968aa 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_REQUIRED_ARGS {
void test_default({required int? i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart
index 7efe174..8684175 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 implements LEGACY_REQUIRED_ARGS {
void test_default({int? i = 1}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart
index 97fcf37..b401e01 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_REQUIRED_ARGS {
void test_default({required int? i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart
index 794e48f..7ae5de7 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 with LEGACY_REQUIRED_ARGS {
void test_default({int? i = 1}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart
index e3188a3..f53b49a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_default({required int? i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart
index 3f6147e..262a54f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_default({required int? i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart
index 3942c67..ea1ac2c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A extends LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t10.dart
index 97adf2e..57f09e3 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t10.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 extends LEGACY_REQUIRED_ARGS {
void test_default({int i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart
index c5a8e43..a2793f1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A implements LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t12.dart
index c838cde..6704a0f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t12.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 implements LEGACY_REQUIRED_ARGS {
void test_default({int i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart
index 6d7833d..0b35b9f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart
@@ -18,7 +18,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A implements LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t14.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t14.dart
index c0dda9f..16d4aad 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t14.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A1 with LEGACY_REQUIRED_ARGS {
void test_default({int i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart
index 47eec9a..4a03db2 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart
@@ -18,7 +18,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart
index 2c518c3..77e25e3 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart
@@ -18,7 +18,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class B {
void test_default({required int i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart
index 3ee732d..7c640c0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart
index 62a988b..9a81aec 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A1 implements LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart
index 52d6f5b..f262c65 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A1 with LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart
index c854c7e..70447ac 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart
index 4df7097..afa9a03 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart
index d397b61..8d1b273 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_RETURN {
int? getInt() => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart
index 3854856..cbf7089 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart
index 53e1bce..a59f454 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart
index 7c5922f..d8b61a5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_RETURN {
int? getInt() => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart
index 78b3a82..d995100 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart
index 56189c7..37b821a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart
index ca1a0be..64fb2d1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_RETURN {
int? getInt() => null;
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart
index 49008e9..fb6865e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart
index c81dd2a..f4ab532 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart
index 5f6d3d7..3cc903c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
abstract class AA {
int? getInt();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart
index 805387b..5d8dcf1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart
index 7880c60..cbe5d76 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A extends LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart
index 2f3a329..f446a89 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A with LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart
index 96d854a..c578d0a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
class A with LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart
index cd026d4..69010d6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
abstract class AA {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart
index 4fc6bed..91f211a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart
index da0f5fa..3371513 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A extends LEGACY_SETTER {
void set setInt(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart
index b5d93b3..d908e58 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart
index 91f03f1..127eb8b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart
index 94cfc69..005d3e0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A implements LEGACY_SETTER {
void set setInt(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart
index fcdb140..63f8cf1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart
index f440845..188b358 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart
index 2bcecea..d70b685 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
class A with LEGACY_SETTER {
void set setInt(int? i) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart
index 3798d99..ec718f3 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart
index 3810c5f..6a50fc5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart
index a55525e..8070fce 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "../../Utils/expect.dart";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart
index 485c61f..3217176 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "override_checking_legacy_lib.dart";
+import "override_checking_A02_legacy_lib.dart";
import "../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_legacy_futureor_lib.dart b/LanguageFeatures/nnbd/override_checking_A02_legacy_futureor_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_legacy_futureor_lib.dart
rename to LanguageFeatures/nnbd/override_checking_A02_legacy_futureor_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_legacy_lib.dart b/LanguageFeatures/nnbd/override_checking_A02_legacy_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_legacy_lib.dart
rename to LanguageFeatures/nnbd/override_checking_A02_legacy_lib.dart
