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(), |
47 null, | 48 null, |
48 serverPlugin, | 49 serverPlugin, |
49 new AnalysisServerOptions(), | 50 new AnalysisServerOptions(), |
50 new DartSdkManager('/', false, (_) => sdk), | 51 new DartSdkManager('/', false, (_) => sdk), |
51 InstrumentationService.NULL_SERVICE); | 52 InstrumentationService.NULL_SERVICE); |
52 handler = new AnalysisDomainHandler(server); | 53 handler = new AnalysisDomainHandler(server); |
53 }); | 54 }); |
54 | 55 |
55 group('updateContent', testUpdateContent); | 56 group('updateContent', testUpdateContent); |
56 | 57 |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 AnalysisTestHelper() { | 432 AnalysisTestHelper() { |
432 serverChannel = new MockServerChannel(); | 433 serverChannel = new MockServerChannel(); |
433 resourceProvider = new MemoryResourceProvider(); | 434 resourceProvider = new MemoryResourceProvider(); |
434 ExtensionManager manager = new ExtensionManager(); | 435 ExtensionManager manager = new ExtensionManager(); |
435 ServerPlugin serverPlugin = new ServerPlugin(); | 436 ServerPlugin serverPlugin = new ServerPlugin(); |
436 manager.processPlugins([serverPlugin]); | 437 manager.processPlugins([serverPlugin]); |
437 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); | 438 MockSdk sdk = new MockSdk(resourceProvider: resourceProvider); |
438 server = new AnalysisServer( | 439 server = new AnalysisServer( |
439 serverChannel, | 440 serverChannel, |
440 resourceProvider, | 441 resourceProvider, |
| 442 new MockPackageMapProvider(), |
441 null, | 443 null, |
442 serverPlugin, | 444 serverPlugin, |
443 new AnalysisServerOptions(), | 445 new AnalysisServerOptions(), |
444 new DartSdkManager('/', false, (_) => sdk), | 446 new DartSdkManager('/', false, (_) => sdk), |
445 InstrumentationService.NULL_SERVICE); | 447 InstrumentationService.NULL_SERVICE); |
446 handler = new AnalysisDomainHandler(server); | 448 handler = new AnalysisDomainHandler(server); |
447 // listen for notifications | 449 // listen for notifications |
448 Stream<Notification> notificationStream = | 450 Stream<Notification> notificationStream = |
449 serverChannel.notificationController.stream; | 451 serverChannel.notificationController.stream; |
450 notificationStream.listen((Notification notification) { | 452 notificationStream.listen((Notification notification) { |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
702 class A {} | 704 class A {} |
703 '''); | 705 '''); |
704 resourceProvider.newFile( | 706 resourceProvider.newFile( |
705 pkgFileB, | 707 pkgFileB, |
706 ''' | 708 ''' |
707 import 'package:pkgA/libA.dart'; | 709 import 'package:pkgA/libA.dart'; |
708 main() { | 710 main() { |
709 new A(); | 711 new A(); |
710 } | 712 } |
711 '''); | 713 '''); |
| 714 packageMapProvider.packageMap = { |
| 715 'pkgA': [ |
| 716 resourceProvider.newFolder('$pkgA/lib'), |
| 717 resourceProvider.newFolder('$pkgB/lib') |
| 718 ] |
| 719 }; |
712 // add 'pkgA' and 'pkgB' as projects | 720 // add 'pkgA' and 'pkgB' as projects |
713 { | 721 { |
714 resourceProvider.newFolder(projectPath); | 722 resourceProvider.newFolder(projectPath); |
715 handleSuccessfulRequest( | 723 handleSuccessfulRequest( |
716 new AnalysisSetAnalysisRootsParams([pkgA, pkgB], []).toRequest('0')); | 724 new AnalysisSetAnalysisRootsParams([pkgA, pkgB], []).toRequest('0')); |
717 } | 725 } |
718 // wait for analysis, no results initially | 726 // wait for analysis, no results initially |
719 await waitForTasksFinished(); | 727 await waitForTasksFinished(); |
720 expect(filesHighlights[pkgFileA], isNull); | 728 expect(filesHighlights[pkgFileA], isNull); |
721 // subscribe | 729 // subscribe |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
766 test_beforeAnalysis() async { | 774 test_beforeAnalysis() async { |
767 addTestFile('int V = 42;'); | 775 addTestFile('int V = 42;'); |
768 createProject(); | 776 createProject(); |
769 // subscribe | 777 // subscribe |
770 addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile); | 778 addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile); |
771 // wait for analysis | 779 // wait for analysis |
772 await waitForTasksFinished(); | 780 await waitForTasksFinished(); |
773 expect(filesHighlights[testFile], isNotEmpty); | 781 expect(filesHighlights[testFile], isNotEmpty); |
774 } | 782 } |
775 } | 783 } |
OLD | NEW |