| Index: test/codegen/generator_test.dart
|
| diff --git a/test/codegen/generator_test.dart b/test/codegen/generator_test.dart
|
| index 8c401fc2c849cb6b2ee8ec7af3ddbfe778d6e149..75860bb5cc653934fe83e320a0b3f52e0d22615a 100644
|
| --- a/test/codegen/generator_test.dart
|
| +++ b/test/codegen/generator_test.dart
|
| @@ -13,16 +13,16 @@ main() {
|
| test('getters', () {
|
| var generator = new SmokeCodeGenerator();
|
| generator.addGetter('i');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' getters: {\n'
|
| ' #i: (o) => o.i,\n'
|
| ' }));\n');
|
|
|
| generator.addGetter('foo');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' getters: {\n'
|
| ' #foo: (o) => o.foo,\n'
|
| @@ -33,16 +33,16 @@ main() {
|
| test('setters', () {
|
| var generator = new SmokeCodeGenerator();
|
| generator.addSetter('i');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' setters: {\n'
|
| ' #i: (o, v) { o.i = v; },\n'
|
| ' }));\n');
|
|
|
| generator.addSetter('foo');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' setters: {\n'
|
| ' #foo: (o, v) { o.foo = v; },\n'
|
| @@ -58,8 +58,8 @@ main() {
|
| generator.addSymbol('a.b.[]');
|
| generator.addSymbol('[]');
|
| generator.addSymbol('+');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' names: {\n'
|
| ' const Symbol(\'+\'): r\'+\',\n'
|
| @@ -78,16 +78,16 @@ main() {
|
| var generator = new SmokeCodeGenerator();
|
| generator.addSymbol('a.');
|
| var sb = new StringBuffer();
|
| - expect(() => generator.writeStaticConfiguration(sb),
|
| - throwsA(invalidError));
|
| + expect(
|
| + () => generator.writeStaticConfiguration(sb), throwsA(invalidError));
|
| });
|
|
|
| test('operator in the middle', () {
|
| var generator = new SmokeCodeGenerator();
|
| generator.addSymbol('a.[].b');
|
| var sb = new StringBuffer();
|
| - expect(() => generator.writeStaticConfiguration(sb),
|
| - throwsA(invalidError));
|
| + expect(
|
| + () => generator.writeStaticConfiguration(sb), throwsA(invalidError));
|
| });
|
| });
|
|
|
| @@ -97,8 +97,8 @@ main() {
|
| generator.addSetter('i');
|
| generator.addSetter('foo');
|
| generator.addSymbol('foo');
|
| - checkResults(generator, initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| + checkResults(generator,
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| ' checkedMode: false,\n'
|
| ' getters: {\n'
|
| ' #i: (o) => o.i,\n'
|
| @@ -114,22 +114,18 @@ main() {
|
|
|
| test('parents', () {
|
| var generator = new SmokeCodeGenerator();
|
| - generator.addParent(new TypeIdentifier('a.dart', 'A'),
|
| - new TypeIdentifier('b.dart', 'B'));
|
| - generator.addParent(new TypeIdentifier('a.dart', 'C'),
|
| - new TypeIdentifier('a.dart', 'A'));
|
| + generator.addParent(
|
| + new TypeIdentifier('a.dart', 'A'), new TypeIdentifier('b.dart', 'B'));
|
| + generator.addParent(
|
| + new TypeIdentifier('a.dart', 'C'), new TypeIdentifier('a.dart', 'A'));
|
| checkResults(generator,
|
| - imports: [
|
| - "import 'a.dart' as smoke_0;",
|
| - "import 'b.dart' as smoke_1;"
|
| - ],
|
| - initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| - ' checkedMode: false,\n'
|
| - ' parents: {\n'
|
| - ' smoke_0.A: smoke_1.B,\n'
|
| - ' smoke_0.C: smoke_0.A,\n'
|
| - ' }));\n');
|
| + imports: ["import 'a.dart' as smoke_0;", "import 'b.dart' as smoke_1;"],
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| + ' checkedMode: false,\n'
|
| + ' parents: {\n'
|
| + ' smoke_0.A: smoke_1.B,\n'
|
| + ' smoke_0.C: smoke_0.A,\n'
|
| + ' }));\n');
|
| });
|
|
|
| test('declarations', () {
|
| @@ -137,26 +133,28 @@ main() {
|
| generator.addDeclaration(new TypeIdentifier('a.dart', 'A'), 'foo',
|
| new TypeIdentifier('dart:core', 'int'), isField: true, isFinal: true);
|
| generator.addDeclaration(new TypeIdentifier('a.dart', 'A'), 'bar',
|
| - new TypeIdentifier('dart:core', 'Function'), isMethod: true,
|
| - annotations: [new ConstExpression.constructor(null, 'Annotation',
|
| - [new ConstExpression.string("hi")], const {})]);
|
| + new TypeIdentifier('dart:core', 'Function'),
|
| + isMethod: true,
|
| + annotations: [
|
| + new ConstExpression.constructor(
|
| + null, 'Annotation', [new ConstExpression.string("hi")], const {})
|
| + ]);
|
| generator.addDeclaration(new TypeIdentifier('a.dart', 'A'), '[]',
|
| new TypeIdentifier('dart:core', 'Function'), isMethod: true);
|
| var symbol = "const Symbol('[]')";
|
| var details = "$symbol, Function, kind: METHOD";
|
| checkResults(generator,
|
| imports: ["import 'a.dart' as smoke_0;"],
|
| - initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| - ' checkedMode: false,\n'
|
| - ' declarations: {\n'
|
| - ' smoke_0.A: {\n'
|
| - ' $symbol: const Declaration($details),\n'
|
| - ' #bar: const Declaration(#bar, Function, kind: METHOD, '
|
| - 'annotations: const [const Annotation(\'hi\')]),\n'
|
| - ' #foo: const Declaration(#foo, int, isFinal: true),\n'
|
| - ' },\n'
|
| - ' }));\n');
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| + ' checkedMode: false,\n'
|
| + ' declarations: {\n'
|
| + ' smoke_0.A: {\n'
|
| + ' $symbol: const Declaration($details),\n'
|
| + ' #bar: const Declaration(#bar, Function, kind: METHOD, '
|
| + 'annotations: const [const Annotation(\'hi\')]),\n'
|
| + ' #foo: const Declaration(#foo, int, isFinal: true),\n'
|
| + ' },\n'
|
| + ' }));\n');
|
| });
|
|
|
| test('staticMethod', () {
|
| @@ -164,14 +162,13 @@ main() {
|
| generator.addStaticMethod(new TypeIdentifier('a.dart', 'A'), 'm1');
|
| checkResults(generator,
|
| imports: ["import 'a.dart' as smoke_0;"],
|
| - initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| - ' checkedMode: false,\n'
|
| - ' staticMethods: {\n'
|
| - ' smoke_0.A: {\n'
|
| - ' #m1: smoke_0.A.m1,\n'
|
| - ' },\n'
|
| - ' }));\n');
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| + ' checkedMode: false,\n'
|
| + ' staticMethods: {\n'
|
| + ' smoke_0.A: {\n'
|
| + ' #m1: smoke_0.A.m1,\n'
|
| + ' },\n'
|
| + ' }));\n');
|
| });
|
|
|
| test('repeated entries appear only once', () {
|
| @@ -186,12 +183,12 @@ main() {
|
| generator.addSymbol('c');
|
| generator.addSymbol('c');
|
|
|
| - generator.addParent(new TypeIdentifier('a.dart', 'C'),
|
| - new TypeIdentifier('a.dart', 'A'));
|
| - generator.addParent(new TypeIdentifier('a.dart', 'C'),
|
| - new TypeIdentifier('a.dart', 'A'));
|
| - generator.addParent(new TypeIdentifier('a.dart', 'C'),
|
| - new TypeIdentifier('a.dart', 'A'));
|
| + generator.addParent(
|
| + new TypeIdentifier('a.dart', 'C'), new TypeIdentifier('a.dart', 'A'));
|
| + generator.addParent(
|
| + new TypeIdentifier('a.dart', 'C'), new TypeIdentifier('a.dart', 'A'));
|
| + generator.addParent(
|
| + new TypeIdentifier('a.dart', 'C'), new TypeIdentifier('a.dart', 'A'));
|
|
|
| generator.addDeclaration(new TypeIdentifier('a.dart', 'A'), 'foo',
|
| new TypeIdentifier('dart:core', 'int'), isField: true, isFinal: true);
|
| @@ -201,29 +198,26 @@ main() {
|
| new TypeIdentifier('dart:core', 'int'), isField: true, isFinal: true);
|
|
|
| checkResults(generator,
|
| - imports: [
|
| - "import 'a.dart' as smoke_0;",
|
| - ],
|
| - initCall:
|
| - 'useGeneratedCode(new StaticConfiguration(\n'
|
| - ' checkedMode: false,\n'
|
| - ' getters: {\n'
|
| - ' #a: (o) => o.a,\n'
|
| - ' },\n'
|
| - ' setters: {\n'
|
| - ' #b: (o, v) { o.b = v; },\n'
|
| - ' },\n'
|
| - ' parents: {\n'
|
| - ' smoke_0.C: smoke_0.A,\n'
|
| - ' },\n'
|
| - ' declarations: {\n'
|
| - ' smoke_0.A: {\n'
|
| - ' #foo: const Declaration(#foo, int, isFinal: true),\n'
|
| - ' },\n'
|
| - ' },\n'
|
| - ' names: {\n'
|
| - ' #c: r\'c\',\n'
|
| - ' #d: r\'d\',\n'
|
| - ' }));\n');
|
| + imports: ["import 'a.dart' as smoke_0;",],
|
| + initCall: 'useGeneratedCode(new StaticConfiguration(\n'
|
| + ' checkedMode: false,\n'
|
| + ' getters: {\n'
|
| + ' #a: (o) => o.a,\n'
|
| + ' },\n'
|
| + ' setters: {\n'
|
| + ' #b: (o, v) { o.b = v; },\n'
|
| + ' },\n'
|
| + ' parents: {\n'
|
| + ' smoke_0.C: smoke_0.A,\n'
|
| + ' },\n'
|
| + ' declarations: {\n'
|
| + ' smoke_0.A: {\n'
|
| + ' #foo: const Declaration(#foo, int, isFinal: true),\n'
|
| + ' },\n'
|
| + ' },\n'
|
| + ' names: {\n'
|
| + ' #c: r\'c\',\n'
|
| + ' #d: r\'d\',\n'
|
| + ' }));\n');
|
| });
|
| }
|
|
|