| Index: pkg/analyzer/test/generated/strong_mode_test.dart
|
| diff --git a/pkg/analyzer/test/generated/strong_mode_test.dart b/pkg/analyzer/test/generated/strong_mode_test.dart
|
| index 29499096d914c354c73d8b307600105628f27c57..ae856da03ebe1a9ab0b0252a74939482d7df17bf 100644
|
| --- a/pkg/analyzer/test/generated/strong_mode_test.dart
|
| +++ b/pkg/analyzer/test/generated/strong_mode_test.dart
|
| @@ -1779,23 +1779,7 @@ class C {
|
| class D extends C {
|
| String f/*<S>*/(/*=S*/ x) => null;
|
| }''');
|
| - // TODO(jmesserly): we can't use assertErrors because STRONG_MODE_* errors
|
| - // from CodeChecker don't have working equality.
|
| - List<AnalysisError> errors = analysisContext2.computeErrors(source);
|
| -
|
| - // Sort errors by name.
|
| - errors.sort((AnalysisError e1, AnalysisError e2) =>
|
| - e1.errorCode.name.compareTo(e2.errorCode.name));
|
| -
|
| - expect(
|
| - errors.map((e) => e.errorCode.name),
|
| - unorderedEquals([
|
| - 'INVALID_METHOD_OVERRIDE_RETURN_TYPE',
|
| - 'STRONG_MODE_INVALID_METHOD_OVERRIDE'
|
| - ]));
|
| - expect(errors[0].message, contains('Iterable<S>'),
|
| - reason: 'errors should be in terms of the type parameters '
|
| - 'at the error location');
|
| + assertErrors(source, [StrongModeCode.INVALID_METHOD_OVERRIDE]);
|
| verify([source]);
|
| }
|
|
|
| @@ -1809,15 +1793,7 @@ class C {
|
| class D extends C {
|
| /*=T*/ f/*<T extends B>*/(/*=T*/ x) => null;
|
| }''');
|
| - // TODO(jmesserly): this is modified code from assertErrors, which we can't
|
| - // use directly because STRONG_MODE_* errors don't have working equality.
|
| - List<AnalysisError> errors = analysisContext2.computeErrors(source);
|
| - expect(
|
| - errors.map((e) => e.errorCode.name),
|
| - unorderedEquals([
|
| - 'INVALID_METHOD_OVERRIDE_TYPE_PARAMETER_BOUND',
|
| - 'STRONG_MODE_INVALID_METHOD_OVERRIDE'
|
| - ]));
|
| + assertErrors(source, [StrongModeCode.INVALID_METHOD_OVERRIDE]);
|
| verify([source]);
|
| }
|
|
|
| @@ -1829,15 +1805,7 @@ class C {
|
| class D extends C {
|
| /*=S*/ f/*<T, S>*/(/*=T*/ x) => null;
|
| }''');
|
| - // TODO(jmesserly): we can't use assertErrors because STRONG_MODE_* errors
|
| - // from CodeChecker don't have working equality.
|
| - List<AnalysisError> errors = analysisContext2.computeErrors(source);
|
| - expect(
|
| - errors.map((e) => e.errorCode.name),
|
| - unorderedEquals([
|
| - 'STRONG_MODE_INVALID_METHOD_OVERRIDE',
|
| - 'INVALID_METHOD_OVERRIDE_TYPE_PARAMETERS'
|
| - ]));
|
| + assertErrors(source, [StrongModeCode.INVALID_METHOD_OVERRIDE]);
|
| verify([source]);
|
| }
|
|
|
|
|