| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.domain.analysis; | 5 library test.domain.analysis; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/plugin/protocol/protocol.dart'; | 9 import 'package:analysis_server/plugin/protocol/protocol.dart'; |
| 10 import 'package:analysis_server/src/analysis_server.dart'; | 10 import 'package:analysis_server/src/analysis_server.dart'; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 setUp(() { | 37 setUp(() { |
| 38 serverChannel = new MockServerChannel(); | 38 serverChannel = new MockServerChannel(); |
| 39 resourceProvider = new MemoryResourceProvider(); | 39 resourceProvider = new MemoryResourceProvider(); |
| 40 ExtensionManager manager = new ExtensionManager(); | 40 ExtensionManager manager = new ExtensionManager(); |
| 41 ServerPlugin serverPlugin = new ServerPlugin(); | 41 ServerPlugin serverPlugin = new ServerPlugin(); |
| 42 manager.processPlugins([serverPlugin]); | 42 manager.processPlugins([serverPlugin]); |
| 43 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); | 43 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); |
| 44 server = new AnalysisServer( | 44 server = new AnalysisServer( |
| 45 serverChannel, | 45 serverChannel, |
| 46 resourceProvider, | 46 resourceProvider, |
| 47 new MockPackageMapProvider(), | |
| 48 null, | 47 null, |
| 49 serverPlugin, | 48 serverPlugin, |
| 50 new AnalysisServerOptions(), | 49 new AnalysisServerOptions(), |
| 51 new DartSdkManager('/', false, (_) => sdk), | 50 new DartSdkManager('/', false, (_) => sdk), |
| 52 InstrumentationService.NULL_SERVICE); | 51 InstrumentationService.NULL_SERVICE); |
| 53 handler = new AnalysisDomainHandler(server); | 52 handler = new AnalysisDomainHandler(server); |
| 54 }); | 53 }); |
| 55 | 54 |
| 56 group('updateContent', testUpdateContent); | 55 group('updateContent', testUpdateContent); |
| 57 | 56 |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 AnalysisTestHelper() { | 431 AnalysisTestHelper() { |
| 433 serverChannel = new MockServerChannel(); | 432 serverChannel = new MockServerChannel(); |
| 434 resourceProvider = new MemoryResourceProvider(); | 433 resourceProvider = new MemoryResourceProvider(); |
| 435 ExtensionManager manager = new ExtensionManager(); | 434 ExtensionManager manager = new ExtensionManager(); |
| 436 ServerPlugin serverPlugin = new ServerPlugin(); | 435 ServerPlugin serverPlugin = new ServerPlugin(); |
| 437 manager.processPlugins([serverPlugin]); | 436 manager.processPlugins([serverPlugin]); |
| 438 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); | 437 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); |
| 439 server = new AnalysisServer( | 438 server = new AnalysisServer( |
| 440 serverChannel, | 439 serverChannel, |
| 441 resourceProvider, | 440 resourceProvider, |
| 442 new MockPackageMapProvider(), | |
| 443 null, | 441 null, |
| 444 serverPlugin, | 442 serverPlugin, |
| 445 new AnalysisServerOptions(), | 443 new AnalysisServerOptions(), |
| 446 new DartSdkManager('/', false, (_) => sdk), | 444 new DartSdkManager('/', false, (_) => sdk), |
| 447 InstrumentationService.NULL_SERVICE); | 445 InstrumentationService.NULL_SERVICE); |
| 448 handler = new AnalysisDomainHandler(server); | 446 handler = new AnalysisDomainHandler(server); |
| 449 // listen for notifications | 447 // listen for notifications |
| 450 Stream<Notification> notificationStream = | 448 Stream<Notification> notificationStream = |
| 451 serverChannel.notificationController.stream; | 449 serverChannel.notificationController.stream; |
| 452 notificationStream.listen((Notification notification) { | 450 notificationStream.listen((Notification notification) { |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 class A {} | 702 class A {} |
| 705 '''); | 703 '''); |
| 706 resourceProvider.newFile( | 704 resourceProvider.newFile( |
| 707 pkgFileB, | 705 pkgFileB, |
| 708 ''' | 706 ''' |
| 709 import 'package:pkgA/libA.dart'; | 707 import 'package:pkgA/libA.dart'; |
| 710 main() { | 708 main() { |
| 711 new A(); | 709 new A(); |
| 712 } | 710 } |
| 713 '''); | 711 '''); |
| 714 packageMapProvider.packageMap = { | |
| 715 'pkgA': [ | |
| 716 resourceProvider.newFolder('$pkgA/lib'), | |
| 717 resourceProvider.newFolder('$pkgB/lib') | |
| 718 ] | |
| 719 }; | |
| 720 // add 'pkgA' and 'pkgB' as projects | 712 // add 'pkgA' and 'pkgB' as projects |
| 721 { | 713 { |
| 722 resourceProvider.newFolder(projectPath); | 714 resourceProvider.newFolder(projectPath); |
| 723 handleSuccessfulRequest( | 715 handleSuccessfulRequest( |
| 724 new AnalysisSetAnalysisRootsParams([pkgA, pkgB], []).toRequest('0')); | 716 new AnalysisSetAnalysisRootsParams([pkgA, pkgB], []).toRequest('0')); |
| 725 } | 717 } |
| 726 // wait for analysis, no results initially | 718 // wait for analysis, no results initially |
| 727 await waitForTasksFinished(); | 719 await waitForTasksFinished(); |
| 728 expect(filesHighlights[pkgFileA], isNull); | 720 expect(filesHighlights[pkgFileA], isNull); |
| 729 // subscribe | 721 // subscribe |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 test_beforeAnalysis() async { | 766 test_beforeAnalysis() async { |
| 775 addTestFile('int V = 42;'); | 767 addTestFile('int V = 42;'); |
| 776 createProject(); | 768 createProject(); |
| 777 // subscribe | 769 // subscribe |
| 778 addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile); | 770 addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile); |
| 779 // wait for analysis | 771 // wait for analysis |
| 780 await waitForTasksFinished(); | 772 await waitForTasksFinished(); |
| 781 expect(filesHighlights[testFile], isNotEmpty); | 773 expect(filesHighlights[testFile], isNotEmpty); |
| 782 } | 774 } |
| 783 } | 775 } |
| OLD | NEW |