FieldMirror => VariableMirror

tests/compiler/dart2js/mirrors_test.dart

 // Copyright (c) 2012, 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.
 
 #import("../../../pkg/dartdoc/lib/mirrors.dart");
 #import("../../../pkg/dartdoc/lib/mirrors_util.dart");
 
 #import('dart:io');
 
 int count(Iterable iterable) {
@@ skipping 49 matching lines @@
   Expect.isFalse(classes.isEmpty, "Empty classes map returned");
 
   testFoo(mirrors, helperLibrary, classes);
   testBar(mirrors, helperLibrary, classes);
   testBaz(mirrors, helperLibrary, classes);
   // TODO(johnniwinther): Add test of class [Boz] and typedef [Func].
   // TODO(johnniwinther): Add tests of type argument substitution, which
   // is not currently implemented in dart2js.
   // TODO(johnniwinther): Add tests of Location and Source.
   testPrivate(mirrors, helperLibrary, classes);
-  // TODO(johnniwinther): Add tests  of [LibraryMirror.functions],
-  // [LibraryMirror.getters], [LibraryMirror.setters] and
-  // [LibraryMirror.members].
+  // TODO(johnniwinther): Add thorough tests of [LibraryMirror.functions],
+  // [LibraryMirror.getters], [LibraryMirror.setters], [LibraryMirror.members],
+  // and [LibraryMirror.variable].
+  Expect.isNotNull(helperLibrary.functions);
+  Expect.isNotNull(helperLibrary.members);
+  Expect.isNotNull(helperLibrary.getters);
+  Expect.isNotNull(helperLibrary.setters);
+  Expect.isNotNull(helperLibrary.variables);
 }
 
 // Testing class Foo:
 //
 // class Foo {
 //
 // }
 void testFoo(MirrorSystem system, LibraryMirror helperLibrary,
              Map<String,TypeMirror> classes) {
   var fooClass = classes["Foo"];
@@ skipping 51 matching lines @@
   Expect.isNull(fooClass.defaultFactory);
 
   var fooClassMembers = fooClass.declaredMembers;
   Expect.isNotNull(fooClassMembers, "Declared members map is null");
   Expect.isTrue(fooClassMembers.isEmpty, "Declared members map is unempty");
 
   var fooClassConstructors = fooClass.constructors;
   Expect.isNotNull(fooClassConstructors, "Constructors map is null");
   Expect.isTrue(fooClassConstructors.isEmpty,
                 "Constructors map is unempty");
+
+  // TODO(johnniwinther): Add thorough tests of [ClassMirror.functions],
+  // [ClassMirror.getters], [ClassMirror.setters], [ClassMirror.members],
+  // and [ClassMirror.variable].
+  Expect.isNotNull(fooClass.functions);
+  Expect.isNotNull(fooClass.members);
+  Expect.isNotNull(fooClass.getters);
+  Expect.isNotNull(fooClass.setters);
+  Expect.isNotNull(fooClass.variables);
 }
 
 // Testing interface Bar:
 //
 // interface Bar<E> {
 //
 // }
 void testBar(MirrorSystem system, LibraryMirror helperLibrary,
              Map<String,TypeMirror> classes) {
   var barInterface = classes["Bar"];
@@ skipping 535 matching lines @@
 void testPrivate(MirrorSystem system, LibraryMirror helperLibrary,
                  Map<String,TypeMirror> classes) {
   var privateClass = classes['_PrivateClass'];
   Expect.isNotNull(privateClass);
   Expect.isTrue(privateClass is ClassMirror);
   Expect.isTrue(privateClass.isClass);
   Expect.isTrue(privateClass.isPrivate);
 
   var privateField = privateClass.declaredMembers['_privateField'];
   Expect.isNotNull(privateField);
-  Expect.isTrue(privateField is FieldMirror);
+  Expect.isTrue(privateField is VariableMirror);
   Expect.isTrue(privateField.isPrivate);
 
   var privateGetter = privateClass.declaredMembers['_privateGetter'];
   Expect.isNotNull(privateGetter);
   Expect.isTrue(privateGetter is MethodMirror);
   Expect.isTrue(privateGetter.isGetter);
   Expect.isTrue(privateGetter.isPrivate);
 
   var privateSetter = privateClass.declaredMembers['_privateSetter='];
   Expect.isNotNull(privateSetter);
@@ skipping 13 matching lines @@
   Expect.isTrue(privateConstructor.isConstructor);
   Expect.isTrue(privateConstructor.isPrivate);
 
   var privateFactoryConstructor =
       privateClass.declaredMembers['_PrivateClass._privateFactoryConstructor'];
   Expect.isNotNull(privateFactoryConstructor);
   Expect.isTrue(privateFactoryConstructor is MethodMirror);
   Expect.isTrue(privateFactoryConstructor.isFactory);
   Expect.isTrue(privateFactoryConstructor.isPrivate);
 }