| 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 import 'dart:async'; | 5 import 'dart:async'; | 
| 6 | 6 | 
| 7 import 'package:analysis_server/protocol/protocol.dart'; | 7 import 'package:analysis_server/protocol/protocol.dart'; | 
| 8 import 'package:analysis_server/protocol/protocol_generated.dart'; | 8 import 'package:analysis_server/protocol/protocol_generated.dart'; | 
| 9 import 'package:analysis_server/src/analysis_server.dart'; | 9 import 'package:analysis_server/src/analysis_server.dart'; | 
| 10 import 'package:analysis_server/src/constants.dart'; | 10 import 'package:analysis_server/src/constants.dart'; | 
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 386 class AnalysisDomainTest extends AbstractAnalysisTest { | 386 class AnalysisDomainTest extends AbstractAnalysisTest { | 
| 387   Map<String, List<AnalysisError>> filesErrors = {}; | 387   Map<String, List<AnalysisError>> filesErrors = {}; | 
| 388 | 388 | 
| 389   void processNotification(Notification notification) { | 389   void processNotification(Notification notification) { | 
| 390     if (notification.event == ANALYSIS_ERRORS) { | 390     if (notification.event == ANALYSIS_ERRORS) { | 
| 391       var decoded = new AnalysisErrorsParams.fromNotification(notification); | 391       var decoded = new AnalysisErrorsParams.fromNotification(notification); | 
| 392       filesErrors[decoded.file] = decoded.errors; | 392       filesErrors[decoded.file] = decoded.errors; | 
| 393     } | 393     } | 
| 394   } | 394   } | 
| 395 | 395 | 
| 396   @override |  | 
| 397   void setUp() { |  | 
| 398     enableNewAnalysisDriver = true; |  | 
| 399     super.setUp(); |  | 
| 400   } |  | 
| 401 |  | 
| 402   test_setRoots_packages() { | 396   test_setRoots_packages() { | 
| 403     // prepare package | 397     // prepare package | 
| 404     String pkgFile = '/packages/pkgA/libA.dart'; | 398     String pkgFile = '/packages/pkgA/libA.dart'; | 
| 405     resourceProvider.newFile( | 399     resourceProvider.newFile( | 
| 406         pkgFile, | 400         pkgFile, | 
| 407         ''' | 401         ''' | 
| 408 library lib_a; | 402 library lib_a; | 
| 409 class A {} | 403 class A {} | 
| 410 '''); | 404 '''); | 
| 411     resourceProvider.newFile( | 405     resourceProvider.newFile( | 
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 647       code = code.join('\n'); | 641       code = code.join('\n'); | 
| 648     } | 642     } | 
| 649     return code as String; | 643     return code as String; | 
| 650   } | 644   } | 
| 651 } | 645 } | 
| 652 | 646 | 
| 653 @reflectiveTest | 647 @reflectiveTest | 
| 654 class SetSubscriptionsTest extends AbstractAnalysisTest { | 648 class SetSubscriptionsTest extends AbstractAnalysisTest { | 
| 655   Map<String, List<HighlightRegion>> filesHighlights = {}; | 649   Map<String, List<HighlightRegion>> filesHighlights = {}; | 
| 656 | 650 | 
|  | 651   @override | 
|  | 652   bool get enableNewAnalysisDriver => false; | 
|  | 653 | 
| 657   void processNotification(Notification notification) { | 654   void processNotification(Notification notification) { | 
| 658     if (notification.event == ANALYSIS_HIGHLIGHTS) { | 655     if (notification.event == ANALYSIS_HIGHLIGHTS) { | 
| 659       var params = new AnalysisHighlightsParams.fromNotification(notification); | 656       var params = new AnalysisHighlightsParams.fromNotification(notification); | 
| 660       filesHighlights[params.file] = params.regions; | 657       filesHighlights[params.file] = params.regions; | 
| 661     } | 658     } | 
| 662   } | 659   } | 
| 663 | 660 | 
| 664   test_afterAnalysis() async { | 661   test_afterAnalysis() async { | 
| 665     addTestFile('int V = 42;'); | 662     addTestFile('int V = 42;'); | 
| 666     createProject(); | 663     createProject(); | 
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 815     plugin.AnalysisSetSubscriptionsParams params = | 812     plugin.AnalysisSetSubscriptionsParams params = | 
| 816         pluginManager.analysisSetSubscriptionsParams; | 813         pluginManager.analysisSetSubscriptionsParams; | 
| 817     expect(params, isNotNull); | 814     expect(params, isNotNull); | 
| 818     Map<plugin.AnalysisService, List<String>> subscriptions = | 815     Map<plugin.AnalysisService, List<String>> subscriptions = | 
| 819         params.subscriptions; | 816         params.subscriptions; | 
| 820     expect(subscriptions, hasLength(1)); | 817     expect(subscriptions, hasLength(1)); | 
| 821     List<String> files = subscriptions[plugin.AnalysisService.HIGHLIGHTS]; | 818     List<String> files = subscriptions[plugin.AnalysisService.HIGHLIGHTS]; | 
| 822     expect(files, [testFile]); | 819     expect(files, [testFile]); | 
| 823   } | 820   } | 
| 824 } | 821 } | 
| OLD | NEW | 
|---|