Parameters with function types supported + Added features in mirrors implementation

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("../../../lib/dartdoc/mirrors/mirrors.dart");
 #import("../../../lib/dartdoc/mirrors/mirrors_util.dart");
 
 #import('dart:io');
 
 int count(Iterable iterable) {
@@ skipping 423 matching lines @@
                 "Parameter default value is non-null");
   Expect.isFalse(method2Parameter1.isOptional(), "Parameter is optional");
   var method2Parameter2 = method2Parameters[1];
   Expect.isNotNull(method2Parameter2, "Parameter is null");
   Expect.equals(bazF, method2Parameter2.type());
   Expect.stringEquals("f", method2Parameter2.simpleName(),
                       "Unexpected parameter simpleName");
   Expect.stringEquals("mirrors_helper.Baz.method2#f",
                       method2Parameter2.qualifiedName(),
                       "Unexpected parameter qualifiedName");
-  // TODO(johnniwinther): Should return true:
-  Expect.isFalse(method2Parameter2.hasDefaultValue(),
+  Expect.isTrue(method2Parameter2.hasDefaultValue(),
                  "Parameter has default value");
-  // TODO(johnniwinther): Should return a non-null value:
-  Expect.isNull(method2Parameter2.defaultValue(),
-                "Parameter default value is non-null");
+  Expect.stringEquals("null", method2Parameter2.defaultValue(),
+                      "Parameter default value is non-null");
   Expect.isTrue(method2Parameter2.isOptional(), "Parameter is not optional");
 
   ////////////////////////////////////////////////////////////////////////////
   // void method3(E func1(F f), Func<E,F> func2) {}
   ////////////////////////////////////////////////////////////////////////////
   var method3 = findMirror(bazClassMembers, "method3");
   Expect.isNotNull(method3, "method3 not found");
   Expect.stringEquals('method3', method3.simpleName(),
                       "Unexpected method simpleName");
   Expect.stringEquals('mirrors_helper.Baz.method3', method3.qualifiedName(),
@@ skipping 18 matching lines @@
                 "Method operatorName is non-null");
 
   Expect.equals(voidType, method3.returnType(), "Return type is not void");
 
   var method3Parameters = method3.parameters();
   Expect.isNotNull(method3Parameters, "Method parameters is null");
   Expect.equals(2, method3Parameters.length, "Unexpected parameter count");
   var method3Parameter1 = method3Parameters[0];
   Expect.isNotNull(method3Parameter1, "Parameter is null");
   // TODO(johnniwinther): Should return the function type E func(F f):
-  Expect.equals(dynamicType, method3Parameter1.type());
+  var method3Parameter1type = method3Parameter1.type();
+  Expect.isNotNull(method3Parameter1type, "Parameter type of 'func1' is null");
+  Expect.isTrue(method3Parameter1type is FunctionTypeMirror,
+                "Parameter type of 'func1' is not a function");
+  Expect.equals(bazE, method3Parameter1type.returnType(),
+                "Return type of 'func1' is not a E");
+  Expect.isNotNull(method3Parameter1type.parameters(),
+                "Parameters of 'func1' is null");
+  Expect.equals(1, method3Parameter1type.parameters().length,
+                "Unexpected parameter count of 'func1'");
+  Expect.equals(bazE, method3Parameter1type.returnType(),
+                "Return type of 'func1' is not a E");
+  Expect.isNotNull(method3Parameter1type.parameters()[0],
+                "Parameter 1 of 'func1' is null");
+  Expect.stringEquals('f', method3Parameter1type.parameters()[0].simpleName(),
+                "Unexpected name parameter 1 of 'func1'");
+  Expect.equals(bazF, method3Parameter1type.parameters()[0].type(),
+                "Return type of 'func1' is not a F");
   Expect.stringEquals("func1", method3Parameter1.simpleName(),
                       "Unexpected parameter simpleName");
   Expect.stringEquals("mirrors_helper.Baz.method3#func1",
                       method3Parameter1.qualifiedName(),
                       "Unexpected parameter qualifiedName");
   Expect.isFalse(method3Parameter1.hasDefaultValue(),
                  "Parameter has default value");
   Expect.isNull(method3Parameter1.defaultValue(),
                 "Parameter default value is non-null");
   Expect.isFalse(method3Parameter1.isOptional(), "Parameter is optional");
@@ skipping 43 matching lines @@
                 "Type variables is non-empty");
   // TODO(johnniwinther): Provide access to the definition type.
   Expect.isNull(funcTypedef.definition(), "Typedef definition is not null");
 
   Expect.stringEquals("func2", method3Parameter2.simpleName(),
                       "Unexpected parameter simpleName");
   Expect.stringEquals("mirrors_helper.Baz.method3#func2",
                       method3Parameter2.qualifiedName(),
                       "Unexpected parameter qualifiedName");
   Expect.isFalse(method3Parameter2.hasDefaultValue(),
-                 "Parameter has default value");
+                 "Parameter 'func2' has default value: "
+                 "${method3Parameter2.defaultValue()}");
   Expect.isNull(method3Parameter2.defaultValue(),
                 "Parameter default value is non-null");
   Expect.isFalse(method3Parameter2.isOptional(), "Parameter is optional");
 
   ////////////////////////////////////////////////////////////////////////////
   // bool operator==(Object other) => return false;
   ////////////////////////////////////////////////////////////////////////////
   var operator_eq = findMirror(bazClassMembers, "operator", operatorName: '==');
   Expect.isNotNull(operator_eq, "operator == not found");
   Expect.stringEquals('operator', operator_eq.simpleName(),
@@ skipping 51 matching lines @@
   Expect.stringEquals('negate', operator_negate.operatorName,
                       "Unexpected operatorName");
 
 
   var bazClassConstructors = bazClass.constructors();
   Expect.isNotNull(bazClassConstructors, "Constructors map is null");
   Expect.equals(3, bazClassConstructors.length,
                 "Unexpected number of constructors");
   // TODO(johnniwinther): Add tests of constructors.
 }