Move find_node into test_utilities so that it can be re-used in analysis server tests.

Change-Id: I9a302944ccc96b04a64508cc1f71498056f150bf
Reviewed-on: https://dart-review.googlesource.com/c/92521
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Paul Berry 2019-02-09 19:01:14 +00:00 committed by commit-bot@chromium.org
parent 5787f08619
commit 9103baf31c
7 changed files with 18 additions and 11 deletions

View file

@ -4,7 +4,6 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:test/test.dart';
class FindNode {
final String content;
@ -207,15 +206,23 @@ class FindNode {
AstNode _node(String search, bool Function(AstNode) predicate) {
var index = content.indexOf(search);
if (content.indexOf(search, index + 1) != -1) {
fail('The pattern |$search| is not unique in:\n$content');
throw new StateError('The pattern |$search| is not unique in:\n$content');
}
if (index < 0) {
throw new StateError('The pattern |$search| is not found in:\n$content');
}
expect(index, greaterThanOrEqualTo(0));
var node = new NodeLocator2(index).searchWithin(unit);
expect(node, isNotNull);
if (node == null) {
throw new StateError(
'The pattern |$search| had no corresponding node in:\n$content');
}
var result = node.thisOrAncestorMatching(predicate);
expect(result, isNotNull);
if (result == null) {
throw new StateError(
'The node for |$search| had no matching ancestor in:\n$content');
}
return result;
}
}

View file

@ -11,11 +11,11 @@ import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/generated/declaration_resolver.dart';
import 'package:analyzer/src/generated/parser.dart';
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../src/dart/resolution/driver_resolution.dart';
import '../src/dart/resolution/find_node.dart';
import '../util/element_type_matchers.dart';
import 'test_support.dart';

View file

@ -13,10 +13,10 @@ import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/source_io.dart';
import 'package:analyzer/src/task/strong/ast_properties.dart';
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:front_end/src/base/errors.dart';
import 'package:test/test.dart';
import '../src/dart/resolution/find_node.dart';
import '../utils.dart';
import 'resolver_test_case.dart';

View file

@ -16,12 +16,12 @@ import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/utilities_dart.dart';
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../../../utils.dart';
import '../resolution/find_element.dart';
import '../resolution/find_node.dart';
import 'base.dart';
main() {

View file

@ -3,10 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analyzer/src/dart/ast/constant_evaluator.dart';
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../resolution/find_node.dart';
import 'parse_base.dart';
main() {

View file

@ -15,12 +15,12 @@ import 'package:analyzer/src/dart/element/member.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/dart/error/hint_codes.dart';
import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
import 'package:test/test.dart';
import '../../../generated/test_support.dart';
import 'find_element.dart';
import 'find_node.dart';
final isBottomType = new TypeMatcher<BottomTypeImpl>();

View file

@ -6,12 +6,12 @@ import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/test_utilities/find_node.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../ast/parse_base.dart';
import '../resolution/driver_resolution.dart';
import '../resolution/find_node.dart';
main() {
defineReflectiveSuite(() {