Fixed Issue #465: re-factoring: overriding tests mover to separate directory.
diff --git a/LanguageFeatures/nnbd/override_checking_A03_opted_out_lib.dart b/LanguageFeatures/nnbd/override_checking_A03_opted_out_lib.dart
deleted file mode 100644
index 038c6c0..0000000
--- a/LanguageFeatures/nnbd/override_checking_A03_opted_out_lib.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
- * for details. All rights reserved. Use of this source code is governed by a
- * BSD-style license that can be found in the LICENSE file.
- */
-/**
- * @author iarkh@unipro.ru
- */
-// @dart=2.6
-// SharedOptions=--enable-experiment=non-nullable
-// Requirements=nnbd-strong
-
-import "override_checking_A03_opted_in_lib.dart";
-
-class LEGACY_ARGS_1 extends OPTED_NULLABLE_ARGS implements OPTED_NONNULLABLE_ARGS {}
-class LEGACY_ARGS_2 extends OPTED_NONNULLABLE_ARGS implements OPTED_NULLABLE_ARGS {}
-
-class LEGACY_FIELDS_1 extends OPTED_NULLABLE_FIELD implements OPTED_NONNULLABLE_FIELD {}
-class LEGACY_FIELDS_2 extends OPTED_NONNULLABLE_FIELD implements OPTED_NULLABLE_FIELD {}
-
-class LEGACY_GETTER_1 extends OPTED_NULLABLE_GETTER implements OPTED_NONNULLABLE_GETTER {}
-class LEGACY_GETTER_2 extends OPTED_NONNULLABLE_GETTER implements OPTED_NULLABLE_GETTER {}
-
-class LEGACY_SETTER_1 extends OPTED_NULLABLE_SETTER implements OPTED_NONNULLABLE_SETTER {}
-class LEGACY_SETTER_2 extends OPTED_NONNULLABLE_SETTER implements OPTED_NULLABLE_SETTER {}
-
-class LEGACY_RETURN_1 extends OPTED_NULLABLE_RETURN implements OPTED_NONNULLABLE_RETURN {}
-class LEGACY_RETURN_2 extends OPTED_NONNULLABLE_RETURN implements OPTED_NULLABLE_RETURN {}
-
-class LEGACY_INT_1<T extends int> extends OPTED_NONNULLABLE_INT<T> implements OPTED_NULLABLE_INT<T> {}
-class LEGACY_INT_2<T extends int> extends OPTED_NULLABLE_INT<T> implements OPTED_NONNULLABLE_INT<T> {}
-
-class LEGACY_OBJECT_1<T extends Object> extends OPTED_NONNULLABLE_OBJECT<T> implements OPTED_NULLABLE_OBJECT<T> {}
-class LEGACY_OBJECT_2<T extends Object> extends OPTED_NULLABLE_OBJECT<T> implements OPTED_NONNULLABLE_OBJECT<T> {}
-
-class LEGACY_FUNCTION_1<T extends Function> extends OPTED_NONNULLABLE_FUNCTION<T> implements OPTED_NULLABLE_FUNCTION<T> {}
-class LEGACY_FUNCTION_2<T extends Function> extends OPTED_NULLABLE_FUNCTION<T> implements OPTED_NONNULLABLE_FUNCTION<T> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t01.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t01.dart
index 2df8e5a..8eac0a5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t01.dart
@@ -20,22 +20,23 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
void test_futureOr(FutureOr<int> i) { Expect.equals(1, i); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
void testme() {}
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t02.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t02.dart
index 40b42f0..be81a05 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t02.dart
@@ -20,20 +20,21 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
- void test_function(Function f) { Expect.isNull(f); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
+ void test_function(Function f) { Expect.isNull(f); }
void test_futureOr(FutureOr<int> f) { Expect.isNull(f); }
}
main() {
A a = A();
- a.test_int(null);
- a.test_object(null);
+
+ a.test_int (null);
+ a.test_object (null);
a.test_function(null);
a.test_futureOr(null);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t03.dart
similarity index 78%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t03.dart
index 4a7d53d..7a48596 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t03.dart
@@ -20,24 +20,24 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_dynamic(dynamic d) { Expect.equals(1, d); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
+ void test_dynamic (dynamic d) { Expect.equals(1, d); }
void test_futureOr(FutureOr f) { Expect.equals(1, f); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
void testme() {}
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_dynamic(1);
+ a.test_int (1 );
+ a.test_object (1 );
+ a.test_dynamic (1 );
a.test_function(testme);
- a.test_futureOr(1);
+ a.test_futureOr(1 );
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t04.dart
similarity index 76%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t04.dart
index 767dcc4..7e5ea53 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t04.dart
@@ -20,24 +20,25 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_ARGS {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
void test_function(Function f) { Expect.isNull(f); }
- void test_dynamic(dynamic d) { Expect.isNull(d); }
+ void test_dynamic (dynamic d) { Expect.isNull(d); }
void test_futureOr(FutureOr f) { Expect.isNull(f); }
- void test_null(Null n) { Expect.isNull(n); }
+ void test_null (Null n) { Expect.isNull(n); }
}
main() {
A a = A();
- a.test_int(null);
- a.test_object(null);
- a.test_dynamic(null);
+
+ a.test_int (null);
+ a.test_object (null);
+ a.test_dynamic (null);
a.test_function(null);
a.test_futureOr(null);
- a.test_null(null);
+ a.test_null (null);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t05.dart
index 6bc1a71..d1cbdfb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t05.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t06.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t06.dart
index a4c5ce1..20812de 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t06.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t07.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t07.dart
index 02a1f09..7df0911 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t07.dart
@@ -20,22 +20,23 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
void test_futureOr(FutureOr<int> i) { Expect.equals(1, i); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
void testme() {}
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t08.dart
similarity index 84%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t08.dart
index c9a86ff..4423994 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t08.dart
@@ -20,13 +20,13 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
- void test_function(Function f) { Expect.isNull(f); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
+ void test_function(Function f) { Expect.isNull(f); }
void test_futureOr(FutureOr<int> f) { Expect.isNull(f); }
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t09.dart
similarity index 81%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t09.dart
index 4efee3a..597a34d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t09.dart
@@ -20,15 +20,15 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_dynamic(dynamic d) { Expect.equals(1, d); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
+ void test_dynamic (dynamic d) { Expect.equals(1, d); }
void test_futureOr(FutureOr f) { Expect.equals(1, f); }
+ void test_function(Function f) { Expect.equals(testme, f); }
void test_null(Null n) {}
}
@@ -37,9 +37,10 @@
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_dynamic(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
+ a.test_dynamic (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t10.dart
similarity index 76%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t10.dart
index 8f6a6bf..5b6a735 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t10.dart
@@ -20,24 +20,25 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_ARGS {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
void test_function(Function f) { Expect.isNull(f); }
- void test_dynamic(dynamic d) { Expect.isNull(d); }
+ void test_dynamic (dynamic d) { Expect.isNull(d); }
void test_futureOr(FutureOr f) { Expect.isNull(f); }
- void test_null(Null n) { Expect.isNull(n); }
+ void test_null (Null n) { Expect.isNull(n); }
}
main() {
A a = A();
- a.test_int(null);
- a.test_object(null);
- a.test_dynamic(null);
+
+ a.test_int (null);
+ a.test_object (null);
+ a.test_dynamic (null);
a.test_function(null);
a.test_futureOr(null);
- a.test_null(null);
+ a.test_null (null);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t11.dart
index f7707a0..32d8c05 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t11.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t12.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t12.dart
index 15c63d0..6def98f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t12.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t13.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t13.dart
index a182f1c..7b1382d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t13.dart
@@ -20,22 +20,23 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
void test_futureOr(FutureOr<int> i) { Expect.equals(1, i); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
void testme() {}
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t14.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t14.dart
index 2095fda..72740c1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t14.dart
@@ -20,20 +20,21 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_ARGS {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
- void test_function(Function f) { Expect.isNull(f); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
+ void test_function(Function f) { Expect.isNull(f); }
void test_futureOr(FutureOr<int> f) { Expect.isNull(f); }
}
main() {
A a = A();
- a.test_int(null);
- a.test_object(null);
+
+ a.test_int (null);
+ a.test_object (null);
a.test_function(null);
a.test_futureOr(null);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t15.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t15.dart
index 09a70be..c036ba7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t15.dart
@@ -20,24 +20,25 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_ARGS {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_dynamic(dynamic d) { Expect.equals(1, d); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
+ void test_dynamic (dynamic d) { Expect.equals(1, d); }
void test_futureOr(FutureOr f) { Expect.equals(1, f); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
void testme() {}
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_dynamic(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
+ a.test_dynamic (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t16.dart
index 433d710..6b2f026 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t17.dart
index 66e8cf1..7dca067 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t17.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t18.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t18.dart
index e3b05f7..f56f558 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t18.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t19.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t19.dart
index 91c2a49..d31c40a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t20.dart
similarity index 84%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t20.dart
index 5fb7c0a..37f56d5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t20.dart
@@ -20,13 +20,13 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
- void test_function(Function f) { Expect.isNull(f); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
+ void test_function(Function f) { Expect.isNull(f); }
void test_futureOr(FutureOr<int> f) { Expect.isNull(f); }
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t21.dart
similarity index 81%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t21.dart
index ac0fb44..8d3458a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t21.dart
@@ -20,15 +20,15 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B {
- void test_int(int i) { Expect.equals(1, i); }
- void test_object(Object o) { Expect.equals(1, o); }
- void test_dynamic(dynamic d) { Expect.equals(1, d); }
- void test_function(Function f) { Expect.equals(testme, f); }
+ void test_int (int i) { Expect.equals(1, i); }
+ void test_object (Object o) { Expect.equals(1, o); }
+ void test_dynamic (dynamic d) { Expect.equals(1, d); }
void test_futureOr(FutureOr f) { Expect.equals(1, f); }
+ void test_function(Function f) { Expect.equals(testme, f); }
}
class A extends B implements OPTED_NULLABLE_ARGS {
@@ -39,9 +39,10 @@
main() {
A a = A();
- a.test_int(1);
- a.test_object(1);
- a.test_dynamic(1);
- a.test_function(testme);
+
+ a.test_int (1);
+ a.test_object (1);
+ a.test_dynamic (1);
a.test_futureOr(1);
+ a.test_function(testme);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t22.dart
similarity index 77%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t22.dart
index 54b49c8..9f9d7dd 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t22.dart
@@ -20,26 +20,26 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B {
- void test_int(int i) { Expect.isNull(i); }
- void test_object(Object o) { Expect.isNull(o); }
+ void test_int (int i) { Expect.isNull(i); }
+ void test_object (Object o) { Expect.isNull(o); }
void test_function(Function f) { Expect.isNull(f); }
- void test_dynamic(dynamic d) { Expect.isNull(d); }
+ void test_dynamic (dynamic d) { Expect.isNull(d); }
void test_futureOr(FutureOr f) { Expect.isNull(f); }
- void test_null(Null n) { Expect.isNull(n); }
+ void test_null (Null n) { Expect.isNull(n); }
}
class A extends B implements OPTED_NULLABLE_ARGS {}
main() {
A a = A();
- a.test_int(null);
- a.test_object(null);
- a.test_dynamic(null);
+ a.test_int (null);
+ a.test_object (null);
+ a.test_dynamic (null);
a.test_function(null);
a.test_futureOr(null);
- a.test_null(null);
+ a.test_null (null);
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t23.dart
index cd7dcda..10c13c9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t23.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t24.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_ARGS_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t24.dart
index df8a37f..402664c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_ARGS_t24.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NEVER_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t01.dart
index d78747f..dcae04e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t01.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends int> extends OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t02.dart
index 454628d..1002ab0 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t02.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> extends OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t03.dart
similarity index 91%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t03.dart
index 3908fcf..c8e642d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t03.dart
@@ -21,12 +21,12 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
main() {
- Expect.equals( typeOf<FutureOr<int>>(), A().getParamType());
+ Expect.equals( typeOf<FutureOr<int>>(), A ().getParamType());
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t04.dart
similarity index 92%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t04.dart
index d3ec909..0ca2e8b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t04.dart
@@ -21,12 +21,12 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends Null> extends OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals( Null, A().getParamType());
+ Expect.equals( Null, A() .getParamType());
Expect.equals( Null, A<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t05.dart
similarity index 84%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t05.dart
index d8919fa..a468285 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t05.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T> extends OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
@@ -28,18 +28,18 @@
class A5<T extends Function> extends OPTED_NULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(dynamic, A1().getParamType());
+ Expect.equals(dynamic, A1() .getParamType());
Expect.equals(dynamic, A1<dynamic>().getParamType());
- Expect.equals(dynamic, A2().getParamType());
+ Expect.equals(dynamic, A2() .getParamType());
Expect.equals(dynamic, A2<dynamic>().getParamType());
- Expect.equals(int, A3().getParamType());
+ Expect.equals(int, A3() .getParamType());
Expect.equals(int, A3<int>().getParamType());
- Expect.equals(Object, A4().getParamType());
+ Expect.equals(Object, A4() .getParamType());
Expect.equals(Object, A4<Object>().getParamType());
- Expect.equals(Function, A5().getParamType());
+ Expect.equals(Function, A5() .getParamType());
Expect.equals(Function, A5<Function>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t06.dart
similarity index 84%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t06.dart
index 4ac5826..6517375 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t06.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> extends OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
@@ -29,21 +29,21 @@
class A6<T extends Null> extends OPTED_NULL<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(Null, A1().getParamType());
+ Expect.equals(Null, A1() .getParamType());
Expect.equals(Null, A1<Null>().getParamType());
- Expect.equals(Null, A2().getParamType());
+ Expect.equals(Null, A2() .getParamType());
Expect.equals(Null, A2<Null>().getParamType());
- Expect.equals(Null, A3().getParamType());
+ Expect.equals(Null, A3() .getParamType());
Expect.equals(Null, A3<Null>().getParamType());
- Expect.equals(Null, A4().getParamType());
+ Expect.equals(Null, A4() .getParamType());
Expect.equals(Null, A4<Null>().getParamType());
- Expect.equals(Null, A5().getParamType());
+ Expect.equals(Null, A5() .getParamType());
Expect.equals(Null, A5<Null>().getParamType());
- Expect.equals(Null, A6().getParamType());
+ Expect.equals(Null, A6() .getParamType());
Expect.equals(Null, A6<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t07.dart
similarity index 80%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t07.dart
index 6069909..23562d7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t07.dart
@@ -21,16 +21,16 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
-class A1<T extends FutureOr> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
+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>(); }
main() {
- Expect.equals( typeOf<FutureOr>(), A1().getParamType());
+ Expect.equals( typeOf<FutureOr>(), A1() .getParamType());
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
- Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
+ Expect.equals( typeOf<FutureOr<FutureOr>>(), A2() .getParamType());
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t08.dart
similarity index 85%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t08.dart
index 47023c4..fedadf8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t08.dart
@@ -21,16 +21,16 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
-class A1<T extends Null> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
+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>(); }
main() {
- Expect.equals( Null, A1().getParamType());
+ Expect.equals( Null, A1() .getParamType());
Expect.equals( Null, A1<Null>().getParamType());
- Expect.equals( Null, A2().getParamType());
+ Expect.equals( Null, A2() .getParamType());
Expect.equals( Null, A2<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t09.dart
similarity index 92%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t09.dart
index e73d325..6e1622b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t09.dart
@@ -19,12 +19,12 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A<T extends Null> extends OPTED_NEVER<T> { dynamic getParamType() => T; }
main() {
- Expect.equals(Null, A().getParamType());
+ Expect.equals(Null, A() .getParamType());
Expect.equals(Null, A<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t10.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t10.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t11.dart
similarity index 78%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t11.dart
index 19376ee..22a10e2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t11.dart
@@ -19,20 +19,20 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
+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>(); }
class A3<T extends Function> implements OPTED_NONNULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(int, A1().getParamType());
+ Expect.equals(int, A1() .getParamType());
Expect.equals(int, A1<int>().getParamType());
- Expect.equals(Object, A2().getParamType());
+ Expect.equals(Object, A2() .getParamType());
Expect.equals(Object, A2<Object>().getParamType());
- Expect.equals(Function, A3().getParamType());
+ Expect.equals(Function, A3() .getParamType());
Expect.equals(Function, A3<Function>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t12.dart
similarity index 75%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t12.dart
index 9f8f748..2ac1bb9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t12.dart
@@ -21,20 +21,20 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
+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>(); }
class A3<T extends Null> implements OPTED_NONNULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(Null, A1().getParamType());
+ Expect.equals(Null, A1() .getParamType());
Expect.equals(Null, A1<Null>().getParamType());
- Expect.equals(Null, A2().getParamType());
+ Expect.equals(Null, A2() .getParamType());
Expect.equals(Null, A2<Null>().getParamType());
- Expect.equals(Null, A3().getParamType());
+ Expect.equals(Null, A3() .getParamType());
Expect.equals(Null, A3<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t13.dart
similarity index 91%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t13.dart
index 537beec..cfe6779 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t13.dart
@@ -21,12 +21,12 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
main() {
- Expect.equals( typeOf<FutureOr<int>>(), A().getParamType());
+ Expect.equals( typeOf<FutureOr<int>>(), A() .getParamType());
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t14.dart
similarity index 92%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t14.dart
index 24b72b0..d0993f9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t14.dart
@@ -21,12 +21,12 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class A<T extends Null> implements OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals( Null, A().getParamType());
+ Expect.equals( Null, A() .getParamType());
Expect.equals( Null, A<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t15.dart
similarity index 63%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t15.dart
index b936a6a..4a24f73 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t15.dart
@@ -18,28 +18,28 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
-class A3<T extends int> implements OPTED_NULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
-class A4<T extends Object> implements OPTED_NULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
+class A1<T> implements OPTED_NULLABLE <T> { dynamic getParamType() => typeOf<T>(); }
+class A2<T extends dynamic> implements OPTED_DYNAMIC <T> { dynamic getParamType() => typeOf<T>(); }
+class A3<T extends int> implements OPTED_NULLABLE_INT <T> { dynamic getParamType() => typeOf<T>(); }
+class A4<T extends Object> implements OPTED_NULLABLE_OBJECT <T> { dynamic getParamType() => typeOf<T>(); }
class A5<T extends Function> implements OPTED_NULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(dynamic, A1().getParamType());
+ Expect.equals(dynamic, A1() .getParamType());
Expect.equals(dynamic, A1<dynamic>().getParamType());
- Expect.equals(dynamic, A2().getParamType());
+ Expect.equals(dynamic, A2() .getParamType());
Expect.equals(dynamic, A2<dynamic>().getParamType());
- Expect.equals(int, A3().getParamType());
+ Expect.equals(int, A3() .getParamType());
Expect.equals(int, A3<int>().getParamType());
- Expect.equals(Object, A4().getParamType());
+ Expect.equals(Object, A4() .getParamType());
Expect.equals(Object, A4<Object>().getParamType());
- Expect.equals(Function, A5().getParamType());
+ Expect.equals(Function, A5() .getParamType());
Expect.equals(Function, A5<Function>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t16.dart
similarity index 69%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t16.dart
index 1aba18c..065bc20 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t16.dart
@@ -19,32 +19,32 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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>(); }
-class A3<T extends Null> implements OPTED_NULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
-class A4<T extends Null> implements OPTED_NULLABLE_OBJECT<T> { dynamic getParamType() => typeOf<T>(); }
+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>(); }
+class A3<T extends Null> implements OPTED_NULLABLE_INT <T> { dynamic getParamType() => typeOf<T>(); }
+class A4<T extends Null> implements OPTED_NULLABLE_OBJECT <T> { dynamic getParamType() => typeOf<T>(); }
class A5<T extends Null> implements OPTED_NULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
-class A6<T extends Null> implements OPTED_NULL<T> { dynamic getParamType() => typeOf<T>(); }
+class A6<T extends Null> implements OPTED_NULL <T> { dynamic getParamType() => typeOf<T>(); }
main() {
- Expect.equals(Null, A1().getParamType());
+ Expect.equals(Null, A1 ().getParamType());
Expect.equals(Null, A1<Null>().getParamType());
- Expect.equals(Null, A2().getParamType());
+ Expect.equals(Null, A2 ().getParamType());
Expect.equals(Null, A2<Null>().getParamType());
- Expect.equals(Null, A3().getParamType());
+ Expect.equals(Null, A3 ().getParamType());
Expect.equals(Null, A3<Null>().getParamType());
- Expect.equals(Null, A4().getParamType());
+ Expect.equals(Null, A4 ().getParamType());
Expect.equals(Null, A4<Null>().getParamType());
- Expect.equals(Null, A5().getParamType());
+ Expect.equals(Null, A5 ().getParamType());
Expect.equals(Null, A5<Null>().getParamType());
- Expect.equals(Null, A6().getParamType());
+ Expect.equals(Null, A6 ().getParamType());
Expect.equals(Null, A6<Null>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t17.dart
similarity index 84%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t17.dart
index f2b37c8..2c277ef 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t17.dart
@@ -21,16 +21,16 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
-class A1<T extends FutureOr> implements OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
+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>(); }
main() {
- Expect.equals( typeOf<FutureOr>(), A1().getParamType());
+ Expect.equals( typeOf<FutureOr>(), A1 ().getParamType());
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
- Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
+ Expect.equals( typeOf<FutureOr<FutureOr>>(), A2 ().getParamType());
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t18.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t18.dart
index 7e01593..a0cfc68 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t18.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends Null> implements OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t19.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t19.dart
index e7ffd9c..d5f7e8d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t19.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_CLASSPARAM_t20.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t20.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t21.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t21.dart
index 483a3cf..6195e4a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t21.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends int> with OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t22.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t22.dart
index b20dd2c..f00cdb6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t22.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> with OPTED_NONNULLABLE_INT<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t23.dart
index e21f165..aef3f97 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t23.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_CLASSPARAM_t24.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t24.dart
index f038295..9bca04b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t24.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_CLASSPARAM_t25.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t25.dart
index edc0961..79c9462 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t25.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t25.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T> with OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t26.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t26.dart
index 006d91a..2c59475 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t26.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t26.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A1<T extends Null> with OPTED_NULLABLE<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t27.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t27.dart
index c031caa..09ea6fd 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t27.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t27.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends FutureOr> with OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t28.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t28.dart
index eb19fa5..bcd5ce9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t28.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t28.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class A1<T extends Null> with OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t29.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t29.dart
index f72ebfe..6a6a7d8 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t29.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_CLASSPARAM_t30.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t30.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t30.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t31.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t31.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t31.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t31.dart
index d716481..6098ffb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t31.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t31.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t32.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t32.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t32.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t32.dart
index 22cb20f..276bcd3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t32.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t32.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t33.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t33.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t33.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t33.dart
index ed9d619..3ee2a15 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t33.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t33.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class B<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t34.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t34.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t34.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t34.dart
index 5c2d2a2..350a77f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t34.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t34.dart
@@ -22,7 +22,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class B<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t35.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t35.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t35.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t35.dart
index c740afb..6967f8b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t35.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t35.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t36.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t36.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t36.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t36.dart
index 28711e6..dbd3f41 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t36.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t36.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t37.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t37.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t37.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t37.dart
index 6d2ab24..c43acff 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t37.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t37.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t38.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t38.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t38.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t38.dart
index e4280ff..3e3bc3a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t38.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t38.dart
@@ -21,7 +21,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_futureor_lib.dart";
class B1<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t39.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t39.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t39.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t39.dart
index beb3473..05461cf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t39.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t39.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class B<T> { dynamic getParamType() => typeOf<T>(); }
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t40.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t40.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t40.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t40.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t01.dart
index 294a492..6ba234f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t01.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_FIELD_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t02.dart
index 5626637..03f001c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t02.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t03.dart
index cd899b3..d6d1a32 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t03.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t04.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t04.dart
index 5eb5d06..50c6700 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t04.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_FIELD_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t05.dart
index 41dbee1..2a1a10f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t05.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t06.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t06.dart
index 1f9d5af..ab51788 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t06.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t07.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t07.dart
index 316757c..2caa82a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t07.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_FIELD_t08.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t08.dart
index 3d4b594..2e0a89a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t08.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t09.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t09.dart
index 07b3494..9a4bd3c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t09.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t10.dart
similarity index 89%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t10.dart
index 5a7abe8..54cd46f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t10.dart
@@ -20,18 +20,18 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
class A implements OPTED_NULLABLE_FIELD {
- int i = 1;
- Object o = 1;
- dynamic d = 1;
- Function f = testme1;
+ int i = 1;
+ Object o = 1;
+ dynamic d = 1;
+ Function f = testme1;
FutureOr fo = 1;
- Null n = null;
+ Null n = null;
void v;
}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t11.dart
similarity index 86%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t11.dart
index 495073b..5bbd61d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t11.dart
@@ -20,17 +20,17 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_FIELD {
- int i = null;
- Object o = null;
- dynamic d = null;
- Function f = null;
- Null n = null;
+ int i = null;
+ Object o = null;
+ dynamic d = null;
+ Function f = null;
+ Null n = null;
FutureOr fo = null;
- void v = null;
+ void v = null;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t12.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t12.dart
index 4705b9c..db68faf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t12.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t13.dart
index 41cfe57..1d0c990 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t13.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_FIELD_t14.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t14.dart
index 134c7ed..57fc62a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t14.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t15.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t15.dart
index 6786df2..70ef9c5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t15.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t16.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t16.dart
index 62e3f61..c5d24e4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_FIELD_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t17.dart
index cbd19f6..762e6a9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t17.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t18.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t18.dart
index 8dd0bd7..9c80445 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t19.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t19.dart
index e009ab1..4ab8796 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t19.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t20.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t20.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t21.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t21.dart
index fc4b5e3..aec7153 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t21.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t22.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t22.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t23.dart
index 8490a78..9277518 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t23.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t24.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t24.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t25.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t25.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t25.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t25.dart
index ec59a80..da1b29c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t25.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t25.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t26.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t26.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t26.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t26.dart
index 9edb2c8..0fc13c1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t26.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t26.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NONNULLABLE_FIELD {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t27.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t27.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t27.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t27.dart
index 7abd2ef..c495624 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t27.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t27.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NONNULLABLE_FIELD {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t28.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t28.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t28.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t28.dart
index 56f2e32..892685f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t28.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t28.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t29.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t29.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t29.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t29.dart
index 4851dd9..b166f18 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t29.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t29.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NULLABLE_FIELD {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t30.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t30.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t30.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t30.dart
index 540506d..7ef3b97 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t30.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t30.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NULLABLE_FIELD {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t31.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t31.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t31.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t31.dart
index 2b64bf3..d92946a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t31.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t31.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NEVER_FIELD {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t32.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t32.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_FIELD_t32.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_FIELD_t32.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t01.dart
index a6c397c..1d1aec0 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t01.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t02.dart
index 2a16ae2..5c61edb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t02.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t03.dart
index 5582a48..d2b65f6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t03.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t04.dart
index 6d0439b..e959fe1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t04.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t05.dart
similarity index 93%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t05.dart
index 19d5386..8040c73 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t05.dart
@@ -20,11 +20,11 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_GETTER {
- int get getNever => null;
+ Null get getNever => null;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t06.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t07.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t07.dart
index 626f0ef..9777825 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t07.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t08.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t08.dart
index 60aaa6c..cb54fe3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t08.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t09.dart
index 350af71..8920a42 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t09.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t10.dart
index fa9aa60..5494e4e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t10.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t11.dart
similarity index 93%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t11.dart
index 2acf68d..95a02c9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t11.dart
@@ -21,11 +21,11 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_GETTER {
- int get getNever => null;
+ Null get getNever => null;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t12.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t12.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t13.dart
index 0d211c9..2e6312c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t13.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t14.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t14.dart
index b905b65..011d06e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t14.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t15.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t15.dart
index b1cd415..0f2e046 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t15.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_GETTER_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t16.dart
index 8f3dec6..703b619 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t17.dart
similarity index 93%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t17.dart
index 1bbbbae..358c7fe 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t17.dart
@@ -21,11 +21,11 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_GETTER {
- int get getNever => null;
+ Null get getNever => null;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t18.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t18.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t19.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t19.dart
index 1b424d5..4060711 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t20.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t20.dart
index 549d008..bb27af1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t20.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NONNULLABLE_GETTER {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t21.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t21.dart
index 320660f..9c9c259 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t21.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t22.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t22.dart
index 8aea950..9f85e08 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t22.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NULLABLE_GETTER {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t23.dart
similarity index 93%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t23.dart
index 81ead1d..747674f 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t23.dart
@@ -21,13 +21,13 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NEVER_GETTER {}
class B {
- int get getNever => null;
+ Null get getNever => null;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t24.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_GETTER_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_GETTER_t24.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t01.dart
index 7ba91b6..672c282 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t01.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t02.dart
index cc90f35..e0bea6e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t02.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t03.dart
index d3bbdd6..f8ee609 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t03.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t04.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t04.dart
index b2f41f4..ae967e4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t04.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t05.dart
index ac85b2c..f150960 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t05.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t06.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t06.dart
index f16a002..799070d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t06.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t07.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t07.dart
index e1101fb..fc6a96b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t07.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t08.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t08.dart
index a360ea9..a3a79c6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t08.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t09.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t09.dart
index ad08b41..c2e4f00 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t09.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t10.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t10.dart
index 30ffe43..cf7f0df 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t10.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t11.dart
index 3ac6f89..47437a5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t11.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t12.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t12.dart
index bd69aa7..b42ec90 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t12.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t13.dart
index 5e439e7..a16a7f5 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t13.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t14.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t14.dart
index 624e467..8a9e0b2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t14.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t15.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t15.dart
index 1e9f539..bfdcadb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t15.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t16.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t16.dart
index 7e8102b..b79a667 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t16.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t17.dart
index f19ab76..6ebd674 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t17.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t18.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t18.dart
index b7d4f05..d24cef2 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t18.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t19.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t19.dart
index f7c7bd6..9a26d8e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t19.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t20.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t20.dart
index f6cc2c1..3e86c71 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t20.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t21.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t21.dart
index ba9ee98..ba76dfe 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t21.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t22.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t22.dart
index 841ad41..696ff92 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t22.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t23.dart
index 3cba0c2..a8d7ef1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t23.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t24.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t24.dart
index 40bfb50..813dcff 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t24.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t25.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t25.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t25.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t25.dart
index 7de465c..b6b26b3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t25.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t25.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t26.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t26.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t26.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t26.dart
index ac53437..bd25149 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t26.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t26.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t27.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t27.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t27.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t27.dart
index e11216d..99102eb 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t27.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t27.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t28.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t28.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t28.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t28.dart
index 375f56a..69913a3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_REQ_ARGS_t28.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_REQ_ARGS_t28.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_REQUIRED_ARGS {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t01.dart
index 6dede7c..6f18c32 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t01.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t02.dart
index b72934a..5a01021 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t02.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t03.dart
index 475898d..7c29301 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t03.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t04.dart
index 14cc654..594ba99 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t04.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t05.dart
index 0a013a7..7316757 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t05.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t06.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t07.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t07.dart
index 2a7292e..1ec9da3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t07.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t08.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t08.dart
index bd53676..5910e42 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t08.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t09.dart
index dacd65d..994465d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t09.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t10.dart
index 5848ed0..f286846 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t10.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t11.dart
index 94b00a2..2096551 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t11.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t12.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t12.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t13.dart
index 070497a..121ca28 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t13.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t14.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t14.dart
index 0edf527..6f278ef 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t14.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t15.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t15.dart
index 8ec3b96..bb06bfd 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t15.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_RETURN_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t16.dart
index bcc0fff..2e5330d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t16.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t17.dart
index 2c7f045..d93063a 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t17.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t18.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t18.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t19.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t19.dart
index d015015..315b947 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t20.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t20.dart
index d4a7370..3f9f2e9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t20.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NONNULLABLE_RETURN {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t21.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t21.dart
index 200d92e..865b7d7 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t21.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t22.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t22.dart
index 5f5abe4..71c34d9 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t22.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NULLABLE_RETURN {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t23.dart
index 9e7a3ca..9849d6e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t23.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NEVER_RETURN {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t24.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_RETURN_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_RETURN_t24.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t01.dart
index d16705b..6d7c111 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t01.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t02.dart
index 0ea8496..5fa8cea 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t02.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NONNULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t03.dart
index af2c2f2..bc1ce6d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t03.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t04.dart
index 3c5adca..a57beab 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t04.dart
@@ -19,7 +19,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t05.dart
index a9b09e8..1c2b574 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t05.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends OPTED_NEVER_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t06.dart
index 8c9c063..9f5d064 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t06.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t07.dart
index 49dbf74..889d978 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t07.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t08.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t08.dart
index 0b6573b..847513e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t08.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NONNULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t09.dart
index 976c52c..dd84700 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t09.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t10.dart
index bb78303..359f968 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t10.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t11.dart
index f1f9094..dab1e2d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t11.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A implements OPTED_NEVER_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t12.dart
index 39d0d2e..4726190 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t12.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t13.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t13.dart
index 59d9fa1..42ba958 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t13.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t14.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t14.dart
index d09f536..44cfaad 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t14.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NONNULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t15.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t15.dart
index 3c32400..74d0cff 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t15.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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/overriding/override_checking_A01_SETTER_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t16.dart
index 6bd8e3f..4bdb454 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t16.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NULLABLE_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t17.dart
index ca0001b..859e586 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t17.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A with OPTED_NEVER_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t18.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t18.dart
index 58992a4..5f02a3c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t18.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t19.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t19.dart
index d3c13ba..5555a9e 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t19.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t20.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t20.dart
index cb18861..ce79369 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t20.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NONNULLABLE_SETTER {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t21.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t21.dart
index 6f102cd..44ae894 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t21.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t22.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t22.dart
index 78dab99..0e24772 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t22.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NULLABLE_SETTER {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t23.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t23.dart
index a98fd87..fc21329 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t23.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// @dart=2.6
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
class A extends B implements OPTED_NEVER_SETTER {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t24.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A01_SETTER_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t24.dart
index 2fc4f63..f735d22 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_SETTER_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_SETTER_t24.dart
@@ -20,7 +20,7 @@
// @dart=2.6
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A01_opted_in_lib.dart";
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A01_opted_in_futureor_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_opted_in_futureor_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A01_opted_in_futureor_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_opted_in_futureor_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A01_opted_in_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A01_opted_in_lib.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A01_opted_in_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A01_opted_in_lib.dart
index e5ad5c6..d48cfed 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_opted_in_lib.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A01_opted_in_lib.dart
@@ -12,7 +12,7 @@
library override_opted_in_lib;
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class OPTED_NULLABLE_ARGS {
void test_int (int? i ) { Expect.fail("This method should be overriden"); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t01.dart
index 1f04f20..676154c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t01.dart
@@ -17,8 +17,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t02.dart
index 3d56e92..d237c11 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t02.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t03.dart
index 3983e50..1024017 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t03.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A extends LEGACY_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t04.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t04.dart
index 0779b96..03a2a85 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t04.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t05.dart
similarity index 95%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t05.dart
index a937693..66d98a0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t05.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t06.dart
index ceb934c..bd9b276 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t06.dart
@@ -17,8 +17,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t07.dart
index 53a2527..016b0e5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t07.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t08.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t08.dart
index 4e40f91..3f10ee8 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t08.dart
@@ -17,9 +17,10 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A implements LEGACY_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t09.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t09.dart
index 77b7b0a..3db0c03 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t09.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t10.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t10.dart
index 4f45ee0..e2e7666 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t10.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t11.dart
index d5f1d3d..740c4ea 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t11.dart
@@ -17,8 +17,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t12.dart
index e393ceb..b7c54d0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t12.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t13.dart
index 3f5db30..df02735 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t13.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A with LEGACY_ARGS {
void test_int(int i) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t14.dart
similarity index 95%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t14.dart
index 29c9060..cfa0c56 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t14.dart
@@ -16,8 +16,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t15.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t15.dart
index 62afe9f..3a05771 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t15.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t16.dart
index cdbeb4e..129ee05 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t16.dart
@@ -18,8 +18,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void test() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t17.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t17.dart
index 9351417..a27aef6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t17.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t18.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t18.dart
index e82b207..0373de2 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t18.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t19.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t19.dart
index bf1163f..022a07e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t19.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t20.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t20.dart
index b1e2f5c..8df8384 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t20.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t21.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t21.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t22.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t22.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t23.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t23.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t24.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_ARGS_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_ARGS_t24.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t01.dart
index 8026c03..87dd3d8 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t01.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T> extends LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t02.dart
index 88cfc4e..4610d14 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t02.dart
@@ -19,9 +19,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
+
import "dart:async";
-import "../../Utils/expect.dart";
-import "override_checking_A02_opted_out_lib.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> extends LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t03.dart
index 640412f..ef3ab5e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t03.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OptedInt<T extends int> extends LEGACY_CLASS_INT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t04.dart
index 985e542..916645c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t04.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> extends LEGACY_CLASS_FUTUREORINT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t05.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t05.dart
index 5432586..6e7af5d 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t05.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T extends Null> extends LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t06.dart
index 3eff2b0..2f16f69 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t06.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends Null> extends LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t07.dart
index e7f466e..0d4ccbe 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t07.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T> implements LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t08.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t08.dart
index 5a4dd8e..64a0eaa 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t08.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> implements LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t09.dart
index a383ee0..8c69c50 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t09.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OptedInt<T extends int> implements LEGACY_CLASS_INT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t10.dart
index b0e2434..e4f7951 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t10.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> implements LEGACY_CLASS_FUTUREORINT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t11.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t11.dart
index e6c87c7..2eac683 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t11.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T extends Null> implements LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t12.dart
index a16a4f9..3d43c43 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t12.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends Null> implements LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t13.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t13.dart
index 9b77ed5..676b0ee 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t13.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T> with LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t14.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t14.dart
index 969efc1..4a4b91a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t14.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends FutureOr> with LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t15.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t15.dart
index 74541a4..2383dd5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t15.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OptedInt<T extends int> with LEGACY_CLASS_INT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t16.dart
index 0605ae5..64ce117 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t16.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOrInt<T extends FutureOr<int>> with LEGACY_CLASS_FUTUREORINT<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t17.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t17.dart
index cc17ad7..ce1d45b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t17.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class Opted<T extends Null> with LEGACY_CLASS<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t18.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t18.dart
index 3910f5a..e4c0d2e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t18.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OptedFutureOr<T extends Null> extends LEGACY_CLASS_FUTUREOR<T> {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t19.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t19.dart
index d9b1a07..7b6f044 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t19.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OPTED_CLASS<T> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t20.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t20.dart
index b3c4d14..60073c9 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t20.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OPTED_CLASS_FUTUREOR<T extends FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t21.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t21.dart
index 6218027..a5a9eba 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t21.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t21.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OPTED_CLASS_INT<T extends int> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t22.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t22.dart
index 2662ec4..269357c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t22.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OPTED_CLASS_FUTUREORINT<T extends FutureOr<int>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t23.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t23.dart
index 691fad0..9c1090b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t23.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t23.dart
@@ -16,7 +16,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class OPTED_CLASS<T> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t24.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t24.dart
index 5545cdf..2dd0327 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_CLASSPARAM_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_CLASSPARAM_t24.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_futureor_lib.dart";
class OPTED_CLASS_FUTUREOR<T extends FutureOr?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t01.dart
similarity index 81%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t01.dart
index e96b210..b0126c7 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t01.dart
@@ -17,19 +17,19 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_FIELD {
- int? i;
- Object? o;
- dynamic d;
- Function? func;
- Null n;
- FutureOr? f;
- FutureOr<int>? fi;
+ int? i;
+ Object? o;
+ dynamic d;
+ Function? func;
+ Null n;
+ FutureOr? f;
+ FutureOr<int>? fi;
FutureOr<Function>? ff;
- void v;
+ void v;
}
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t02.dart
index 7f37aec..f052116 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t02.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t03.dart
index ece0ece..1852c04 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t03.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t04.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t04.dart
index 28b3f94..ceb198f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t04.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t05.dart
index 0df9caf..482ee45 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t05.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_FIELD {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t06.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t06.dart
index f19712c..86fc12b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t06.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t07.dart
index 891ff72..9e6a565 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t07.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class AA {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t08.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t08.dart
index e2b276c..0263ae8 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t08.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
void testme1() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t09.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t09.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t10.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t10.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t11.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t11.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t12.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_FIELD_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_FIELD_t12.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t01.dart
index d35e587..8fed801 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t01.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t02.dart
index 982603e..7923f75 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t02.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t03.dart
index ca5eb1f..318008b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t03.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t04.dart
index c17b507..6bfb0e3 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t04.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t05.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t05.dart
index 07a6890..d87ccd4 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t05.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t06.dart
index 9af6e1a..380a979 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t06.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t07.dart
index 666a65c..7677d17 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t07.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t08.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t08.dart
index 2b5ba44..74ee99a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t08.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_GETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t09.dart
index cf5f2c6..975384f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t09.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t10.dart
index de553c7..20ec5df 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t10.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t11.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t11.dart
index 22ebb79..e9a8372 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t11.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class AA {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t12.dart
index 186f227..ca3d816 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_GETTER_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_GETTER_t12.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t01.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t01.dart
index 844ba99..11af43d 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t01.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t02.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t03.dart
index a0b55f8..4cc0f85 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t03.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t04.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t05.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t05.dart
index f957067..4b08cfb 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t05.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t06.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t07.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t07.dart
index b1f4e2d..e89a57a 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t07.dart
@@ -17,7 +17,7 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class B {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t08.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t08.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t09.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t09.dart
index b1b8f03..8ed706c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t09.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t10.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t10.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t11.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t11.dart
index 61f37ad..83726f6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t11.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t12.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t12.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t13.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t13.dart
index a599508..c21e8e5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t13.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.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_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t14.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t14.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t15.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t15.dart
index 81460a2..58077cb 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t15.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
abstract class B {
void test_default({required int i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t16.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t16.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t17.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t17.dart
index 8e3ff2e..e9f3482 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t17.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t17.dart
@@ -17,9 +17,9 @@
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "override_checking_A02_opted_out_lib.dart";
+import "../../../Utils/expect.dart";
class A1 extends LEGACY_REQUIRED_ARGS {
void test_nondefault({int? i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t18.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t18.dart
index df31896..6591897 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t18.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t18.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A1 implements LEGACY_REQUIRED_ARGS {
void test_default({required int? i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t19.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t19.dart
index c5cc667..3e6db40 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t19.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t19.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A1 with LEGACY_REQUIRED_ARGS {
void test_nondefault({int? i}) { Expect.equals(1, i); }
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t20.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t20.dart
index 62023b9..20ea6dd 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t20.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t20.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
abstract class B {
void test_default({required int? i}) {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t21.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t21.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t21.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t21.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t22.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t22.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t22.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t22.dart
index 0afe4f3..8348040 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t22.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t22.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class A extends LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t23.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t23.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t23.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t23.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t24.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t24.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t24.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t24.dart
index 52367fa..a0c519c 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t24.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t24.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class A implements LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t25.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t25.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t25.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t25.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t26.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t26.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t26.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t26.dart
index 2be0e34..41584a1 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_REQ_ARGS_t26.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_REQ_ARGS_t26.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class A with LEGACY_REQUIRED_ARGS {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t01.dart
index 7b10b75..79949a5 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t01.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t02.dart
index 49faae8..a7d049b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t02.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t03.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t03.dart
index 35099a4..7fdb458 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t03.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t04.dart
index 690070f..e8f9829 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t04.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t05.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t05.dart
index b68fc79..cef84aa 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t05.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t06.dart
index 93a08b3..fb34f17 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t06.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t07.dart
index 2dd0633..bb6267e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t07.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t08.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t08.dart
index 8a51e74..afe4ee4 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t08.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_RETURN {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t09.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t09.dart
index ddad0f4..0cf6bc0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t09.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t10.dart
index ac35913..501725b 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t10.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t11.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t11.dart
index 9ce40fc..a0a6590 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t11.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
abstract class AA {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t12.dart
index fe69d69..1c8a76f 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t12.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t13.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t13.dart
index e1b0a7e..6fb4630 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t13.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t13.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A extends LEGACY_RETURN {
Never getInt() => throw "It's impossible!";
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t14.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t14.dart
index a4a169c..8b97748 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t14.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t14.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A with LEGACY_RETURN {
Never getInt() => throw "It's impossible!";
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t15.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t15.dart
index 8c60df9..0199252 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t15.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t15.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A with LEGACY_RETURN {
Never getInt() => throw "It's impossible!";
diff --git a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t16.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t16.dart
index a7d6e12..adf4ffe 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_RETURN_t16.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_RETURN_t16.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
abstract class AA {
int? getInt();
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t01.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t01.dart
index 1a81574..2c8c9a9 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t01.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t01.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t02.dart
index 932eba5..3c069f7 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t02.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A extends LEGACY_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t03.dart
index ddb5fb5..8d69cfc 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t03.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t04.dart
index b92208d..06097fc 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t04.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t04.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t05.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t05.dart
index df08512..6f5c3ba 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t05.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A implements LEGACY_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t06.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t06.dart
index 7c633ce..53ab7c6 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t06.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t06.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t07.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t07.dart
index cb33278..a333a52 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t07.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t07.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t08.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t08.dart
index 91a35d9..57168ea 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t08.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t08.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
class A with LEGACY_SETTER {
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t09.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t09.dart
index 4a2a4df..bbc37b4 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t09.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t09.dart
@@ -18,7 +18,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t10.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t10.dart
index e3905f3..b9144fe 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t10.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t10.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t11.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t11.dart
index 3caae02..c854a5e 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t11.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t11.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A02_opted_out_lib.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t12.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t12.dart
index 8621c0e..a5808f2 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_SETTER_t12.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_SETTER_t12.dart
@@ -19,7 +19,7 @@
// Requirements=nnbd-strong
import "dart:async";
import "override_checking_A02_opted_out_lib.dart";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
void testme() {}
diff --git a/LanguageFeatures/nnbd/override_checking_A02_opted_out_futureor_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_opted_out_futureor_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A02_opted_out_futureor_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_opted_out_futureor_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A02_opted_out_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A02_opted_out_lib.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A02_opted_out_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A02_opted_out_lib.dart
index 583b0f4..45654f0 100644
--- a/LanguageFeatures/nnbd/override_checking_A02_opted_out_lib.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A02_opted_out_lib.dart
@@ -12,7 +12,7 @@
library override_legacy_lib;
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class LEGACY_ARGS {
void test_int (int i ) { Expect.fail("This method should be overriden"); }
diff --git a/LanguageFeatures/nnbd/override_checking_A03_opted_in_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_opted_in_lib.dart
similarity index 98%
rename from LanguageFeatures/nnbd/override_checking_A03_opted_in_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_opted_in_lib.dart
index c52b9fc..d0bdb46 100644
--- a/LanguageFeatures/nnbd/override_checking_A03_opted_in_lib.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A03_opted_in_lib.dart
@@ -9,7 +9,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class OPTED_NULLABLE_ARGS {
void test_int (int? i ) { Expect.isNull(i); }
diff --git a/LanguageFeatures/nnbd/overriding/override_checking_A03_opted_out_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_opted_out_lib.dart
new file mode 100644
index 0000000..4dfc042
--- /dev/null
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A03_opted_out_lib.dart
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+ * for details. All rights reserved. Use of this source code is governed by a
+ * BSD-style license that can be found in the LICENSE file.
+ */
+/**
+ * @author iarkh@unipro.ru
+ */
+// @dart=2.6
+// SharedOptions=--enable-experiment=non-nullable
+// Requirements=nnbd-strong
+
+import "override_checking_A03_opted_in_lib.dart";
+
+class LEGACY_ARGS_1 extends OPTED_NULLABLE_ARGS implements OPTED_NONNULLABLE_ARGS {}
+class LEGACY_ARGS_2 extends OPTED_NONNULLABLE_ARGS implements OPTED_NULLABLE_ARGS {}
+
+class LEGACY_FIELDS_1 extends OPTED_NULLABLE_FIELD implements OPTED_NONNULLABLE_FIELD {}
+class LEGACY_FIELDS_2 extends OPTED_NONNULLABLE_FIELD implements OPTED_NULLABLE_FIELD {}
+
+class LEGACY_GETTER_1 extends OPTED_NULLABLE_GETTER implements OPTED_NONNULLABLE_GETTER {}
+class LEGACY_GETTER_2 extends OPTED_NONNULLABLE_GETTER implements OPTED_NULLABLE_GETTER {}
+
+class LEGACY_SETTER_1 extends OPTED_NULLABLE_SETTER implements OPTED_NONNULLABLE_SETTER {}
+class LEGACY_SETTER_2 extends OPTED_NONNULLABLE_SETTER implements OPTED_NULLABLE_SETTER {}
+
+class LEGACY_RETURN_1 extends OPTED_NULLABLE_RETURN implements OPTED_NONNULLABLE_RETURN {}
+class LEGACY_RETURN_2 extends OPTED_NONNULLABLE_RETURN implements OPTED_NULLABLE_RETURN {}
+
+class LEGACY_INT_1<T extends int> extends OPTED_NONNULLABLE_INT<T> implements OPTED_NULLABLE_INT <T> {}
+class LEGACY_INT_2<T extends int> extends OPTED_NULLABLE_INT <T> implements OPTED_NONNULLABLE_INT<T> {}
+
+class LEGACY_OBJECT_1<T extends Object> extends OPTED_NONNULLABLE_OBJECT<T> implements OPTED_NULLABLE_OBJECT <T> {}
+class LEGACY_OBJECT_2<T extends Object> extends OPTED_NULLABLE_OBJECT <T> implements OPTED_NONNULLABLE_OBJECT<T> {}
+
+class LEGACY_FUNCTION_1<T extends Function> extends OPTED_NONNULLABLE_FUNCTION<T> implements OPTED_NULLABLE_FUNCTION <T> {}
+class LEGACY_FUNCTION_2<T extends Function> extends OPTED_NULLABLE_FUNCTION<T> implements OPTED_NONNULLABLE_FUNCTION<T> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t01.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A03_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t01.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A03_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t02.dart
index 6762806..48ef897 100644
--- a/LanguageFeatures/nnbd/override_checking_A03_t02.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A03_t02.dart
@@ -29,7 +29,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A03_opted_out_lib.dart";
main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A03_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t03.dart
index f35a41a..edb570f 100644
--- a/LanguageFeatures/nnbd/override_checking_A03_t03.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A03_t03.dart
@@ -29,7 +29,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A03_opted_out_lib.dart";
import "override_checking_A03_opted_in_lib.dart";
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A03_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t04.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t05.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A03_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t05.dart
index eb3322a..ee18c1a 100644
--- a/LanguageFeatures/nnbd/override_checking_A03_t05.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A03_t05.dart
@@ -29,7 +29,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A03_opted_out_lib.dart";
import "override_checking_A03_opted_in_lib.dart";
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A03_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t06.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A03_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A03_t07.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A03_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A03_t07.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A04_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A04_t01.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A04_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A04_t01.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A04_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A04_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A04_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A04_t02.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A04_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A04_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A04_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A04_t03.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A04_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A04_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A04_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A04_t04.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A04_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A04_t05.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A04_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A04_t05.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_opted_in_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_opted_in_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_opted_in_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_opted_in_lib.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t01.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t01.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t01.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t01.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t02.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t02.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t02.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t03.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t03.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t03.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t04.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t04.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t04.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t05.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t05.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t05.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t05.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t06.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t06.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t06.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t07.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t07.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t07.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t07.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t08.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t08.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t08.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t08.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A05_t09.dart b/LanguageFeatures/nnbd/overriding/override_checking_A05_t09.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A05_t09.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A05_t09.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_opted_out_lib.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_opted_out_lib.dart
similarity index 94%
rename from LanguageFeatures/nnbd/override_checking_A06_opted_out_lib.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_opted_out_lib.dart
index 6897d3d..edc0585 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_opted_out_lib.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_opted_out_lib.dart
@@ -22,8 +22,8 @@
class out_void extends A<void > {}
class out_Null extends A<Null > {}
-class out_FutureOr extends A<FutureOr> {}
-class out_FutureOr_int extends A<FutureOr<int>> {}
+class out_FutureOr extends A<FutureOr > {}
+class out_FutureOr_int extends A<FutureOr<int >> {}
class out_FutureOr_FutureOr extends A<FutureOr<FutureOr>> {}
class out_Never extends A<Never> {}
@@ -37,8 +37,8 @@
class out_void1 extends A<void > {}
class out_Null1 extends A<Null > {}
-class out_FutureOr1 extends A<FutureOr> {}
-class out_FutureOr_int1 extends A<FutureOr<int>> {}
+class out_FutureOr1 extends A<FutureOr > {}
+class out_FutureOr_int1 extends A<FutureOr<int >> {}
class out_FutureOr_FutureOr1 extends A<FutureOr<FutureOr>> {}
class out_Never1 extends A<Never> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t001.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t001.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t001.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t001.dart
index d339e0e..e13df2d 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t001.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t001.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(Object, T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t002.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t002.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t002.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t002.dart
index 84d0503..460a240 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t002.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t002.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Object?>(), typeOf<T>()); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t003.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t003.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t003.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t003.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t004.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t004.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t004.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t004.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t005.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t005.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t005.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t005.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t006.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t006.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t006.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t006.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t007.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t007.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t007.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t007.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t008.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t008.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t008.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t008.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t009.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t009.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t009.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t009.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t010.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t010.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t010.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t010.dart
index ffc6063..1dd8894 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t010.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t010.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Object?>(), typeOf<T>()); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t011.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t011.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t011.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t011.dart
index 661de76..0432917 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t011.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t011.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Object?>(), typeOf<T>()); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t012.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t012.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t012.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t012.dart
index 7c00366..425c3a1 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t012.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t012.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<int?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t013.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t013.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t013.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t013.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t014.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t014.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t014.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t014.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t015.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t015.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t015.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t015.dart
index bcb5f86..121261b 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t015.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t015.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(int, T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t016.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t016.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t016.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t016.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t017.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t017.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t017.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t017.dart
index 05b833b..5fcf10c 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t017.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t017.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<int?>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t018.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t018.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t018.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t018.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t019.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t019.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t019.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t019.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t020.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t020.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t020.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t020.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t021.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t021.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t021.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t021.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t022.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t022.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t022.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t022.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t023.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t023.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t023.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t023.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t024.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t024.dart
similarity index 99%
rename from LanguageFeatures/nnbd/override_checking_A06_t024.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t024.dart
index d1dd3ba..cddf6cd 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t024.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t024.dart
@@ -22,7 +22,6 @@
import "override_checking_A06_opted_out_lib.dart";
-
class B extends A<Function> {}
class in_dynamic extends out_dynamic implements B {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t025.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t025.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t025.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t025.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t026.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t026.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t026.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t026.dart
index f894ac8..7f8db36 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t026.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t026.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Object?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t027.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t027.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t027.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t027.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t028.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t028.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t028.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t028.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t029.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t029.dart
similarity index 94%
rename from LanguageFeatures/nnbd/override_checking_A06_t029.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t029.dart
index e679a53..786fbda 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t029.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t029.dart
@@ -14,19 +14,17 @@
* @description Check that result of [NNBD_TOP_MERGE] of [Object?] vs [dynamic*]
* and [void*] is [Object?].
*
- * @Issue 40541
+ * @Issue 40541, 40453
* @author iarkh@unipro.ru
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart"
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Object?> {}
-// See also Issue 40453
-
class in_dynamic1 extends out_dynamic implements B {}
class in_dynamic2 extends B implements out_dynamic {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t030.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t030.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t030.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t030.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t031.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t031.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t031.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t031.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t032.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t032.dart
similarity index 99%
rename from LanguageFeatures/nnbd/override_checking_A06_t032.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t032.dart
index 631bd20..f4cd209 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t032.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t032.dart
@@ -22,7 +22,6 @@
import "override_checking_A06_opted_out_lib.dart";
-
class B extends A<Object> {}
class in_dynamic extends out_dynamic implements B {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t033.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t033.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t033.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t033.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t034.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t034.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t034.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t034.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t035.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t035.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t035.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t035.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t036.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t036.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t036.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t036.dart
index b3258e9..4566dd1 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t036.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t036.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Function?>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t037.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t037.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t037.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t037.dart
index fac181e..1a46195 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t037.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t037.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Function>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t038.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t038.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t038.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t038.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t039.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t039.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t039.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t039.dart
index 32db3a8..b293845 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t039.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t039.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<dynamic>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t040.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t040.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t040.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t040.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t041.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t041.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t041.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t041.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t042.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t042.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t042.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t042.dart
index 2ba4b0f..6bf59f2 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t042.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t042.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<dynamic>(), typeOf<T>()); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t043.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t043.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t043.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t043.dart
index 9e1d87e..a75fa7c 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t043.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t043.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<dynamic> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t044.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t044.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t044.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t044.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t045.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t045.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t045.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t045.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t046.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t046.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t046.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t046.dart
index 22c0e9a..749f129 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t046.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t046.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<dynamic> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t047.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t047.dart
similarity index 93%
rename from LanguageFeatures/nnbd/override_checking_A06_t047.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t047.dart
index 0d59184..89418e6 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t047.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t047.dart
@@ -13,18 +13,17 @@
*
* @description Check that result of [NNBD_TOP_MERGE(dynamic, void] is [dynamic]
*
- * @Issue 40541
+ * @Issue 40453, 40541
* @author iarkh@unipro.ru
*/
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<dynamic> {}
-// See also Issue 40453
class in_void1 extends out_void implements B {}
class in_void2 extends B implements out_void {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t048.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t048.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t048.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t048.dart
index ef14402..20b7c67 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t048.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t048.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<void>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t049.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t049.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t049.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t049.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t050.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t050.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t050.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t050.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t051.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t051.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t051.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t051.dart
index 90cc8bf..fc3ecfe 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t051.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t051.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<void> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t052.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t052.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t052.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t052.dart
index ea0963c..46d6504 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t052.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t052.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<void> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t053.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t053.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t053.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t053.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t054.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t054.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t054.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t054.dart
index f9bc985..e18c927 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t054.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t054.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<void> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t055.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t055.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t055.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t055.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t056.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t056.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t056.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t056.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t057.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t057.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t057.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t057.dart
index d5ecdcf..72c37a2 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t057.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t057.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(Null, T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t058.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t058.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t058.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t058.dart
index 05b0de5..edbe618 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t058.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t058.dart
@@ -18,7 +18,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Null> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t059.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t059.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t059.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t059.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t060.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t060.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t060.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t060.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t061.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t061.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t061.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t061.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t062.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t062.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t062.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t062.dart
index 05f1770..1586591 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t062.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t062.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<FutureOr>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t063.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t063.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t063.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t063.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t064.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t064.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t064.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t064.dart
index a78f80e..14f95f0 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t064.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t064.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> { Type getType() => T; }
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t065.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t065.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t065.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t065.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t066.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t066.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t066.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t066.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t067.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t067.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t067.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t067.dart
index c18618e..ceda237 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t067.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t067.dart
@@ -21,13 +21,12 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> { Type getType() => T; }
class B extends A<FutureOr> {}
class C extends A<dynamic > {}
-
class D1 extends C implements B {}
class D2 extends B implements C {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t068.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t068.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t068.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t068.dart
index 7af59b1..19263ee 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t068.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t068.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> { Type getType() => T; }
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t069.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t069.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t069.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t069.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t070.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t070.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t070.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t070.dart
index e5991a8..bb27e68 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t070.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t070.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t071.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t071.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t071.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t071.dart
index aa382a0..ed7b263 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t071.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t071.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t072.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t072.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t072.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t072.dart
index 7a849ec..f223827 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t072.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t072.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t073.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t073.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t073.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t073.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t074.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t074.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t074.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t074.dart
index 7d9c5bb..b6ac172 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t074.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t074.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t075.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t075.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t075.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t075.dart
index db9de5b..f5b4efa 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t075.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t075.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<FutureOr<int>>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t076.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t076.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t076.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t076.dart
index fa52b54..8e7482c 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t076.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t076.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<FutureOr<int?>>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t077.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t077.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t077.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t077.dart
index 143e555..d7f2707 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t077.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t077.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<FutureOr<FutureOr>>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t078.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t078.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t078.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t078.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t079.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t079.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t079.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t079.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t080.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t080.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t080.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t080.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t081.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t081.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t081.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t081.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t082.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t082.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t082.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t082.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t083.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t083.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t083.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t083.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t084.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t084.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t084.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t084.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t085.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t085.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t085.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t085.dart
index 15bd5cf..92361a5 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t085.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t085.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr<int?>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t086.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t086.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t086.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t086.dart
index 47d889b..2132a5c 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t086.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t086.dart
@@ -20,7 +20,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr<FutureOr>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t087.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t087.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t087.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t087.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t088.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t088.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t088.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t088.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t089.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t089.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t089.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t089.dart
index c3cdf15..e49cd99 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t089.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t089.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> { Type getType() => T; }
class B extends A<FutureOr<FutureOr>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t090.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t090.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t090.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t090.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t091.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t091.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t091.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t091.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t092.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t092.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t092.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t092.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t093.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t093.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t093.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t093.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t094.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t094.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t094.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t094.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t095.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t095.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t095.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t095.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t096.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t096.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t096.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t096.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t097.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t097.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t097.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t097.dart
index f4a0cf1..e9813a2 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t097.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t097.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(typeOf<Function?>(), T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t098.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t098.dart
similarity index 99%
rename from LanguageFeatures/nnbd/override_checking_A06_t098.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t098.dart
index f3ab1b7..0a33305 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t098.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t098.dart
@@ -22,7 +22,6 @@
import "override_checking_A06_opted_out_lib.dart";
-
class B extends A<Function?> {}
class in_dynamic extends out_dynamic implements B {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t099.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t099.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t099.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t099.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t100.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t100.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t100.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t100.dart
index ead8af9..84da407 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t100.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t100.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<void> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t101.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t101.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t101.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t101.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t102.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t102.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t102.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t102.dart
index 4464a50..8f4dee7 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t102.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t102.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> { Type getType() => T; }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t103.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t103.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t103.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t103.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t104.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t104.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t104.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t104.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t105.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t105.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t105.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t105.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t106.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t106.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t106.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t106.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t107.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t107.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t107.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t107.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t108.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t108.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t108.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t108.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t109.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t109.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t109.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t109.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t110.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t110.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t110.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t110.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t111.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t111.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t111.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t111.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t112.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t112.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t112.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t112.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t113.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t113.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t113.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t113.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t114.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t114.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t114.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t114.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t115.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t115.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t115.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t115.dart
index 44e210d..0a2f4d7 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t115.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t115.dart
@@ -22,7 +22,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class in_int extends out_int implements out_int1 {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t116.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t116.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t116.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t116.dart
index 4b05a26..512d156 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t116.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t116.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class in_dynamic extends out_dynamic implements out_dynamic1 {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t117.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t117.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t117.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t117.dart
index 6c3ff10..3d8bea6 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t117.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t117.dart
@@ -22,7 +22,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_FutureOr implements out_FutureOr1 {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t118.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t118.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t118.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t118.dart
index 6794283..9db5ba5 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t118.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t118.dart
@@ -17,7 +17,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C extends out_Never implements out_Never1 {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t119.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t119.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t119.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t119.dart
index c3c1bc5..721af37 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t119.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t119.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
class A<T> {
void test() { Expect.equals(Never, T); }
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t120.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t120.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t120.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t120.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t121.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t121.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t121.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t121.dart
index 17698f4..ef81c57 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t121.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t121.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_Object implements out_dynamic {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t122.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t122.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t122.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t122.dart
index f35f529..94b01ef 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t122.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t122.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_Object implements out_dynamic {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t123.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t123.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t123.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t123.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t124.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t124.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t124.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t124.dart
index 5b5bef8..55dd632 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t124.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t124.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_Object implements out_FutureOr {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t125.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t125.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t125.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t125.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t126.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t126.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t126.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t126.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t127.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t127.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t127.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t127.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t128.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t128.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t128.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t128.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t129.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t129.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t129.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t129.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t130.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t130.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t130.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t130.dart
index 94e960a..65d6071 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t130.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t130.dart
@@ -20,7 +20,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class in1 extends out_dynamic implements out_void {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t131.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t131.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t131.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t131.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t132.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t132.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t132.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t132.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t133.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t133.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t133.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t133.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t134.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t134.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t134.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t134.dart
index eeb98fc..e2adf72 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t134.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t134.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr<FutureOr>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t135.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t135.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t135.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t135.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t136.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t136.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t136.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t136.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t137.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t137.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t137.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t137.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t138.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t138.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t138.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t138.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t139.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t139.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t139.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t139.dart
index 542353b..c126acb 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t139.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t139.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_dynamic implements out_FutureOr {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t140.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t140.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t140.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t140.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t141.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t141.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t141.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t141.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t142.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t142.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t142.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t142.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t143.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t143.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t143.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t143.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t144.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t144.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t144.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t144.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t145.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t145.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t145.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t145.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t146.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t146.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t146.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t146.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t147.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t147.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t147.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t147.dart
index 2f3e835..a8be7ee 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t147.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t147.dart
@@ -22,7 +22,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_void implements out_FutureOr {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t148.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t148.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t148.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t148.dart
index 4edfe7b..a595243 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t148.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t148.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr<FutureOr>> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t149.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t149.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t149.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t149.dart
index 50ba2cd..b882008 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t149.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t149.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_FutureOr implements out_FutureOr_FutureOr {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t150.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t150.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t150.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t150.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t151.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t151.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t151.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t151.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t152.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t152.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t152.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t152.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t153.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t153.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t153.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t153.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t154.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t154.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t154.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t154.dart
index ec965ed..a5ddcbf 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t154.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t154.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Null> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t155.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t155.dart
similarity index 100%
rename from LanguageFeatures/nnbd/override_checking_A06_t155.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t155.dart
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t156.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t156.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t156.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t156.dart
index b71a088..c9689be 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t156.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t156.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class C1 extends out_Null implements out_Never {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t157.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t157.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t157.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t157.dart
index e1c3626..7789d04 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t157.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t157.dart
@@ -19,7 +19,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Never> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t158.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t158.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t158.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t158.dart
index 83fa936..ac19765 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t158.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t158.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<dynamic> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t159.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t159.dart
similarity index 97%
rename from LanguageFeatures/nnbd/override_checking_A06_t159.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t159.dart
index 57e478c..d102e5d 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t159.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t159.dart
@@ -21,7 +21,7 @@
// SharedOptions=--enable-experiment=non-nullable
// Requirements=nnbd-strong
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<Object?> {}
diff --git a/LanguageFeatures/nnbd/override_checking_A06_t160.dart b/LanguageFeatures/nnbd/overriding/override_checking_A06_t160.dart
similarity index 96%
rename from LanguageFeatures/nnbd/override_checking_A06_t160.dart
rename to LanguageFeatures/nnbd/overriding/override_checking_A06_t160.dart
index 0dec071..f813f1a 100644
--- a/LanguageFeatures/nnbd/override_checking_A06_t160.dart
+++ b/LanguageFeatures/nnbd/overriding/override_checking_A06_t160.dart
@@ -21,7 +21,7 @@
// Requirements=nnbd-strong
import "dart:async";
-import "../../Utils/expect.dart";
+import "../../../Utils/expect.dart";
import "override_checking_A06_opted_out_lib.dart";
class B extends A<FutureOr> {}
