#1400. Composing inline classes tests renumerated (#2078)

Author: sgrekhov

LanguageFeatures/Inline-classes/composing_inline_classes_A05_t02.dart

@@ -11,10 +11,11 @@
 /// the two declarations of m are distinct declarations, and DV does not declare
 /// a member named m.
 ///
-/// @description Checks that it is not an error if an inline class declaration
-/// `DV` has two superinterfaces `V1` and `V2`, where both `V1` and `V2` have a
-/// member named `m`, and the two declarations of `m` are distinct
-/// declarations, but DV does declare a member named `m`.
+/// @description Checks that it is a compile-time error if an inline class
+/// declaration `DV` has two superinterfaces `V1` and `V2`, where both `V1` and
+/// `V2` have a member named `m`, and the two declarations of `m` are distinct
+/// declarations, and DV does not declare a member named `m`. Test the case when
+/// members in `V1` and `V2` have equal signatures
 /// @author [email protected]
 
 // SharedOptions=--enable-experiment=inline-class
@@ -34,10 +35,11 @@ inline class V2 {
 }
 
 inline class V implements V1, V2 {
+//           ^
+// [analyzer] unspecified
+// [cfe] unspecified
   final int id;
   V(this.id);
-
-  num get m => 3.14;
 }
 
 main() {

LanguageFeatures/Inline-classes/composing_inline_classes_A05_t03.dart

@@ -19,34 +19,27 @@
 
 // SharedOptions=--enable-experiment=inline-class
 
-import "../../Utils/expect.dart";
-
 inline class V1 {
   final int id;
   V1(this.id);
 
-  int get m => 1;
+  int m() => 1;
 }
 
 inline class V2 {
   final int id;
   V2(this.id);
 
-  num m() => 2;
+  int m() => 2;
 }
 
 inline class V implements V1, V2 {
   final int id;
   V(this.id);
 
-  String get m => "42";
+  num get m => 3.14;
 }
 
 main() {
-  V1 v1 = V(1);
-  V2 v2 = V(2);
-  V v = V(3);
-  Expect.equals(1, v1.m);
-  Expect.equals(2, v2.m());
-  Expect.equals("42", v.m);
+  print(V);
 }

LanguageFeatures/Inline-classes/composing_inline_classes_A05_t04.dart

@@ -11,34 +11,42 @@
 /// the two declarations of m are distinct declarations, and DV does not declare
 /// a member named m.
 ///
-/// @description Checks that it is no an error if an inline class declaration
-/// `DV` has two superinterfaces `V1` and `V2`, where both `V1` and `V2` have
-/// the same declaration named `m`
+/// @description Checks that it is not an error if an inline class declaration
+/// `DV` has two superinterfaces `V1` and `V2`, where both `V1` and `V2` have a
+/// member named `m`, and the two declarations of `m` are distinct
+/// declarations, but DV does declare a member named `m`.
 /// @author [email protected]
 
 // SharedOptions=--enable-experiment=inline-class
 
 import "../../Utils/expect.dart";
 
-inline class V1 implements V3 {
+inline class V1 {
   final int id;
   V1(this.id);
+
+  int get m => 1;
 }
 
-inline class V2 implements V3 {
+inline class V2 {
   final int id;
   V2(this.id);
-}
 
-inline class V3 {
-  num foo() => 42;
+  num m() => 2;
 }
 
 inline class V implements V1, V2 {
   final int id;
   V(this.id);
+
+  String get m => "42";
 }
 
 main() {
-  Expect.equals(42, V(1).foo());
+  V1 v1 = V(1);
+  V2 v2 = V(2);
+  V v = V(3);
+  Expect.equals(1, v1.m);
+  Expect.equals(2, v2.m());
+  Expect.equals("42", v.m);
 }

LanguageFeatures/Inline-classes/composing_inline_classes_A05_t05.dart

@@ -11,37 +11,34 @@
 /// the two declarations of m are distinct declarations, and DV does not declare
 /// a member named m.
 ///
-/// @description Checks that it is a compile-time error if an inline class
-/// declaration `DV` has two superinterfaces `V1` and `V2`, where both `V1` and
-/// `V2` have a member named `m`, and the two declarations of `m` are distinct
-/// declarations, and DV does not declare a member named `m`. Test the case when
-/// members in `V1` and `V2` have equal signatures
+/// @description Checks that it is no an error if an inline class declaration
+/// `DV` has two superinterfaces `V1` and `V2`, where both `V1` and `V2` have
+/// the same declaration named `m`
 /// @author [email protected]
 
 // SharedOptions=--enable-experiment=inline-class
 
-inline class V1 {
+import "../../Utils/expect.dart";
+
+inline class V1 implements V3 {
   final int id;
   V1(this.id);
-
-  int m() => 1;
 }
 
-inline class V2 {
+inline class V2 implements V3 {
   final int id;
   V2(this.id);
+}
 
-  int m() => 2;
+inline class V3 {
+  num foo() => 42;
 }
 
 inline class V implements V1, V2 {
-//           ^
-// [analyzer] unspecified
-// [cfe] unspecified
   final int id;
   V(this.id);
 }
 
 main() {
-  print(V);
+  Expect.equals(42, V(1).foo());
 }