Change surroundingDeclaration to DeclarationMirror.owner

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 324 matching lines @@
 
   ////////////////////////////////////////////////////////////////////////////
   // static method1(e) {}
   ////////////////////////////////////////////////////////////////////////////
   var method1 = bazClassMembers["method1"];
   Expect.isNotNull(method1, "method1 not found");
   Expect.stringEquals('method1', method1.simpleName,
                       "Unexpected method simpleName");
   Expect.stringEquals('mirrors_helper.Baz.method1', method1.qualifiedName,
                       "Unexpected method qualifiedName");
-  Expect.equals(method1.surroundingDeclaration, bazClass,
+  Expect.equals(method1.owner, bazClass,
                 "Unexpected surrounding declaration");
   Expect.isFalse(method1.isTopLevel, "Method is top level");
   Expect.isFalse(method1.isConstructor, "Method is constructor");
   Expect.isFalse(method1.isField, "Method is field");
   Expect.isTrue(method1.isMethod, "Method is not method");
   Expect.isFalse(method1.isPrivate, "Method is private");
   Expect.isTrue(method1.isStatic, "Method is not static");
   Expect.isTrue(method1 is MethodMirror, "Method is not MethodMirror");
   Expect.isFalse(method1.isConst, "Method is const");
   Expect.isFalse(method1.isFactory, "Method is factory");
@@ skipping 33 matching lines @@
 
   ////////////////////////////////////////////////////////////////////////////
   // static void method2(E e, [F f = null]) {}
   ////////////////////////////////////////////////////////////////////////////
   var method2 = bazClassMembers["method2"];
   Expect.isNotNull(method2, "method2 not found");
   Expect.stringEquals('method2', method2.simpleName,
                       "Unexpected method simpleName");
   Expect.stringEquals('mirrors_helper.Baz.method2', method2.qualifiedName,
                       "Unexpected method qualifiedName");
-  Expect.equals(method2.surroundingDeclaration, bazClass,
+  Expect.equals(method2.owner, bazClass,
                 "Unexpected surrounding declaration");
   Expect.isFalse(method2.isTopLevel, "Method is top level");
   Expect.isFalse(method2.isConstructor, "Method is constructor");
   Expect.isFalse(method2.isField, "Method is field");
   Expect.isTrue(method2.isMethod, "Method is not method");
   Expect.isFalse(method2.isPrivate, "Method is private");
   Expect.isFalse(method2.isStatic, "Method is static");
   Expect.isTrue(method2 is MethodMirror, "Method is not MethodMirror");
   Expect.isFalse(method2.isConst, "Method is const");
   Expect.isFalse(method2.isFactory, "Method is factory");
@@ skipping 46 matching lines @@
 
   ////////////////////////////////////////////////////////////////////////////
   // Baz<E,F> method3(E func1(F f), Func<E,F> func2) => null;
   ////////////////////////////////////////////////////////////////////////////
   var method3 = bazClassMembers["method3"];
   Expect.isNotNull(method3, "method3 not found");
   Expect.stringEquals('method3', method3.simpleName,
                       "Unexpected method simpleName");
   Expect.stringEquals('mirrors_helper.Baz.method3', method3.qualifiedName,
                       "Unexpected method qualifiedName");
-  Expect.equals(method3.surroundingDeclaration, bazClass,
+  Expect.equals(method3.owner, bazClass,
                       "Unexpected surrounding declaration");
   Expect.isFalse(method3.isTopLevel, "Method is top level");
   Expect.isFalse(method3.isConstructor, "Method is constructor");
   Expect.isFalse(method3.isField, "Method is field");
   Expect.isTrue(method3.isMethod, "Method is not method");
   Expect.isFalse(method3.isPrivate, "Method is private");
   Expect.isFalse(method3.isStatic, "Method is static");
   Expect.isTrue(method3 is MethodMirror, "Method is not MethodMirror");
   Expect.isFalse(method3.isConst, "Method is const");
   Expect.isFalse(method3.isFactory, "Method is factory");
@@ skipping 110 matching lines @@
   // bool operator==(Object other) => false;
   ////////////////////////////////////////////////////////////////////////////
   var operator_eq = bazClassMembers['=='];
   Expect.isNotNull(operator_eq, "operator == not found");
   Expect.stringEquals('==', operator_eq.simpleName,
                       "Unexpected method simpleName");
   Expect.stringEquals('operator ==', operator_eq.displayName);
   Expect.stringEquals('mirrors_helper.Baz.==',
                       operator_eq.qualifiedName,
                       "Unexpected method qualifiedName");
-  Expect.equals(operator_eq.surroundingDeclaration, bazClass,
+  Expect.equals(operator_eq.owner, bazClass,
                 "Unexpected surrounding declaration");
   Expect.isFalse(operator_eq.isTopLevel, "Method is top level");
   Expect.isFalse(operator_eq.isConstructor, "Method is constructor");
   Expect.isFalse(operator_eq.isField, "Method is field");
   Expect.isTrue(operator_eq.isMethod, "Method is not method");
   Expect.isFalse(operator_eq.isPrivate, "Method is private");
   Expect.isFalse(operator_eq.isStatic, "Method is static");
   Expect.isTrue(operator_eq is MethodMirror, "Method is not MethodMirror");
   Expect.isFalse(operator_eq.isConst, "Method is const");
   Expect.isFalse(operator_eq.isFactory, "Method is factory");
   Expect.isNull(operator_eq.constructorName,
                 "Method constructorName is non-null");
   Expect.isFalse(operator_eq.isGetter, "Method is getter");
   Expect.isFalse(operator_eq.isSetter, "Method is setter");
   Expect.isTrue(operator_eq.isOperator, "Method is not operator");
   Expect.stringEquals('==', operator_eq.operatorName,
                       "Unexpected operatorName");
 
   ////////////////////////////////////////////////////////////////////////////
   // int operator -() => 0;
   ////////////////////////////////////////////////////////////////////////////
   var operator_negate = bazClassMembers[Mirror.UNARY_MINUS];
   Expect.isNotNull(operator_negate, "operator < not found");
   Expect.stringEquals(Mirror.UNARY_MINUS, operator_negate.simpleName,
                       "Unexpected method simpleName");
   Expect.stringEquals('operator -', operator_negate.displayName);
   Expect.stringEquals('mirrors_helper.Baz.${Mirror.UNARY_MINUS}',
                       operator_negate.qualifiedName,
                       "Unexpected method qualifiedName");
-  Expect.equals(operator_negate.surroundingDeclaration, bazClass,
+  Expect.equals(operator_negate.owner, bazClass,
                 "Unexpected surrounding declaration");
   Expect.isFalse(operator_negate.isTopLevel, "Method is top level");
   Expect.isFalse(operator_negate.isConstructor, "Method is constructor");
   Expect.isFalse(operator_negate.isField, "Method is field");
   Expect.isTrue(operator_negate.isMethod, "Method is not method");
   Expect.isFalse(operator_negate.isPrivate, "Method is private");
   Expect.isFalse(operator_negate.isStatic, "Method is static");
   Expect.isTrue(operator_negate is MethodMirror,
                 "Method is not MethodMirror");
   Expect.isFalse(operator_negate.isConst, "Method is const");
@@ skipping 94 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);
 }