[test] Changes to mirrors tests to make them more Dart 3 compatible.

These changes are not sufficient by themselves, but the subset that can still run in Dart 2.

Bug: dart-lang/sdk#40045
Change-Id: Ie8f61fc9ee94b85329a701f97b5d3f91dbc1f889
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/132422
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>

Author: rmacnak-google

tests/lib_2/mirrors/bad_argument_types_test.dart

@@ -80,7 +80,7 @@ void badClassStaticInvoke() {
 }
 
 void badStaticInvoke() {
-  final ClosureMirror im = reflect(foo);
+  final im = reflect(foo) as ClosureMirror;
   Expect.throwsTypeError(() => im.apply(['Hello world!']));
 }
 
@@ -124,7 +124,7 @@ void badGenericFactoryInvoke() {
 }
 
 void badGenericStaticInvoke() {
-  final ClosureMirror im = reflect(bar);
+  final im = reflect(bar) as ClosureMirror;
   Expect.throwsTypeError(() => im.apply(['Hello world!']));
 }
 

tests/lib_2/mirrors/basic_types_in_dart_core_test.dart

@@ -10,42 +10,43 @@ import 'package:expect/expect.dart';
 main() {
   LibraryMirror dartcore = currentMirrorSystem().findLibrary(#dart.core);
   ClassMirror cm;
+  TypeMirror tm;
 
-  cm = dartcore.declarations[#int];
+  cm = dartcore.declarations[#int] as ClassMirror;
   Expect.equals(reflectClass(int), cm);
   Expect.equals(#int, cm.simpleName);
 
-  cm = dartcore.declarations[#double];
+  cm = dartcore.declarations[#double] as ClassMirror;
   Expect.equals(reflectClass(double), cm);
   Expect.equals(#double, cm.simpleName);
 
-  cm = dartcore.declarations[#num];
+  cm = dartcore.declarations[#num] as ClassMirror;
   Expect.equals(reflectClass(num), cm);
   Expect.equals(#num, cm.simpleName);
 
-  cm = dartcore.declarations[#bool];
+  cm = dartcore.declarations[#bool] as ClassMirror;
   Expect.equals(reflectClass(bool), cm);
   Expect.equals(#bool, cm.simpleName);
 
-  cm = dartcore.declarations[#String];
+  cm = dartcore.declarations[#String] as ClassMirror;
   Expect.equals(reflectClass(String), cm);
   Expect.equals(#String, cm.simpleName);
 
-  cm = dartcore.declarations[#List];
+  cm = dartcore.declarations[#List] as ClassMirror;
   Expect.equals(reflectClass(List), cm);
   Expect.equals(#List, cm.simpleName);
 
-  cm = dartcore.declarations[#Null];
+  cm = dartcore.declarations[#Null] as ClassMirror;
   Expect.equals(reflectClass(Null), cm);
   Expect.equals(#Null, cm.simpleName);
 
-  cm = dartcore.declarations[#Object];
+  cm = dartcore.declarations[#Object] as ClassMirror;
   Expect.equals(reflectClass(Object), cm);
   Expect.equals(#Object, cm.simpleName);
 
-  cm = dartcore.declarations[#dynamic];
-  Expect.isNull(cm);
+  tm = dartcore.declarations[#dynamic] as TypeMirror;
+  Expect.isNull(tm);
 
-  cm = dartcore.declarations[const Symbol('void')];
-  Expect.isNull(cm);
+  tm = dartcore.declarations[const Symbol('void')] as TypeMirror;
+  Expect.isNull(tm);
 }

tests/lib_2/mirrors/class_mirror_location_test.dart

@@ -34,11 +34,12 @@ enum AnnotatedEnum { SALT, PEPPER }
 // any number of absolute paths.
 expectLocation(
     DeclarationMirror mirror, String uriSuffix, int line, int column) {
-  Uri uri = mirror.location.sourceUri;
+  final location = mirror.location;
+  final uri = location.sourceUri;
   Expect.isTrue(
       uri.toString().endsWith(uriSuffix), "Expected suffix $uriSuffix in $uri");
-  Expect.equals(line, mirror.location.line, "line");
-  Expect.equals(column, mirror.location.column, "column");
+  Expect.equals(line, location.line, "line");
+  Expect.equals(column, location.column, "column");
 }
 
 main() {

tests/lib_2/mirrors/class_mirror_type_variables_expect.dart

@@ -45,8 +45,8 @@ void testA(Env env) {
 
   TypeVariableMirror aT = a.typeVariables[0];
   TypeVariableMirror aS = a.typeVariables[1];
-  ClassMirror aTBound = aT.upperBound;
-  ClassMirror aSBound = aS.upperBound;
+  ClassMirror aTBound = aT.upperBound as ClassMirror;
+  ClassMirror aSBound = aS.upperBound as ClassMirror;
 
   Expect.isTrue(aTBound.isOriginalDeclaration);
   Expect.isTrue(aSBound.isOriginalDeclaration);
@@ -64,8 +64,8 @@ void testBAndC(Env env) {
 
   TypeVariableMirror bZ = b.typeVariables[0];
   TypeVariableMirror cZ = c.typeVariables[0];
-  ClassMirror bZBound = bZ.upperBound;
-  ClassMirror cZBound = cZ.upperBound;
+  ClassMirror bZBound = bZ.upperBound as ClassMirror;
+  ClassMirror cZBound = cZ.upperBound as ClassMirror;
 
   Expect.isFalse(bZBound.isOriginalDeclaration);
   Expect.isFalse(cZBound.isOriginalDeclaration);
@@ -108,7 +108,7 @@ testD(Env env) {
 void testE(Env env) {
   ClassMirror e = env.getE();
   TypeVariableMirror eR = e.typeVariables.single;
-  ClassMirror mapRAndHelperOfString = eR.upperBound;
+  ClassMirror mapRAndHelperOfString = eR.upperBound as ClassMirror;
 
   Expect.isFalse(mapRAndHelperOfString.isOriginalDeclaration);
   Expect.equals(eR, mapRAndHelperOfString.typeArguments.first);
@@ -119,8 +119,8 @@ void testE(Env env) {
 void testF(Env env) {
   ClassMirror f = env.getF();
   TypeVariableMirror fZ = f.typeVariables[0];
-  ClassMirror fZBound = fZ.upperBound;
-  ClassMirror fZBoundTypeArgument = fZBound.typeArguments.single;
+  ClassMirror fZBound = fZ.upperBound as ClassMirror;
+  ClassMirror fZBoundTypeArgument = fZBound.typeArguments.single as ClassMirror;
 
   Expect.equals(1, f.typeVariables.length);
   Expect.isFalse(fZBound.isOriginalDeclaration);

tests/lib_2/mirrors/closurization_equivalence_test.dart

@@ -13,7 +13,7 @@ class C {
 }
 
 main() {
-  LibraryMirror thisLibrary = reflectClass(C).owner;
+  LibraryMirror thisLibrary = reflectClass(C).owner as LibraryMirror;
   Expect.equals(thisLibrary.declarations[#topLevelMethod],
       (reflect(topLevelMethod) as ClosureMirror).function, "topLevel");
 

tests/lib_2/mirrors/constructor_kinds_test.dart

@@ -44,7 +44,7 @@ main() {
   cm = reflectClass(ClassWithDefaultConstructor);
   mm = cm.declarations.values
       .where((d) => d is MethodMirror && d.isConstructor)
-      .single;
+      .single as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isTrue(mm.isGenerativeConstructor);
   Expect.isFalse(mm.isFactoryConstructor);
@@ -53,57 +53,57 @@ main() {
 
   cm = reflectClass(Class);
 
-  mm = cm.declarations[#Class.generativeConstructor];
+  mm = cm.declarations[#Class.generativeConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isTrue(mm.isGenerativeConstructor);
   Expect.isFalse(mm.isFactoryConstructor);
   Expect.isFalse(mm.isRedirectingConstructor);
   Expect.isFalse(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.redirectingGenerativeConstructor];
+  mm = cm.declarations[#Class.redirectingGenerativeConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isTrue(mm.isGenerativeConstructor);
   Expect.isFalse(mm.isFactoryConstructor);
   Expect.isTrue(mm.isRedirectingConstructor);
   Expect.isFalse(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.factoryConstructor];
+  mm = cm.declarations[#Class.factoryConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isFalse(mm.isGenerativeConstructor);
   Expect.isTrue(mm.isFactoryConstructor);
   Expect.isFalse(mm.isRedirectingConstructor);
   Expect.isFalse(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.redirectingFactoryConstructor];
+  mm = cm.declarations[#Class.redirectingFactoryConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isFalse(mm.isGenerativeConstructor);
   Expect.isTrue(mm.isFactoryConstructor);
   Expect.isTrue(mm.isRedirectingConstructor);
   Expect.isFalse(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.constGenerativeConstructor];
+  mm = cm.declarations[#Class.constGenerativeConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isTrue(mm.isGenerativeConstructor);
   Expect.isFalse(mm.isFactoryConstructor);
   Expect.isFalse(mm.isRedirectingConstructor);
   Expect.isTrue(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.constRedirectingGenerativeConstructor];
+  mm = cm.declarations[#Class.constRedirectingGenerativeConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isTrue(mm.isGenerativeConstructor);
   Expect.isFalse(mm.isFactoryConstructor);
   Expect.isTrue(mm.isRedirectingConstructor);
   Expect.isTrue(mm.isConstConstructor);
 
   // Not legal.
-  // mm = cm.declarations[#Class.constFactoryConstructor];
+  // mm = cm.declarations[#Class.constFactoryConstructor] as MethodMirror;
   // Expect.isTrue(mm.isConstructor);
   // Expect.isFalse(mm.isGenerativeConstructor);
   // Expect.isTrue(mm.isFactoryConstructor);
   // Expect.isFalse(mm.isRedirectingConstructor);
   // Expect.isTrue(mm.isConstConstructor);
 
-  mm = cm.declarations[#Class.constRedirectingFactoryConstructor];
+  mm = cm.declarations[#Class.constRedirectingFactoryConstructor] as MethodMirror;
   Expect.isTrue(mm.isConstructor);
   Expect.isFalse(mm.isGenerativeConstructor);
   Expect.isTrue(mm.isFactoryConstructor);

tests/lib_2/mirrors/deferred_mirrors_metadata_lib.dart

@@ -9,13 +9,13 @@ class H {
 
 class F {
   @H()
-  int f;
+  int f = 0;
 }
 
 @C()
 class E {
   @D()
-  var f;
+  dynamic f;
 }
 
 String foo() {

tests/lib_2/mirrors/deferred_mirrors_metatarget_lib.dart

@@ -16,6 +16,7 @@ class A {
 }
 
 String foo() {
-  ClassMirror a = currentMirrorSystem().findLibrary(#lib).declarations[#A];
+  final a =
+      currentMirrorSystem().findLibrary(#lib).declarations[#A] as ClassMirror;
   return a.newInstance(Symbol.empty, []).invoke(#toString, []).reflectee;
 }

tests/lib_2/mirrors/equality_test.dart

@@ -26,9 +26,9 @@ class BadEqualityHash {
 }
 
 typedef bool Predicate(Object o);
-Predicate somePredicate;
+Predicate somePredicate = (Object o) => false;
 
-checkEquality(List<Map> equivalenceClasses) {
+checkEquality(List<Map<String, Object>> equivalenceClasses) {
   for (var equivalenceClass in equivalenceClasses) {
     equivalenceClass.forEach((name, member) {
       equivalenceClass.forEach((otherName, otherMember) {
@@ -61,7 +61,7 @@ main() {
   var badEqualityHash1 = new BadEqualityHash();
   var badEqualityHash2 = new BadEqualityHash();
 
-  checkEquality([
+  checkEquality(<Map<String, Object>>[
     {'reflect(o1)': reflect(o1), 'reflect(o1), again': reflect(o1)},
     {'reflect(o2)': reflect(o2), 'reflect(o2), again': reflect(o2)},
     {

tests/lib_2/mirrors/fake_function_with_call_test.dart

@@ -23,7 +23,7 @@ class WannabeFunction {
 main() {
   Expect.isTrue(new WannabeFunction() is Function);
 
-  ClosureMirror cm = reflect(new WannabeFunction());
+  ClosureMirror cm = reflect(new WannabeFunction()) as ClosureMirror;
   Expect.equals(7, cm.invoke(#call, [3, 4]).reflectee);
   Expect.throwsNoSuchMethodError(() => cm.invoke(#call, [3]), "Wrong arity");
   Expect.equals(49, cm.invoke(#method, [7]).reflectee);