@@ -17,6 +17,7 @@ import 'package:analyzer/file_system/file_system.dart';
1717import 'package:analyzer/source/source_range.dart' ;
1818import 'package:analyzer/src/dart/element/element.dart' ;
1919import 'package:analyzer/src/summary2/reference.dart' ;
20+ import 'package:analyzer/src/test_utilities/platform.dart' ;
2021import 'package:analyzer/src/test_utilities/test_code_format.dart' ;
2122import 'package:analyzer/src/utilities/extensions/file_system.dart' ;
2223import 'package:analyzer/utilities/package_config_file_builder.dart' ;
@@ -39,15 +40,9 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
3940 late final SelectionState selectionState;
4041 late final ValidSelectionState validSelectionState;
4142
42- @override
43- void setUp () {
44- useLineEndingsForPlatform = false ;
45- super .setUp ();
46- }
47-
4843 /// Create [testFile] with [rawCode] , analyze availability in it.
4944 Future <Availability > _analyzeAvailability (String rawCode) async {
50- var testCode = TestCode .parse (rawCode);
45+ var testCode = TestCode .parseNormalized (rawCode);
5146 newFile (testFile.path, testCode.code);
5247
5348 await _buildRefactoringContext (file: testFile, testCode: testCode);
@@ -159,12 +154,6 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
159154@reflectiveTest
160155class ChangeMethodSignatureTest_analyzeSelection
161156 extends AbstractChangeMethodSignatureTest {
162- @override
163- void setUp () {
164- useLineEndingsForPlatform = false ;
165- super .setUp ();
166- }
167-
168157 Future <void > test_classConstructor_fieldFormal_explicitType () async {
169158 await _analyzeSelection (r'''
170159class A {
@@ -3241,6 +3230,7 @@ void f() {
32413230 MethodSignatureUpdate signatureUpdate,
32423231 String expected,
32433232 ) async {
3233+ expected = normalizeNewlinesForPlatform (expected);
32443234 var builder = ChangeBuilder (
32453235 session: refactoringContext.session,
32463236 defaultEol: refactoringContext.utils.endOfLine,
@@ -3260,7 +3250,8 @@ void f() {
32603250 sourceChange: builder.sourceChange,
32613251 );
32623252 case ChangeStatusFailure ():
3263- buffer.writeln ('${status .runtimeType }' );
3253+ buffer.write ('${status .runtimeType }' );
3254+ buffer.write (eol);
32643255 }
32653256
32663257 _assertTextExpectation (buffer.toString (), expected);
@@ -3273,7 +3264,8 @@ void f() {
32733264 var fileEdits = sourceChange.edits.sortedBy ((e) => e.file);
32743265 for (var fileEdit in fileEdits) {
32753266 var file = getFile (fileEdit.file);
3276- buffer.writeln ('>>>>>>> ${file .posixPath }' );
3267+ buffer.write ('>>>>>>> ${file .posixPath }' );
3268+ buffer.write (eol);
32773269 var current = file.readAsStringSync ();
32783270 var updated = SourceEdit .applySequence (current, fileEdit.edits);
32793271 buffer.write (updated);
0 commit comments