Index: tests/lib/mirrors/generic_mixin_test.dart |
diff --git a/tests/lib/mirrors/generic_mixin_test.dart b/tests/lib/mirrors/generic_mixin_test.dart |
index 0e436293698df4271f5a9dc8881a0d330bd89d9d..26ca77c047cdc5a44b043401daaa237f23eb3467 100644 |
--- a/tests/lib/mirrors/generic_mixin_test.dart |
+++ b/tests/lib/mirrors/generic_mixin_test.dart |
@@ -12,7 +12,9 @@ import 'package:expect/expect.dart'; |
import 'generics_helper.dart'; |
class Super<S> {} |
+ |
class Mixin<M> {} |
+ |
class Nixim<N> {} |
class NonGenericMixinApplication1 = Super with Mixin; |
@@ -22,9 +24,11 @@ class GenericMixinApplication1<MA> = Super<MA> with Mixin<MA>; |
class GenericMixinApplication2<MA> = Super<num> with Mixin<String>; |
class NonGenericClass1 extends Super with Mixin {} |
+ |
class NonGenericClass2 extends Super<num> with Mixin<String> {} |
class GenericClass1<C> extends Super<C> with Mixin<C> {} |
+ |
class GenericClass2<C> extends Super<num> with Mixin<String> {} |
class GenericMultipleMixins<A, B, C> extends Super<A> with Mixin<B>, Nixim<C> {} |
@@ -46,58 +50,134 @@ main() { |
typeParameters(reflectClass(GenericClass2).superclass.mixin, [#M]); |
typeParameters(reflectClass(GenericMultipleMixins).mixin, [#A, #B, #C]); |
typeParameters(reflectClass(GenericMultipleMixins).superclass.mixin, [#N]); |
- typeParameters(reflectClass(GenericMultipleMixins).superclass.superclass.mixin, [#M]); |
- typeParameters(reflectClass(GenericMultipleMixins).superclass.superclass.superclass.mixin, [#S]); |
- |
- typeArguments(reflectClass(NonGenericMixinApplication1).mixin, [dynamicMirror]); |
- typeArguments(reflectClass(NonGenericMixinApplication2).mixin, [reflectClass(String)]); |
- typeArguments(reflectClass(GenericMixinApplication1).mixin, [reflectClass(GenericMixinApplication1).typeVariables.single]); |
- typeArguments(reflectClass(GenericMixinApplication2).mixin, [reflectClass(String)]); |
+ typeParameters( |
+ reflectClass(GenericMultipleMixins).superclass.superclass.mixin, [#M]); |
+ typeParameters( |
+ reflectClass(GenericMultipleMixins) |
+ .superclass |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [#S]); |
+ |
+ typeArguments( |
+ reflectClass(NonGenericMixinApplication1).mixin, [dynamicMirror]); |
+ typeArguments( |
+ reflectClass(NonGenericMixinApplication2).mixin, [reflectClass(String)]); |
+ typeArguments(reflectClass(GenericMixinApplication1).mixin, |
+ [reflectClass(GenericMixinApplication1).typeVariables.single]); |
+ typeArguments( |
+ reflectClass(GenericMixinApplication2).mixin, [reflectClass(String)]); |
typeArguments(reflectClass(NonGenericClass1).mixin, []); |
typeArguments(reflectClass(NonGenericClass2).mixin, []); |
typeArguments(reflectClass(GenericClass1).mixin, []); |
typeArguments(reflectClass(GenericClass2).mixin, []); |
- typeArguments(reflectClass(NonGenericClass1).superclass.mixin, [dynamicMirror]); |
- typeArguments(reflectClass(NonGenericClass2).superclass.mixin, [reflectClass(String)]); |
- typeArguments(reflectClass(GenericClass1).superclass.mixin, [reflectClass(GenericClass1).typeVariables.single]); |
- typeArguments(reflectClass(GenericClass2).superclass.mixin, [reflectClass(String)]); |
+ typeArguments( |
+ reflectClass(NonGenericClass1).superclass.mixin, [dynamicMirror]); |
+ typeArguments( |
+ reflectClass(NonGenericClass2).superclass.mixin, [reflectClass(String)]); |
+ typeArguments(reflectClass(GenericClass1).superclass.mixin, |
+ [reflectClass(GenericClass1).typeVariables.single]); |
+ typeArguments( |
+ reflectClass(GenericClass2).superclass.mixin, [reflectClass(String)]); |
typeArguments(reflectClass(GenericMultipleMixins).mixin, []); |
- typeArguments(reflectClass(GenericMultipleMixins).superclass.mixin, [reflectClass(GenericMultipleMixins).typeVariables[2]]); |
- typeArguments(reflectClass(GenericMultipleMixins).superclass.superclass.mixin, [reflectClass(GenericMultipleMixins).typeVariables[1]]); |
- typeArguments(reflectClass(GenericMultipleMixins).superclass.superclass.superclass.mixin, [reflectClass(GenericMultipleMixins).typeVariables[0]]); |
- |
+ typeArguments(reflectClass(GenericMultipleMixins).superclass.mixin, |
+ [reflectClass(GenericMultipleMixins).typeVariables[2]]); |
+ typeArguments(reflectClass(GenericMultipleMixins).superclass.superclass.mixin, |
+ [reflectClass(GenericMultipleMixins).typeVariables[1]]); |
+ typeArguments( |
+ reflectClass(GenericMultipleMixins) |
+ .superclass |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [reflectClass(GenericMultipleMixins).typeVariables[0]]); |
typeParameters(reflect(new NonGenericMixinApplication1()).type.mixin, [#M]); |
typeParameters(reflect(new NonGenericMixinApplication2()).type.mixin, [#M]); |
- typeParameters(reflect(new GenericMixinApplication1<bool>()).type.mixin, [#M]); |
- typeParameters(reflect(new GenericMixinApplication2<bool>()).type.mixin, [#M]); |
+ typeParameters( |
+ reflect(new GenericMixinApplication1<bool>()).type.mixin, [#M]); |
+ typeParameters( |
+ reflect(new GenericMixinApplication2<bool>()).type.mixin, [#M]); |
typeParameters(reflect(new NonGenericClass1()).type.mixin, []); |
typeParameters(reflect(new NonGenericClass2()).type.mixin, []); |
typeParameters(reflect(new GenericClass1<bool>()).type.mixin, [#C]); |
typeParameters(reflect(new GenericClass2<bool>()).type.mixin, [#C]); |
typeParameters(reflect(new NonGenericClass1()).type.superclass.mixin, [#M]); |
typeParameters(reflect(new NonGenericClass2()).type.superclass.mixin, [#M]); |
- typeParameters(reflect(new GenericClass1<bool>()).type.superclass.mixin, [#M]); |
- typeParameters(reflect(new GenericClass2<bool>()).type.superclass.mixin, [#M]); |
- typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type.mixin, [#A, #B, #C]); |
- typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.mixin, [#N]); |
- typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.superclass.mixin, [#M]); |
- typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.superclass.superclass.mixin, [#S]); |
- |
- typeArguments(reflect(new NonGenericMixinApplication1()).type.mixin, [dynamicMirror]); |
- typeArguments(reflect(new NonGenericMixinApplication2()).type.mixin, [reflectClass(String)]); |
- typeArguments(reflect(new GenericMixinApplication1<bool>()).type.mixin, [reflectClass(bool)]); |
- typeArguments(reflect(new GenericMixinApplication2<bool>()).type.mixin, [reflectClass(String)]); |
+ typeParameters( |
+ reflect(new GenericClass1<bool>()).type.superclass.mixin, [#M]); |
+ typeParameters( |
+ reflect(new GenericClass2<bool>()).type.superclass.mixin, [#M]); |
+ typeParameters( |
+ reflect(new GenericMultipleMixins<bool, String, int>()).type.mixin, |
+ [#A, #B, #C]); |
+ typeParameters( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .mixin, |
+ [#N]); |
+ typeParameters( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [#M]); |
+ typeParameters( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [#S]); |
+ |
+ typeArguments( |
+ reflect(new NonGenericMixinApplication1()).type.mixin, [dynamicMirror]); |
+ typeArguments(reflect(new NonGenericMixinApplication2()).type.mixin, |
+ [reflectClass(String)]); |
+ typeArguments(reflect(new GenericMixinApplication1<bool>()).type.mixin, |
+ [reflectClass(bool)]); |
+ typeArguments(reflect(new GenericMixinApplication2<bool>()).type.mixin, |
+ [reflectClass(String)]); |
typeArguments(reflect(new NonGenericClass1()).type.mixin, []); |
typeArguments(reflect(new NonGenericClass2()).type.mixin, []); |
- typeArguments(reflect(new GenericClass1<bool>()).type.mixin, [reflectClass(bool)]); |
- typeArguments(reflect(new GenericClass2<bool>()).type.mixin, [reflectClass(bool)]); |
- typeArguments(reflect(new NonGenericClass1()).type.superclass.mixin, [dynamicMirror]); |
- typeArguments(reflect(new NonGenericClass2()).type.superclass.mixin, [reflectClass(String)]); |
- typeArguments(reflect(new GenericClass1<bool>()).type.superclass.mixin, [reflectClass(bool)]); |
- typeArguments(reflect(new GenericClass2<bool>()).type.superclass.mixin, [reflectClass(String)]); |
- typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type.mixin, [reflectClass(bool), reflectClass(String), reflectClass(int)]); |
- typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.mixin, [reflectClass(int)]); |
- typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.superclass.mixin, [reflectClass(String)]); |
- typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type.superclass.superclass.superclass.mixin, [reflectClass(bool)]); |
+ typeArguments( |
+ reflect(new GenericClass1<bool>()).type.mixin, [reflectClass(bool)]); |
+ typeArguments( |
+ reflect(new GenericClass2<bool>()).type.mixin, [reflectClass(bool)]); |
+ typeArguments( |
+ reflect(new NonGenericClass1()).type.superclass.mixin, [dynamicMirror]); |
+ typeArguments(reflect(new NonGenericClass2()).type.superclass.mixin, |
+ [reflectClass(String)]); |
+ typeArguments(reflect(new GenericClass1<bool>()).type.superclass.mixin, |
+ [reflectClass(bool)]); |
+ typeArguments(reflect(new GenericClass2<bool>()).type.superclass.mixin, |
+ [reflectClass(String)]); |
+ typeArguments( |
+ reflect(new GenericMultipleMixins<bool, String, int>()).type.mixin, |
+ [reflectClass(bool), reflectClass(String), reflectClass(int)]); |
+ typeArguments( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .mixin, |
+ [reflectClass(int)]); |
+ typeArguments( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [reflectClass(String)]); |
+ typeArguments( |
+ reflect(new GenericMultipleMixins<bool, String, int>()) |
+ .type |
+ .superclass |
+ .superclass |
+ .superclass |
+ .mixin, |
+ [reflectClass(bool)]); |
} |