| 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.notification.overrides; | 5 library test.domain.analysis.notification.overrides; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/computer/computer_overrides.dart'; | |
| 10 import 'package:analysis_server/src/constants.dart'; | 9 import 'package:analysis_server/src/constants.dart'; |
| 11 import 'package:analysis_server/src/protocol.dart'; | 10 import 'package:analysis_server/src/protocol.dart'; |
| 12 import 'package:analysis_server/src/protocol2.dart' show AnalysisService; | 11 import 'package:analysis_server/src/protocol2.dart'; |
| 13 import 'package:analysis_testing/reflective_tests.dart'; | 12 import 'package:analysis_testing/reflective_tests.dart'; |
| 14 import 'package:unittest/unittest.dart'; | 13 import 'package:unittest/unittest.dart'; |
| 15 | 14 |
| 16 import 'analysis_abstract.dart'; | 15 import 'analysis_abstract.dart'; |
| 17 | 16 |
| 18 | 17 |
| 19 main() { | 18 main() { |
| 20 groupSep = ' | '; | 19 groupSep = ' | '; |
| 21 runReflectiveTests(AnalysisNotificationOverridesTest); | 20 runReflectiveTests(AnalysisNotificationOverridesTest); |
| 22 } | 21 } |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } | 107 } |
| 109 } | 108 } |
| 110 | 109 |
| 111 Future prepareOverrides() { | 110 Future prepareOverrides() { |
| 112 addAnalysisSubscription(AnalysisService.OVERRIDES, testFile); | 111 addAnalysisSubscription(AnalysisService.OVERRIDES, testFile); |
| 113 return waitForTasksFinished(); | 112 return waitForTasksFinished(); |
| 114 } | 113 } |
| 115 | 114 |
| 116 void processNotification(Notification notification) { | 115 void processNotification(Notification notification) { |
| 117 if (notification.event == ANALYSIS_OVERRIDES) { | 116 if (notification.event == ANALYSIS_OVERRIDES) { |
| 118 String file = notification.getParameter(FILE); | 117 var params = new AnalysisOverridesParams.fromNotification(notification); |
| 119 if (file == testFile) { | 118 if (params.file == testFile) { |
| 120 List<Map<String, Object>> jsonList = | 119 overridesList = params.overrides; |
| 121 notification.getParameter(OVERRIDES); | |
| 122 overridesList = jsonList.map(Override.fromJson).toList(); | |
| 123 } | 120 } |
| 124 } | 121 } |
| 125 } | 122 } |
| 126 | 123 |
| 127 void setUp() { | 124 void setUp() { |
| 128 super.setUp(); | 125 super.setUp(); |
| 129 createProject(); | 126 createProject(); |
| 130 } | 127 } |
| 131 | 128 |
| 132 test_afterAnalysis() { | 129 test_afterAnalysis() { |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 set fff(x) {} // in B | 338 set fff(x) {} // in B |
| 342 } | 339 } |
| 343 '''); | 340 '''); |
| 344 return prepareOverrides().then((_) { | 341 return prepareOverrides().then((_) { |
| 345 assertHasOverride('fff(x) {} // in B'); | 342 assertHasOverride('fff(x) {} // in B'); |
| 346 assertHasSuperElement('fff(x) {} // in A'); | 343 assertHasSuperElement('fff(x) {} // in A'); |
| 347 assertNoInterfaceMembers(); | 344 assertNoInterfaceMembers(); |
| 348 }); | 345 }); |
| 349 } | 346 } |
| 350 } | 347 } |
| OLD | NEW |