Chromium Code Reviews| Index: tests/lib/mirrors/mixin_application_test.dart |
| diff --git a/tests/lib/mirrors/mixin_test.dart b/tests/lib/mirrors/mixin_application_test.dart |
| similarity index 82% |
| copy from tests/lib/mirrors/mixin_test.dart |
| copy to tests/lib/mirrors/mixin_application_test.dart |
| index 4a21544bb296e41e7cc5b84d71c7976983e63ae2..506b026763b0216f15020360a67b56158e807bd1 100644 |
| --- a/tests/lib/mirrors/mixin_test.dart |
| +++ b/tests/lib/mirrors/mixin_application_test.dart |
| @@ -7,7 +7,7 @@ |
| // versa. |
| // TODO(ahe): When both implementations agree, remove the multi-test parts. |
| -library test.mixin_test; |
| +library test.mixin_application_test; |
| import 'dart:mirrors'; |
| @@ -63,7 +63,7 @@ expectSame(ClassMirror a, ClassMirror b) { |
| testMixin() { |
| checkClass(Mixin, [ |
| - 'Class(s(Mixin) in s(test.mixin_test), top-level)', |
| + 'Class(s(Mixin) in s(test.mixin_application_test), top-level)', |
| 'Class(s(Object) in s(dart.core), top-level)', |
| ]); |
| @@ -78,7 +78,7 @@ testMixin() { |
| testMixin2() { |
| checkClass(Mixin2, [ |
| - 'Class(s(Mixin2) in s(test.mixin_test), top-level)', |
| + 'Class(s(Mixin2) in s(test.mixin_application_test), top-level)', |
| 'Class(s(Object) in s(dart.core), top-level)', |
| ]); |
| @@ -93,7 +93,7 @@ testMixin2() { |
| testMixinApplication() { |
| checkClass(MixinApplication, [ |
| - 'Class(s(MixinApplication) in s(test.mixin_test), top-level)', |
| + 'Class(s(MixinApplication) in s(test.mixin_application_test), top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -116,11 +116,11 @@ testMixinApplication() { |
| testMixinApplicationA() { |
| // TODO(ahe): I don't think an anonymous mixin has an owner. |
| - String owner = ' in s(test.mixin_test)'; |
| + String owner = ' in s(test.mixin_application_test)'; |
| owner = ''; /// 01: ok |
| checkClass(MixinApplicationA, [ |
| - 'Class(s(MixinApplicationA) in s(test.mixin_test), top-level)', |
| - 'Class(s(test.model.C with test.mixin_test.Mixin)$owner, top-level)', |
| + 'Class(s(MixinApplicationA) in s(test.mixin_application_test), top-level)', |
|
ahe
2013/10/15 06:58:48
Long line, more below.
rmacnak
2013/10/15 16:55:30
Got 'em.
|
| + 'Class(s(test.model.C with test.mixin_application_test.Mixin)$owner, top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -144,7 +144,7 @@ testMixinApplicationA() { |
| ' m: Method(s(m) in s(Mixin))}', |
| reflectClass(MixinApplicationA).superclass.members); |
| - String name = 'test.model.C with test.mixin_test.Mixin'; |
| + String name = 'test.model.C with test.mixin_application_test.Mixin'; |
| name = 'Mixin'; /// 01: ok |
| expect( |
| '{$name:' |
| @@ -159,7 +159,7 @@ testMixinApplicationA() { |
| testUnusedMixinApplication() { |
| checkClass(UnusedMixinApplication, [ |
| - 'Class(s(UnusedMixinApplication) in s(test.mixin_test), top-level)', |
| + 'Class(s(UnusedMixinApplication) in s(test.mixin_application_test), top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -182,11 +182,11 @@ testUnusedMixinApplication() { |
| } |
| testSubclass() { |
| - String owner = ' in s(test.mixin_test)'; |
| + String owner = ' in s(test.mixin_application_test)'; |
| owner = ''; /// 01: ok |
| checkClass(Subclass, [ |
| - 'Class(s(Subclass) in s(test.mixin_test), top-level)', |
| - 'Class(s(test.model.C with test.mixin_test.Mixin)$owner, top-level)', |
| + 'Class(s(Subclass) in s(test.mixin_application_test), top-level)', |
| + 'Class(s(test.model.C with test.mixin_application_test.Mixin)$owner, top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -206,7 +206,7 @@ testSubclass() { |
| ' m: Method(s(m) in s(Mixin))}', |
| reflectClass(Subclass).superclass.members); |
| - String name = 'test.model.C with test.mixin_test.Mixin'; |
| + String name = 'test.model.C with test.mixin_application_test.Mixin'; |
| name = 'Mixin'; /// 01: ok |
| expect( |
| '{$name:' |
| @@ -221,8 +221,8 @@ testSubclass() { |
| testSubclass2() { |
| checkClass(Subclass2, [ |
| - 'Class(s(Subclass2) in s(test.mixin_test), top-level)', |
| - 'Class(s(MixinApplication) in s(test.mixin_test), top-level)', |
| + 'Class(s(Subclass2) in s(test.mixin_application_test), top-level)', |
| + 'Class(s(MixinApplication) in s(test.mixin_application_test), top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -244,13 +244,13 @@ testSubclass2() { |
| testSubclassA() { |
| // TODO(ahe): I don't think an anonymous mixin has an owner. |
| - String owner = ' in s(test.mixin_test)'; |
| + String owner = ' in s(test.mixin_application_test)'; |
| owner = ''; /// 01: ok |
| checkClass(SubclassA, [ |
| - 'Class(s(SubclassA) in s(test.mixin_test), top-level)', |
| - 'Class(s(test.model.C with test.mixin_test.Mixin, test.mixin_test.Mixin2)' |
| + 'Class(s(SubclassA) in s(test.mixin_application_test), top-level)', |
| + 'Class(s(test.model.C with test.mixin_application_test.Mixin, test.mixin_application_test.Mixin2)' |
| '$owner, top-level)', |
| - 'Class(s(test.model.C with test.mixin_test.Mixin)$owner, top-level)', |
| + 'Class(s(test.model.C with test.mixin_application_test.Mixin)$owner, top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |
| 'Class(s(A) in s(test.model), top-level)', |
| @@ -271,7 +271,7 @@ testSubclassA() { |
| reflectClass(SubclassA).superclass.members); |
| String name = |
| - 'test.model.C with test.mixin_test.Mixin, test.mixin_test.Mixin2'; |
| + 'test.model.C with test.mixin_application_test.Mixin, test.mixin_application_test.Mixin2'; |
| name = 'Mixin2'; /// 01: ok |
| expect( |
| '{$name: Method(s($name) in s($name), constructor)}', |
| @@ -282,7 +282,7 @@ testSubclassA() { |
| ' m: Method(s(m) in s(Mixin))}', |
| reflectClass(SubclassA).superclass.superclass.members); |
| - name = 'test.model.C with test.mixin_test.Mixin'; |
| + name = 'test.model.C with test.mixin_application_test.Mixin'; |
| name = 'Mixin'; /// 01: ok |
| expect( |
| '{$name:' |
| @@ -297,12 +297,12 @@ testSubclassA() { |
| testSubclass2A() { |
| // TODO(ahe): I don't think an anonymous mixin has an owner. |
| - String owner = ' in s(test.mixin_test)'; |
| + String owner = ' in s(test.mixin_application_test)'; |
| owner = ''; /// 01: ok |
| checkClass(Subclass2A, [ |
| - 'Class(s(Subclass2A) in s(test.mixin_test), top-level)', |
| - 'Class(s(MixinApplicationA) in s(test.mixin_test), top-level)', |
| - 'Class(s(test.model.C with test.mixin_test.Mixin)$owner,' |
| + 'Class(s(Subclass2A) in s(test.mixin_application_test), top-level)', |
| + 'Class(s(MixinApplicationA) in s(test.mixin_application_test), top-level)', |
| + 'Class(s(test.model.C with test.mixin_application_test.Mixin)$owner,' |
| ' top-level)', |
| 'Class(s(C) in s(test.model), top-level)', |
| 'Class(s(B) in s(test.model), top-level)', |