"Reverting 25035"

pkg/docgen/test/single_library_test.dart

 library single_library_test;
 
 import 'dart:io'; 
 
 import 'package:unittest/unittest.dart';
 
 import '../lib/docgen.dart';
 import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
 
 main() {
@@ skipping 39 matching lines @@
       getMirrorSystem(['test.dart'],'', parseSdk: false)
         .then(expectAsync1((mirrorSystem) {
           var testLibraryUri = currentDirectory.resolve('test.dart');
           var library = generateLibrary(mirrorSystem.libraries[testLibraryUri], 
               includePrivate: true);
           expect(library is Library, isTrue);
           
           var classes = library.classes.values;
           expect(classes.every((e) => e is Class), isTrue);
           
-          var classMethodTypes = [];
-          classes.forEach((e) => classMethodTypes.addAll(e.methods.values));
-          expect(classMethodTypes.every((e) => e is Map), isTrue);
-
           var classMethods = [];
-          classMethodTypes.forEach((e) => classMethods.addAll(e.values));
+          classes.forEach((e) => classMethods.addAll(e.methods.values));
           expect(classMethods.every((e) => e is Method), isTrue);
           
           var methodParameters = [];
           classMethods.forEach((e) { 
             methodParameters.addAll(e.parameters.values);
           });
           expect(methodParameters.every((e) => e is Parameter), isTrue);
           
-          var functionTypes = library.functions.values;
-          expect(functionTypes.every((e) => e is Map), isTrue);
-          
-          var functions = [];
-          functionTypes.forEach((e) => functions.addAll(e.values));
+          var functions = library.functions.values;
           expect(functions.every((e) => e is Method), isTrue);
           
           var functionParameters = [];
           functions.forEach((e) {
             functionParameters.addAll(e.parameters.values); 
           });
           expect(functionParameters.every((e) => e is Parameter), isTrue);
     
           var variables = library.variables.values;
           expect(variables.every((e) => e is Variable), isTrue);
@@ skipping 20 matching lines @@
           // Testing something with no reference
           var libraryDocComment = fixReference('foobar', libraryMirror,
               classMirror, methodMirror).children.first.text;
           expect(libraryDocComment == 'foobar', isTrue);
           
           file.deleteSync();
         }));
     });
   });
 }