Index: tests/compiler/dart2js/instantiated_classes_test.dart |
diff --git a/tests/compiler/dart2js/instantiated_classes_test.dart b/tests/compiler/dart2js/instantiated_classes_test.dart |
index ea90156607c30ad939248ce36c3344048626e446..adeca4cd6a95e07bf72703b5cb36f2523c93b268 100644 |
--- a/tests/compiler/dart2js/instantiated_classes_test.dart |
+++ b/tests/compiler/dart2js/instantiated_classes_test.dart |
@@ -7,79 +7,94 @@ library instantiated_classes_test; |
import 'dart:async'; |
import 'package:expect/expect.dart'; |
import 'package:async_helper/async_helper.dart'; |
-import 'package:compiler/src/elements/elements.dart' |
- show ClassElement; |
+import 'package:compiler/src/elements/elements.dart' show ClassElement; |
import 'type_test_helper.dart'; |
void main() { |
asyncTest(() => Future.forEach([ |
- () => test("class Class {}", ["Class"]), |
- () => test("""abstract class A {} |
+ () => test("class Class {}", ["Class"]), |
+ () => test( |
+ """abstract class A {} |
class Class extends A {}""", |
- ["Class"]), |
- () => test("""class A {} |
+ ["Class"]), |
+ () => test( |
+ """class A {} |
class Class extends A {}""", |
- ["Class"]), |
- () => test("""class A {} |
+ ["Class"]), |
+ () => test( |
+ """class A {} |
class B {} |
class Class extends A {}""", |
- ["Class"]), |
- () => test("""class A {} |
+ ["Class"]), |
+ () => test( |
+ """class A {} |
class Class implements A {}""", |
- ["Class"]), |
- () => test("""class A {} |
+ ["Class"]), |
+ () => test( |
+ """class A {} |
class Class extends Object with A {}""", |
- ["Class"]), |
- () => test("""class A {} |
+ ["Class"]), |
+ () => test( |
+ """class A {} |
class B {} |
class Class extends Object with B implements A {}""", |
- ["Class"]), |
+ ["Class"]), |
- () => test("""class A {} |
+ () => test( |
+ """class A {} |
class Class {}""", |
- ["Class", "A"], ["Class", "A"]), |
- () => test("""class A {} |
+ ["Class", "A"], |
+ ["Class", "A"]), |
+ () => test( |
+ """class A {} |
class Class extends A {}""", |
- ["Class", "A"], ["Class", "A"]), |
- () => test("""class A {} |
+ ["Class", "A"], |
+ ["Class", "A"]), |
+ () => test( |
+ """class A {} |
class Class implements A {}""", |
- ["Class", "A"], ["Class", "A"]), |
- () => test("""class A {} |
+ ["Class", "A"], |
+ ["Class", "A"]), |
+ () => test( |
+ """class A {} |
class B extends A {} |
class Class extends B {}""", |
- ["Class", "A"], ["Class", "A"]), |
- () => test("""class A {} |
+ ["Class", "A"], |
+ ["Class", "A"]), |
+ () => test( |
+ """class A {} |
class B {} |
class Class extends B with A {}""", |
- ["Class", "A"], ["Class", "A"]), |
+ ["Class", "A"], |
+ ["Class", "A"]), |
- // TODO(johnniwinther): Avoid registration of `Class` as instantiated. |
- () => test("""class A {} |
+ // TODO(johnniwinther): Avoid registration of `Class` as instantiated. |
+ () => test( |
+ """class A {} |
class Class implements A { |
factory Class() = A; |
}""", |
- ["Class", "A"], ["Class"]), |
- ], (f) => f())); |
+ ["Class", "A"], |
+ ["Class"]), |
+ ], (f) => f())); |
} |
Future test(String source, List<String> directlyInstantiatedClasses, |
- [List<String> newClasses = const <String>["Class"]]) { |
+ [List<String> newClasses = const <String>["Class"]]) { |
StringBuffer mainSource = new StringBuffer(); |
mainSource.write('main() {\n'); |
for (String newClass in newClasses) { |
mainSource.write(' new $newClass();\n'); |
} |
mainSource.write('}'); |
- return TypeEnvironment.create(source, |
- mainSource: mainSource.toString(), |
- useMockCompiler: true).then((env) { |
+ return TypeEnvironment |
+ .create(source, mainSource: mainSource.toString(), useMockCompiler: true) |
+ .then((env) { |
Iterable<ClassElement> expectedClasses = |
directlyInstantiatedClasses.map(env.getElement); |
- Iterable<ClassElement> actualClasses = |
- env.compiler.resolverWorld.directlyInstantiatedClasses.where( |
- (c) => c.library == env.compiler.mainApp); |
+ Iterable<ClassElement> actualClasses = env |
+ .compiler.resolverWorld.directlyInstantiatedClasses |
+ .where((c) => c.library == env.compiler.mainApp); |
Expect.setEquals(expectedClasses, actualClasses); |
}); |
} |
- |
- |