| Index: tests/lib_strong/mirrors/instance_members_with_override_test.dart
|
| diff --git a/tests/lib_strong/mirrors/instance_members_with_override_test.dart b/tests/lib_strong/mirrors/instance_members_with_override_test.dart
|
| index 17c0b35c9fef53ce34079f5f18e8408393fbb4d6..9cefc0b22c86ffcfca0fa79081c3ee63889dfcaf 100644
|
| --- a/tests/lib_strong/mirrors/instance_members_with_override_test.dart
|
| +++ b/tests/lib_strong/mirrors/instance_members_with_override_test.dart
|
| @@ -9,13 +9,16 @@ import 'package:expect/expect.dart';
|
| import 'package:meta/meta.dart' show virtual;
|
|
|
| class S {
|
| - @virtual var field;
|
| - @virtual final finalField = 0;
|
| + @virtual
|
| + var field;
|
| + @virtual
|
| + final finalField = 0;
|
| method() {}
|
| get getter {}
|
| set setter(x) {}
|
| notOverridden() {}
|
| }
|
| +
|
| abstract class C extends S {
|
| var field;
|
| final finalField = 0;
|
| @@ -33,20 +36,20 @@ main() {
|
| ClassMirror sMirror = reflectClass(S);
|
| ClassMirror cMirror = reflectClass(C);
|
|
|
| - Expect.setEquals(
|
| - [#field,
|
| - const Symbol('field='),
|
| - #finalField,
|
| - #method,
|
| - #getter,
|
| - const Symbol('setter='),
|
| - #notOverridden,
|
| - #hashCode,
|
| - #runtimeType,
|
| - #==,
|
| - #noSuchMethod,
|
| - #toString],
|
| - selectKeys(sMirror.instanceMembers, (dm) => !dm.isPrivate));
|
| + Expect.setEquals([
|
| + #field,
|
| + const Symbol('field='),
|
| + #finalField,
|
| + #method,
|
| + #getter,
|
| + const Symbol('setter='),
|
| + #notOverridden,
|
| + #hashCode,
|
| + #runtimeType,
|
| + #==,
|
| + #noSuchMethod,
|
| + #toString
|
| + ], selectKeys(sMirror.instanceMembers, (dm) => !dm.isPrivate));
|
| // Filter out private to avoid implementation-specific members of Object.
|
|
|
| Expect.equals(sMirror, sMirror.instanceMembers[#field].owner);
|
| @@ -54,30 +57,32 @@ main() {
|
| Expect.equals(sMirror, sMirror.instanceMembers[#finalField].owner);
|
| Expect.equals(sMirror, sMirror.instanceMembers[#method].owner);
|
| Expect.equals(sMirror, sMirror.instanceMembers[#getter].owner);
|
| - Expect.equals(sMirror,sMirror.instanceMembers[const Symbol('setter=')].owner);
|
| + Expect.equals(
|
| + sMirror, sMirror.instanceMembers[const Symbol('setter=')].owner);
|
|
|
| - Expect.setEquals(
|
| - [#field,
|
| - const Symbol('field='),
|
| - #finalField,
|
| - #method,
|
| - #getter,
|
| - const Symbol('setter='),
|
| - #notOverridden,
|
| - #hashCode,
|
| - #runtimeType,
|
| - #==,
|
| - #noSuchMethod,
|
| - #toString],
|
| - selectKeys(cMirror.instanceMembers, (dm) => !dm.isPrivate));
|
| + Expect.setEquals([
|
| + #field,
|
| + const Symbol('field='),
|
| + #finalField,
|
| + #method,
|
| + #getter,
|
| + const Symbol('setter='),
|
| + #notOverridden,
|
| + #hashCode,
|
| + #runtimeType,
|
| + #==,
|
| + #noSuchMethod,
|
| + #toString
|
| + ], selectKeys(cMirror.instanceMembers, (dm) => !dm.isPrivate));
|
| // Filter out private to avoid implementation-specific members of Object.
|
| -
|
| +
|
| Expect.equals(cMirror, cMirror.instanceMembers[#field].owner);
|
| Expect.equals(cMirror, cMirror.instanceMembers[const Symbol('field=')].owner);
|
| Expect.equals(cMirror, cMirror.instanceMembers[#finalField].owner);
|
| Expect.equals(cMirror, cMirror.instanceMembers[#method].owner);
|
| Expect.equals(cMirror, cMirror.instanceMembers[#getter].owner);
|
| - Expect.equals(cMirror,cMirror.instanceMembers[const Symbol('setter=')].owner);
|
| + Expect.equals(
|
| + cMirror, cMirror.instanceMembers[const Symbol('setter=')].owner);
|
|
|
| Expect.equals(sMirror, sMirror.instanceMembers[#notOverridden].owner);
|
| Expect.equals(sMirror, cMirror.instanceMembers[#notOverridden].owner);
|
|
|