Update mirror tests for removed API.

tests/lib/mirrors/equality_test.dart

 // Copyright (c) 2013, 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.
 
 // This tests uses the multi-test "ok" feature:
 // none: Trimmed behaviour. Passing on the VM.
 // 01: Trimmed version for dart2js.
 // 02: Full version passing in the VM.
 //
 // TODO(rmacnak,ahe): Remove multi-test when VM and dart2js are on par.
@@ skipping 82 matching lines @@
 
     {'reflect(3+4)' : reflect(3+4),
      'reflect(6+1)' : reflect(6+1)},
 
     {'reflect("foo")' : reflect("foo"),
      'reflect("foo"), again' : reflect("foo")},
 
     {'currentMirrorSystem().voidType' : currentMirrorSystem().voidType},  /// 01: ok
 
     {'currentMirrorSystem().voidType' : currentMirrorSystem().voidType,   /// 02: ok
-     'thisLibrary.functions[#subroutine].returnType' :                    /// 02: ok
-          thisLibrary.functions[#subroutine].returnType},  /// 02: ok
+     'thisLibrary.declarations[#subroutine].returnType' :                    /// 02: ok
+          (thisLibrary.declarations[#subroutine] as MethodMirror).returnType},  /// 02: ok
 
     {'currentMirrorSystem().dynamicType' : currentMirrorSystem().dynamicType,
-     'thisLibrary.functions[#main].returnType' :
-          thisLibrary.functions[#main].returnType},
+     'thisLibrary.declarations[#main].returnType' :
+          (thisLibrary.declarations[#main] as MethodMirror).returnType},
 
     {'reflectClass(A)' : reflectClass(A),
-     'thisLibrary.classes[#A]' : thisLibrary.classes[#A],
+     'thisLibrary.declarations[#A]' : thisLibrary.declarations[#A],
      'reflect(new A<int>()).type.originalDeclaration' :
           reflect(new A<int>()).type.originalDeclaration},
 
     {'reflectClass(B).superclass' : reflectClass(B).superclass,  /// 02: ok
      'reflect(new A<int>()).type' : reflect(new A<int>()).type}, /// 02: ok
 
     {'reflectClass(B)' : reflectClass(B),
-     'thisLibrary.classes[#B]' : thisLibrary.classes[#B],
+     'thisLibrary.declarations[#B]' : thisLibrary.declarations[#B],
      'reflect(new B()).type' : reflect(new B()).type},
 
-    {'reflectClass(BadEqualityHash).methods[#==]'  /// 02: ok
-        : reflectClass(BadEqualityHash).methods[#==],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.methods[#==]'  /// 02: ok
-        : reflect(new BadEqualityHash()).type.methods[#==]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#==]'  /// 02: ok
+        : reflectClass(BadEqualityHash).declarations[#==],  /// 02: ok
+     'reflect(new BadEqualityHash()).type.declarations[#==]'  /// 02: ok
+        : reflect(new BadEqualityHash()).type.declarations[#==]},  /// 02: ok
 
-    {'reflectClass(BadEqualityHash).methods[#==].parameters[0]'  /// 02: ok
-        : reflectClass(BadEqualityHash).methods[#==].parameters[0],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.methods[#==].parameters[0]'  /// 02: ok
-        : reflect(new BadEqualityHash()).type.methods[#==].parameters[0]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#==].parameters[0]'  /// 02: ok
+        : (reflectClass(BadEqualityHash).declarations[#==] as MethodMirror).parameters[0],  /// 02: ok
+     'reflect(new BadEqualityHash()).type.declarations[#==].parameters[0]'  /// 02: ok
+        : (reflect(new BadEqualityHash()).type.declarations[#==] as MethodMirror).parameters[0]},  /// 02: ok
 
-    {'reflectClass(BadEqualityHash).variables[#count]'  /// 02: ok
-        : reflectClass(BadEqualityHash).variables[#count],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.variables[#count]'  /// 02: ok
-        : reflect(new BadEqualityHash()).type.variables[#count]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#count]'  /// 02: ok
+        : reflectClass(BadEqualityHash).declarations[#count],  /// 02: ok
+     'reflect(new BadEqualityHash()).type.declarations[#count]'  /// 02: ok
+        : reflect(new BadEqualityHash()).type.declarations[#count]},  /// 02: ok
 
     {'reflectType(Predicate)' : reflectType(Predicate),  /// 02: ok
-     'thisLibrary.variables[#somePredicate].type'  /// 02: ok
-        : thisLibrary.variables[#somePredicate].type},  /// 02: ok
+     'thisLibrary.declarations[#somePredicate].type'  /// 02: ok
+        : (thisLibrary.declarations[#somePredicate] as VariableMirror).type},  /// 02: ok
 
     {'reflectType(Predicate).referent' : (reflectType(Predicate) as TypedefMirror).referent,  /// 02: ok
-     'thisLibrary.variables[#somePredicate].type.referent'  /// 02: ok
-        : (thisLibrary.variables[#somePredicate].type as TypedefMirror).referent},  /// 02: ok
+     'thisLibrary.declarations[#somePredicate].type.referent'  /// 02: ok
+        : ((thisLibrary.declarations[#somePredicate] as VariableMirror).type as TypedefMirror).referent},  /// 02: ok
 
     {'reflectClass(A).typeVariables.single'  /// 02: ok
         : reflectClass(A).typeVariables.single,  /// 02: ok
      'reflect(new A<int>()).type.originalDeclaration.typeVariables.single'  /// 02: ok
         : reflect(new A<int>()).type.originalDeclaration.typeVariables.single},  /// 02: ok
 
     {'currentMirrorSystem()' : currentMirrorSystem()},
 
     {'currentMirrorSystem().isolate' : currentMirrorSystem().isolate},
 
     {'thisLibrary' : thisLibrary,
      'reflectClass(A).owner' : reflectClass(A).owner,
      'reflectClass(B).owner' : reflectClass(B).owner,
      'reflect(new A()).type.owner' : reflect(new A()).type.owner,
      'reflect(new B()).type.owner' : reflect(new B()).type.owner},
   ]);
 }