Index: tests/lib/mirrors/instance_members_easier_test.dart |
diff --git a/tests/lib/mirrors/instance_members_test.dart b/tests/lib/mirrors/instance_members_easier_test.dart |
similarity index 56% |
copy from tests/lib/mirrors/instance_members_test.dart |
copy to tests/lib/mirrors/instance_members_easier_test.dart |
index 8f2f4773ee05a0e82161cded0071207fc3bf35b9..530fa425ea2df643dedf19e37ac935ee21f17660 100644 |
--- a/tests/lib/mirrors/instance_members_test.dart |
+++ b/tests/lib/mirrors/instance_members_easier_test.dart |
@@ -7,12 +7,29 @@ library test.instance_members; |
import 'dart:mirrors'; |
import 'package:expect/expect.dart'; |
-import 'declarations_model.dart' as declarations_model; |
+import 'declarations_model_easier.dart' as declarations_model; |
selectKeys(map, predicate) { |
return map.keys.where((key) => predicate(map[key])); |
} |
+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() {} |
+} |
+ |
main() { |
ClassMirror cm = reflectClass(declarations_model.Class); |
@@ -29,12 +46,6 @@ main() { |
#inheritedInstanceGetter, |
const Symbol('inheritedInstanceSetter='), |
#inheritedInstanceMethod, |
- #*, |
- #mixinInstanceVariable, |
- const Symbol('mixinInstanceVariable='), |
- #mixinInstanceGetter, |
- const Symbol('mixinInstanceSetter='), |
- #mixinInstanceMethod, |
#hashCode, |
#runtimeType, |
#==, |
@@ -47,8 +58,31 @@ main() { |
[#instanceVariable, |
const Symbol('instanceVariable='), |
#inheritedInstanceVariable, |
- const Symbol('inheritedInstanceVariable='), |
- #mixinInstanceVariable, |
- const Symbol('mixinInstanceVariable=')], |
+ 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)); |
+ |
+ cm = reflectClass(EasierMixinApplication); |
+ Expect.setEquals( |
+ [#shuper, |
+ #mixin, |
+ #application, |
+ #hashCode, |
+ #runtimeType, |
+ #==, |
+ #noSuchMethod, |
+ #toString], |
+ selectKeys(cm.instanceMembers, (dm) => !dm.isPrivate)); |
} |