| Index: tests/language_2/type_variable_conflict2_test.dart | 
| diff --git a/tests/language/type_variable_conflict2_test.dart b/tests/language_2/type_variable_conflict2_test.dart | 
| similarity index 73% | 
| rename from tests/language/type_variable_conflict2_test.dart | 
| rename to tests/language_2/type_variable_conflict2_test.dart | 
| index b82accb0450847a1cb7389ca806e3dfe7ee2ae29..092a8efd0e321c40494312b809e27cc5f77e9a69 100644 | 
| --- a/tests/language/type_variable_conflict2_test.dart | 
| +++ b/tests/language_2/type_variable_conflict2_test.dart | 
| @@ -12,38 +12,38 @@ class C<T> { | 
| } | 
|  | 
| // This is equivalent to (T).call(). See issue 19725 | 
| -  foo() => T(); // //# 01: static type warning | 
| +  foo() => T(); // //# 01: compile-time error | 
|  | 
| // T is in scope, even in static context. Compile-time error to call this.T(). | 
| static bar() => T(); // //# 02: compile-time error | 
|  | 
| -  // X is not in scope. NoSuchMethodError. | 
| -  static baz() => X(); // //# 03: static type warning | 
| +  // X is not in scope. Compile-time error. | 
| +  static baz() => X(); // //# 03: compile-time error | 
|  | 
| -  // Class 'C' has no static method 'T': NoSuchMethodError. | 
| -  static qux() => C.T(); // //# 04: static type warning | 
| +  // Class 'C' has no static method 'T': Compile-time error. | 
| +  static qux() => C.T(); // //# 04: compile-time error | 
|  | 
| -  // Class '_Type' has no instance method 'call': NoSuchMethodError. | 
| -  quux() => (T)(); // //# 05: static type warning | 
| +  // Class '_Type' has no instance method 'call': Compile-time error. | 
| +  quux() => (T)(); // //# 05: compile-time error | 
|  | 
| // Runtime type T not accessible from static context. Compile-time error. | 
| static corge() => (T)(); // //# 06: compile-time error | 
|  | 
| -  // Class '_Type' has no [] operator: NoSuchMethodError. | 
| -  grault() => T[0]; // //# 07: static type warning | 
| +  // Class '_Type' has no [] operator: Compile-time error. | 
| +  grault() => T[0]; // //# 07: compile-time error | 
|  | 
| // Runtime type T not accessible from static context. Compile-time error. | 
| static garply() => T[0]; // //# 08: compile-time error | 
|  | 
| -  // Class '_Type' has no member m: NoSuchMethodError. | 
| -  waldo() => T.m; // //# 09: static type warning | 
| +  // Class '_Type' has no member m: Compile-time error. | 
| +  waldo() => T.m; // //# 09: compile-time error | 
|  | 
| // Runtime type T not accessible from static context. Compile-time error. | 
| static fred() => T.m; // //# 10: compile-time error | 
| } | 
|  | 
| main() { | 
| -  Expect.throws(() => new C().foo(), (e) => e is NoSuchMethodError); //# 01: continued | 
| +  Expect.throws(() => new C().foo(), (e) => e is NoSuchMethodError); // //# 01: continued | 
| C.bar(); // //# 02: continued | 
| Expect.throws(() => C.baz(), (e) => e is NoSuchMethodError); // //# 03: continued | 
| Expect.throws(() => C.qux(), (e) => e is NoSuchMethodError); // //# 04: continued | 
|  |