| 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 1b52846666a740f2ae9f7c23cfde55c3ed22eae4..58c04db2d54a25e08892c0129d19680c1a099dfa 100644
|
| --- a/pkg/analysis_server/test/domain_analysis_test.dart
|
| +++ b/pkg/analysis_server/test/domain_analysis_test.dart
|
| @@ -7,7 +7,7 @@ library test.domain.analysis;
|
| import 'dart:async';
|
|
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| -import 'package:analysis_server/src/computer/element.dart';
|
| +import 'package:analysis_server/src/computer/error.dart';
|
| import 'package:analysis_server/src/constants.dart';
|
| import 'package:analysis_server/src/domain_analysis.dart';
|
| import 'package:analysis_server/src/protocol.dart';
|
| @@ -23,16 +23,6 @@ import 'analysis_abstract.dart';
|
| import 'mocks.dart';
|
|
|
|
|
| -AnalysisError jsonToAnalysisError(Map<String, Object> json) {
|
| - Map<String, Object> jsonLocation = json[LOCATION];
|
| - Location location = new Location(jsonLocation[FILE], _getSafeInt(jsonLocation,
|
| - OFFSET, -1), _getSafeInt(jsonLocation, LENGTH, -1), _getSafeInt(jsonLocation,
|
| - START_LINE, -1), _getSafeInt(jsonLocation, START_COLUMN, -1));
|
| - return new AnalysisError('unknown error code', json[SEVERITY], json[TYPE], location,
|
| - json['message'], json['correction']);
|
| -}
|
| -
|
| -
|
| main() {
|
| groupSep = ' | ';
|
|
|
| @@ -358,7 +348,7 @@ class AnalysisDomainTest extends AbstractAnalysisTest {
|
| if (notification.event == ANALYSIS_ERRORS) {
|
| String file = notification.getParameter(FILE);
|
| List<Map<String, Object>> errorMaps = notification.getParameter(ERRORS);
|
| - filesErrors[file] = errorMaps.map(jsonToAnalysisError).toList();
|
| + filesErrors[file] = errorMaps.map(AnalysisError.fromJson).toList();
|
| }
|
| }
|
|
|
| @@ -420,23 +410,6 @@ main(A a) {
|
| }
|
| }
|
|
|
| -class AnalysisError {
|
| - final String errorCode;
|
| - final String severity;
|
| - final String type;
|
| - final Location location;
|
| - final String message;
|
| - final String correction;
|
| - AnalysisError(this.errorCode, this.severity, this.type, this.location,
|
| - this.message, this.correction);
|
| -
|
| - @override
|
| - String toString() {
|
| - return 'AnalysisError(location=$location message=$message); '
|
| - 'errorCode=$errorCode; severity=$separator type=$type';
|
| - }
|
| -}
|
| -
|
|
|
| /**
|
| * A helper to test 'analysis.*' requests.
|
| @@ -469,7 +442,7 @@ class AnalysisTestHelper {
|
| if (notification.event == ANALYSIS_ERRORS) {
|
| String file = notification.getParameter(FILE);
|
| List<Map<String, Object>> errorMaps = notification.getParameter(ERRORS);
|
| - filesErrors[file] = errorMaps.map(jsonToAnalysisError).toList();
|
| + filesErrors[file] = errorMaps.map(AnalysisError.fromJson).toList();
|
| }
|
| if (notification.event == ANALYSIS_HIGHLIGHTS) {
|
| String file = notification.getParameter(FILE);
|
|
|