| Index: tests/lib/mirrors/instance_members_easier_test.dart
|
| diff --git a/tests/lib/mirrors/instance_members_easier_test.dart b/tests/lib/mirrors/instance_members_easier_test.dart
|
| index 530fa425ea2df643dedf19e37ac935ee21f17660..4a9fe66afeada5549518be4c1d036bb8bd2bc541 100644
|
| --- a/tests/lib/mirrors/instance_members_easier_test.dart
|
| +++ b/tests/lib/mirrors/instance_members_easier_test.dart
|
| @@ -17,14 +17,17 @@ class EasierSuperclass {
|
| shuper() {}
|
| static staticShuper() {}
|
| }
|
| +
|
| class EasierMixin {
|
| mixin() {}
|
| static staticMixin() {}
|
| }
|
| +
|
| class EasierMixinApplication extends EasierSuperclass with EasierMixin {
|
| application() {}
|
| static staticApplication() {}
|
| }
|
| +
|
| class Derived extends EasierMixinApplication {
|
| derived() {}
|
| static staticDerived() {}
|
| @@ -33,56 +36,56 @@ class Derived extends EasierMixinApplication {
|
| main() {
|
| ClassMirror cm = reflectClass(declarations_model.Class);
|
|
|
| - Expect.setEquals(
|
| - [#+,
|
| - #instanceVariable,
|
| - const Symbol('instanceVariable='),
|
| - #instanceGetter,
|
| - const Symbol('instanceSetter='),
|
| - #instanceMethod,
|
| - #-,
|
| - #inheritedInstanceVariable,
|
| - const Symbol('inheritedInstanceVariable='),
|
| - #inheritedInstanceGetter,
|
| - const Symbol('inheritedInstanceSetter='),
|
| - #inheritedInstanceMethod,
|
| - #hashCode,
|
| - #runtimeType,
|
| - #==,
|
| - #noSuchMethod,
|
| - #toString],
|
| - selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
| + Expect.setEquals([
|
| + #+,
|
| + #instanceVariable,
|
| + const Symbol('instanceVariable='),
|
| + #instanceGetter,
|
| + const Symbol('instanceSetter='),
|
| + #instanceMethod,
|
| + #-,
|
| + #inheritedInstanceVariable,
|
| + const Symbol('inheritedInstanceVariable='),
|
| + #inheritedInstanceGetter,
|
| + const Symbol('inheritedInstanceSetter='),
|
| + #inheritedInstanceMethod,
|
| + #hashCode,
|
| + #runtimeType,
|
| + #==,
|
| + #noSuchMethod,
|
| + #toString
|
| + ], selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
| // Filter out private to avoid implementation-specific members of Object.
|
|
|
| - Expect.setEquals(
|
| - [#instanceVariable,
|
| - const Symbol('instanceVariable='),
|
| - #inheritedInstanceVariable,
|
| - const Symbol('inheritedInstanceVariable=')],
|
| - selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate && dm.isSynthetic));
|
| + Expect.setEquals([
|
| + #instanceVariable,
|
| + const Symbol('instanceVariable='),
|
| + #inheritedInstanceVariable,
|
| + const Symbol('inheritedInstanceVariable=')
|
| + ], selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate && dm.isSynthetic));
|
|
|
| cm = reflectClass(Derived);
|
| - Expect.setEquals(
|
| - [#derived,
|
| - #shuper,
|
| - #mixin,
|
| - #application,
|
| - #hashCode,
|
| - #runtimeType,
|
| - #==,
|
| - #noSuchMethod,
|
| - #toString],
|
| - selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
| + Expect.setEquals([
|
| + #derived,
|
| + #shuper,
|
| + #mixin,
|
| + #application,
|
| + #hashCode,
|
| + #runtimeType,
|
| + #==,
|
| + #noSuchMethod,
|
| + #toString
|
| + ], selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
|
|
| cm = reflectClass(EasierMixinApplication);
|
| - Expect.setEquals(
|
| - [#shuper,
|
| - #mixin,
|
| - #application,
|
| - #hashCode,
|
| - #runtimeType,
|
| - #==,
|
| - #noSuchMethod,
|
| - #toString],
|
| - selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
| + Expect.setEquals([
|
| + #shuper,
|
| + #mixin,
|
| + #application,
|
| + #hashCode,
|
| + #runtimeType,
|
| + #==,
|
| + #noSuchMethod,
|
| + #toString
|
| + ], selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate));
|
| }
|
|
|