[analysis_server] Fix change_method_signature tests to normalize code + remove unnecessary setting of `useLineEndingsForPlatform` from a few more tests. Change-Id: I9959a5c476a964b3a53ee68842b056c486656d92 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443802 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Auto-Submit: Danny Tuppeny <danny@tuppeny.com> Commit-Queue: Samuel Rawlins <srawlins@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart index 06caafb..7ac510d 100644 --- a/pkg/analysis_server/test/abstract_context.dart +++ b/pkg/analysis_server/test/abstract_context.dart
@@ -58,6 +58,9 @@ List<String> get collectionIncludedPaths => [workspaceRootPath]; + /// The line terminator being used for test files and to be expected in edits. + String get eol => testEol; + /// Return a list of the experiments that are to be enabled for tests in this /// class, an empty list if there are no experiments that should be enabled. List<String> get experiments => experimentsForTests;
diff --git a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart index 925375f..276b653 100644 --- a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart +++ b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart
@@ -17,6 +17,7 @@ import 'package:analyzer/source/source_range.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/summary2/reference.dart'; +import 'package:analyzer/src/test_utilities/platform.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; import 'package:analyzer/src/utilities/extensions/file_system.dart'; import 'package:analyzer/utilities/package_config_file_builder.dart'; @@ -39,15 +40,9 @@ late final SelectionState selectionState; late final ValidSelectionState validSelectionState; - @override - void setUp() { - useLineEndingsForPlatform = false; - super.setUp(); - } - /// Create [testFile] with [rawCode], analyze availability in it. Future<Availability> _analyzeAvailability(String rawCode) async { - var testCode = TestCode.parse(rawCode); + var testCode = TestCode.parseNormalized(rawCode); newFile(testFile.path, testCode.code); await _buildRefactoringContext(file: testFile, testCode: testCode); @@ -159,12 +154,6 @@ @reflectiveTest class ChangeMethodSignatureTest_analyzeSelection extends AbstractChangeMethodSignatureTest { - @override - void setUp() { - useLineEndingsForPlatform = false; - super.setUp(); - } - Future<void> test_classConstructor_fieldFormal_explicitType() async { await _analyzeSelection(r''' class A { @@ -3241,6 +3230,7 @@ MethodSignatureUpdate signatureUpdate, String expected, ) async { + expected = normalizeNewlinesForPlatform(expected); var builder = ChangeBuilder( session: refactoringContext.session, defaultEol: refactoringContext.utils.endOfLine, @@ -3260,7 +3250,8 @@ sourceChange: builder.sourceChange, ); case ChangeStatusFailure(): - buffer.writeln('${status.runtimeType}'); + buffer.write('${status.runtimeType}'); + buffer.write(eol); } _assertTextExpectation(buffer.toString(), expected); @@ -3273,7 +3264,8 @@ var fileEdits = sourceChange.edits.sortedBy((e) => e.file); for (var fileEdit in fileEdits) { var file = getFile(fileEdit.file); - buffer.writeln('>>>>>>> ${file.posixPath}'); + buffer.write('>>>>>>> ${file.posixPath}'); + buffer.write(eol); var current = file.readAsStringSync(); var updated = SourceEdit.applySequence(current, fileEdit.edits); buffer.write(updated);
diff --git a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart index 8aae063..703bcb8 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart
@@ -39,6 +39,12 @@ return DartChangeWorkspace([await session]); } + @override + void setUp() { + super.setUp(); + verifyNoTestUnitErrors = false; + } + /// Computes fixes for the given [diagnostic] in [testUnit]. Future<List<Fix>> _computeFixes(Diagnostic diagnostic) async { var libraryResult = testLibraryResult; @@ -276,13 +282,6 @@ return fixes; } - @override - void setUp() { - super.setUp(); - verifyNoTestUnitErrors = false; - useLineEndingsForPlatform = true; - } - /// Computes fixes for the given [diagnostic] in [testUnit]. @override Future<List<Fix>> _computeFixes( @@ -319,13 +318,6 @@ kinds.sort((a, b) => b.priority.compareTo(a.priority)); expect(kinds, containsAllInOrder(fixKinds)); } - - @override - void setUp() { - super.setUp(); - verifyNoTestUnitErrors = false; - useLineEndingsForPlatform = true; - } } /// A base class defining support for writing fix processor tests that are @@ -504,13 +496,6 @@ }).toList(); } - @override - void setUp() { - super.setUp(); - verifyNoTestUnitErrors = false; - useLineEndingsForPlatform = true; - } - /// Computes fixes, verifies that there is a fix for the given [diagnostic] of /// the appropriate kind, and returns the fix. ///