| Index: tests/compiler/dart2js/mirror_helper_test.dart
|
| diff --git a/tests/compiler/dart2js/mirror_helper_test.dart b/tests/compiler/dart2js/mirror_helper_test.dart
|
| index 57c869bec6b8d894680b54cf2efb4bcb3bfd7509..1f3b7aea827080c5286bf03c593af178d15f44f1 100644
|
| --- a/tests/compiler/dart2js/mirror_helper_test.dart
|
| +++ b/tests/compiler/dart2js/mirror_helper_test.dart
|
| @@ -15,7 +15,7 @@ show
|
| import
|
| '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'
|
| show
|
| - Node;
|
| + Block, ExpressionStatement, FunctionExpression, Node, Send;
|
| import
|
| '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_backend.dart'
|
| show
|
| @@ -54,13 +54,15 @@ void testWithMirrorRenaming({bool minify}) {
|
| Map<Node, String> renames = backend.renames;
|
| Map<LibraryElement, String> imports = backend.imports;
|
|
|
| - Node getNameFunctionNode =
|
| - backend.memberNodes.values.first.first.body.statements.nodes.head;
|
| + FunctionExpression node = backend.memberNodes.values.first.first;
|
| + Block block = node.body;
|
| + ExpressionStatement getNameFunctionNode = block.statements.nodes.head;
|
| + Send send = getNameFunctionNode.expression;
|
|
|
| Expect.equals(renames[mirrorRenamer.mirrorHelperGetNameFunctionNode.name],
|
| - renames[getNameFunctionNode.expression.selector]);
|
| + renames[send.selector]);
|
| Expect.equals("",
|
| - renames[getNameFunctionNode.expression.receiver]);
|
| + renames[send.receiver]);
|
| Expect.equals(1, imports.keys.length);
|
| }));
|
| }
|
| @@ -73,11 +75,13 @@ void testWithoutMirrorRenaming({bool minify}) {
|
| Map<Node, String> renames = backend.renames;
|
| Map<LibraryElement, String> imports = backend.imports;
|
|
|
| - Node getNameFunctionNode =
|
| - backend.memberNodes.values.first.first.body.statements.nodes.head;
|
| + FunctionExpression node = backend.memberNodes.values.first.first;
|
| + Block block = node.body;
|
| + ExpressionStatement getNameFunctionNode = block.statements.nodes.head;
|
| + Send send = getNameFunctionNode.expression;
|
|
|
| - Expect.isFalse(renames.containsKey(getNameFunctionNode.expression.selector));
|
| - Expect.isFalse(renames.containsKey(getNameFunctionNode.expression.receiver));
|
| + Expect.isFalse(renames.containsKey(send.selector));
|
| + Expect.isFalse(renames.containsKey(send.receiver));
|
| Expect.equals(1, imports.keys.length);
|
| }));
|
| }
|
|
|