Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: pkg/analysis_server/test/domain_analysis_test.dart

Issue 497393002: Make more use of generated code in analysis server. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/domain_analysis_test.dart
diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart
index e38ec71655f79e7dbe2939a06d69fbc4bc568d99..d49dc13f39fded43fb3d8fdf1fb6066e19c7c95c 100644
--- a/pkg/analysis_server/test/domain_analysis_test.dart
+++ b/pkg/analysis_server/test/domain_analysis_test.dart
@@ -421,8 +421,8 @@ class AnalysisTestHelper {
Map<AnalysisService, List<String>> analysisSubscriptions = {};
Map<String, List<AnalysisError>> filesErrors = {};
- Map<String, List<Map<String, Object>>> filesHighlights = {};
- Map<String, List<Map<String, Object>>> filesNavigation = {};
+ Map<String, List<HighlightRegion>> filesHighlights = {};
+ Map<String, List<NavigationRegion>> filesNavigation = {};
String testFile = '/project/bin/test.dart';
String testCode;
@@ -446,12 +446,12 @@ class AnalysisTestHelper {
filesErrors[decoded.file] = decoded.errors;
}
if (notification.event == ANALYSIS_HIGHLIGHTS) {
- String file = notification.getParameter(FILE);
- filesHighlights[file] = notification.getParameter(REGIONS);
+ var params = new AnalysisHighlightsParams.fromNotification(notification);
+ filesHighlights[params.file] = params.regions;
}
if (notification.event == ANALYSIS_NAVIGATION) {
- String file = notification.getParameter(FILE);
- filesNavigation[file] = notification.getParameter(REGIONS);
+ var params = new AnalysisNavigationParams.fromNotification(notification);
+ filesNavigation[params.file] = params.regions;
}
});
}
@@ -527,8 +527,8 @@ class AnalysisTestHelper {
* Returns highlights recorded for the given [file].
* May be empty, but not `null`.
*/
- List<Map<String, Object>> getHighlights(String file) {
- List<Map<String, Object>> highlights = filesHighlights[file];
+ List<HighlightRegion> getHighlights(String file) {
+ List<HighlightRegion> highlights = filesHighlights[file];
if (highlights != null) {
return highlights;
}
@@ -539,8 +539,8 @@ class AnalysisTestHelper {
* Returns navigation regions recorded for the given [file].
* May be empty, but not `null`.
*/
- List<Map<String, Object>> getNavigation(String file) {
- List<Map<String, Object>> navigation = filesNavigation[file];
+ List<NavigationRegion> getNavigation(String file) {
+ List<NavigationRegion> navigation = filesNavigation[file];
if (navigation != null) {
return navigation;
}
@@ -559,7 +559,7 @@ class AnalysisTestHelper {
* Returns highlights recorded for the given [testFile].
* May be empty, but not `null`.
*/
- List<Map<String, Object>> getTestHighlights() {
+ List<HighlightRegion> getTestHighlights() {
return getHighlights(testFile);
}
@@ -567,7 +567,7 @@ class AnalysisTestHelper {
* Returns navigation information recorded for the given [testFile].
* May be empty, but not `null`.
*/
- List<Map<String, Object>> getTestNavigation() {
+ List<NavigationRegion> getTestNavigation() {
return getNavigation(testFile);
}
« no previous file with comments | « pkg/analysis_server/test/analysis_server_test.dart ('k') | pkg/analysis_server/test/domain_completion_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698