| Index: tests/lib/mirrors/generic_mixin_applications_test.dart
|
| diff --git a/tests/lib/mirrors/generic_mixin_applications_test.dart b/tests/lib/mirrors/generic_mixin_applications_test.dart
|
| index f01524fff9459a0bfd29970749ffe9c27912a1b6..c28d3b02672324e7b691e71ed42e1ed2b9d54dd6 100644
|
| --- a/tests/lib/mirrors/generic_mixin_applications_test.dart
|
| +++ b/tests/lib/mirrors/generic_mixin_applications_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> {}
|
| @@ -58,12 +62,13 @@ main() {
|
| typeArguments(reflectClass(GenericClass2), []);
|
| typeArguments(reflectClass(GenericMultipleMixins), []);
|
| // Anonymous mixin applications have no type parameters or type arguments.
|
| - typeArguments(reflectClass(NonGenericClass1).superclass.originalDeclaration, []);
|
| - typeArguments(reflectClass(NonGenericClass2).superclass.originalDeclaration, []);
|
| + typeArguments(
|
| + reflectClass(NonGenericClass1).superclass.originalDeclaration, []);
|
| + typeArguments(
|
| + reflectClass(NonGenericClass2).superclass.originalDeclaration, []);
|
| typeArguments(reflectClass(GenericClass1).superclass.originalDeclaration, []);
|
| typeArguments(reflectClass(GenericClass2).superclass.originalDeclaration, []);
|
|
|
| -
|
| // Instantiations.
|
| typeParameters(reflect(new NonGenericMixinApplication1()).type, []);
|
| typeParameters(reflect(new NonGenericMixinApplication2()).type, []);
|
| @@ -73,7 +78,8 @@ main() {
|
| typeParameters(reflect(new NonGenericClass2()).type, []);
|
| typeParameters(reflect(new GenericClass1<bool>()).type, [#C]);
|
| typeParameters(reflect(new GenericClass2<bool>()).type, [#C]);
|
| - typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type, [#A, #B, #C]);
|
| + typeParameters(reflect(new GenericMultipleMixins<bool, String, int>()).type,
|
| + [#A, #B, #C]);
|
| // Anonymous mixin applications have no type parameters or type arguments.
|
| typeParameters(reflect(new NonGenericClass1()).type.superclass, []);
|
| typeParameters(reflect(new NonGenericClass2()).type.superclass, []);
|
| @@ -82,13 +88,16 @@ main() {
|
|
|
| typeArguments(reflect(new NonGenericMixinApplication1()).type, []);
|
| typeArguments(reflect(new NonGenericMixinApplication2()).type, []);
|
| - typeArguments(reflect(new GenericMixinApplication1<bool>()).type, [reflectClass(bool)]);
|
| - typeArguments(reflect(new GenericMixinApplication2<bool>()).type, [reflectClass(bool)]);
|
| + typeArguments(
|
| + reflect(new GenericMixinApplication1<bool>()).type, [reflectClass(bool)]);
|
| + typeArguments(
|
| + reflect(new GenericMixinApplication2<bool>()).type, [reflectClass(bool)]);
|
| typeArguments(reflect(new NonGenericClass1()).type, []);
|
| typeArguments(reflect(new NonGenericClass2()).type, []);
|
| typeArguments(reflect(new GenericClass1<bool>()).type, [reflectClass(bool)]);
|
| typeArguments(reflect(new GenericClass2<bool>()).type, [reflectClass(bool)]);
|
| - typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type, [reflectClass(bool), reflectClass(String), reflectClass(int)]);
|
| + typeArguments(reflect(new GenericMultipleMixins<bool, String, int>()).type,
|
| + [reflectClass(bool), reflectClass(String), reflectClass(int)]);
|
| // Anonymous mixin applications have no type parameters or type arguments.
|
| typeArguments(reflect(new NonGenericClass1()).type.superclass, []);
|
| typeArguments(reflect(new NonGenericClass2()).type.superclass, []);
|
|
|