| Index: pkg/analysis_server/test/analysis_notification_navigation_test.dart
|
| diff --git a/pkg/analysis_server/test/analysis_notification_navigation_test.dart b/pkg/analysis_server/test/analysis_notification_navigation_test.dart
|
| index e05cee684bc0c3c1e2e3adc5bdd71c76a9a6042f..6a1ddea1c23ab970565816dc69bc699db8037c2e 100644
|
| --- a/pkg/analysis_server/test/analysis_notification_navigation_test.dart
|
| +++ b/pkg/analysis_server/test/analysis_notification_navigation_test.dart
|
| @@ -8,10 +8,10 @@ import 'dart:async';
|
|
|
| import 'package:analysis_server/src/constants.dart';
|
| import 'package:analysis_server/src/protocol.dart';
|
| -import 'reflective_tests.dart';
|
| import 'package:unittest/unittest.dart';
|
|
|
| import 'analysis_abstract.dart';
|
| +import 'reflective_tests.dart';
|
|
|
|
|
| main() {
|
| @@ -43,7 +43,7 @@ class AnalysisNotificationNavigationTest extends AbstractAnalysisTest {
|
| }
|
| fail(
|
| 'Expected to find target (file=$file; offset=$offset; length=$length) in\n'
|
| - '${testRegion} in\n' '${regions.join('\n')}');
|
| + '${testRegion} in\n' '${testTargets.join('\n')}');
|
| }
|
|
|
| void assertHasOperatorRegion(String regionSearch, int regionLength,
|
| @@ -268,7 +268,7 @@ main() {
|
| }
|
| ''');
|
| return prepareNavigation().then((_) {
|
| - assertHasRegionString('new A');
|
| + findRegion(findOffset('new A'), 'new A'.length, true);
|
| assertHasTarget('A {');
|
| });
|
| }
|
| @@ -283,8 +283,18 @@ main() {
|
| }
|
| ''');
|
| return prepareNavigation().then((_) {
|
| - assertHasRegionString('new A.named');
|
| - assertHasTarget('named() {}');
|
| + {
|
| + findRegion(findOffset('new '), 'new '.length, true);
|
| + assertHasTarget('named() {}');
|
| + }
|
| + {
|
| + findRegion(findOffset('A.named();'), 'A'.length, true);
|
| + assertHasTarget('A {');
|
| + }
|
| + {
|
| + findRegion(findOffset('.named();'), '.named'.length, true);
|
| + assertHasTarget('named() {}');
|
| + }
|
| });
|
| }
|
|
|
| @@ -298,8 +308,14 @@ main() {
|
| }
|
| ''');
|
| return prepareNavigation().then((_) {
|
| - assertHasRegionString('new A');
|
| - assertHasTarget("A() {}", 0);
|
| + {
|
| + findRegion(findOffset('new '), 'new '.length, true);
|
| + assertHasTarget('A() {}', 0);
|
| + }
|
| + {
|
| + findRegion(findOffset('A();'), 'A'.length, true);
|
| + assertHasTarget('A {');
|
| + }
|
| });
|
| }
|
|
|
|
|