| Index: pkg/analysis_server/test/analysis/get_navigation_test.dart
|
| diff --git a/pkg/analysis_server/test/analysis/get_navigation_test.dart b/pkg/analysis_server/test/analysis/get_navigation_test.dart
|
| index 992d1e3936afe2b3b37d5d3317aa6d62bce872c9..67904a7d3cb56c581a417cdceeaaeee7ab169d7b 100644
|
| --- a/pkg/analysis_server/test/analysis/get_navigation_test.dart
|
| +++ b/pkg/analysis_server/test/analysis/get_navigation_test.dart
|
| @@ -2,8 +2,6 @@
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| -library test.analysis.get_navigation;
|
| -
|
| import 'package:analysis_server/protocol/protocol.dart';
|
| import 'package:analysis_server/protocol/protocol_generated.dart';
|
| import 'package:analysis_server/src/domain_analysis.dart';
|
| @@ -16,7 +14,6 @@ import 'notification_navigation_test.dart';
|
| main() {
|
| defineReflectiveSuite(() {
|
| defineReflectiveTests(GetNavigationTest);
|
| - defineReflectiveTests(GetNavigationTest_Driver);
|
| });
|
| }
|
|
|
| @@ -26,6 +23,8 @@ class GetNavigationTest extends AbstractNavigationTest {
|
|
|
| @override
|
| void setUp() {
|
| + enableNewAnalysisDriver = true;
|
| + generateSummaryFiles = true;
|
| super.setUp();
|
| server.handlers = [
|
| new AnalysisDomainHandler(server),
|
| @@ -50,6 +49,19 @@ main() {
|
| return _checkInvalid(file, -1, -1);
|
| }
|
|
|
| + test_fileOutsideOfRoot() async {
|
| + testFile = '/outside.dart';
|
| + addTestFile('''
|
| +main() {
|
| + var test = 0;
|
| + print(test);
|
| +}
|
| +''');
|
| + await _getNavigation(testFile, testCode.indexOf('test);'), 0);
|
| + assertHasRegion('test);');
|
| + assertHasTarget('test = 0');
|
| + }
|
| +
|
| test_importDirective() async {
|
| addTestFile('''
|
| import 'dart:math';
|
| @@ -238,26 +250,3 @@ main() {
|
| regions = result.regions;
|
| }
|
| }
|
| -
|
| -@reflectiveTest
|
| -class GetNavigationTest_Driver extends GetNavigationTest {
|
| - @override
|
| - void setUp() {
|
| - enableNewAnalysisDriver = true;
|
| - generateSummaryFiles = true;
|
| - super.setUp();
|
| - }
|
| -
|
| - test_fileOutsideOfRoot() async {
|
| - testFile = '/outside.dart';
|
| - addTestFile('''
|
| -main() {
|
| - var test = 0;
|
| - print(test);
|
| -}
|
| -''');
|
| - await _getNavigation(testFile, testCode.indexOf('test);'), 0);
|
| - assertHasRegion('test);');
|
| - assertHasTarget('test = 0');
|
| - }
|
| -}
|
|
|