Skip to content

Commit 0cf15f2

Browse files
DanTupCommit Queue
authored andcommitted
[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 <[email protected]> Auto-Submit: Danny Tuppeny <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]>
1 parent 62caf71 commit 0cf15f2

File tree

3 files changed

+16
-36
lines changed

3 files changed

+16
-36
lines changed

pkg/analysis_server/test/abstract_context.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ class AbstractContextTest
5858

5959
List<String> get collectionIncludedPaths => [workspaceRootPath];
6060

61+
/// The line terminator being used for test files and to be expected in edits.
62+
String get eol => testEol;
63+
6164
/// Return a list of the experiments that are to be enabled for tests in this
6265
/// class, an empty list if there are no experiments that should be enabled.
6366
List<String> get experiments => experimentsForTests;

pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import 'package:analyzer/file_system/file_system.dart';
1717
import 'package:analyzer/source/source_range.dart';
1818
import 'package:analyzer/src/dart/element/element.dart';
1919
import 'package:analyzer/src/summary2/reference.dart';
20+
import 'package:analyzer/src/test_utilities/platform.dart';
2021
import 'package:analyzer/src/test_utilities/test_code_format.dart';
2122
import 'package:analyzer/src/utilities/extensions/file_system.dart';
2223
import '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
160155
class 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'''
170159
class 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);

pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ abstract class BaseFixProcessorTest extends AbstractSingleUnitTest {
3939
return DartChangeWorkspace([await session]);
4040
}
4141

42+
@override
43+
void setUp() {
44+
super.setUp();
45+
verifyNoTestUnitErrors = false;
46+
}
47+
4248
/// Computes fixes for the given [diagnostic] in [testUnit].
4349
Future<List<Fix>> _computeFixes(Diagnostic diagnostic) async {
4450
var libraryResult = testLibraryResult;
@@ -276,13 +282,6 @@ abstract class FixInFileProcessorTest extends BaseFixProcessorTest {
276282
return fixes;
277283
}
278284

279-
@override
280-
void setUp() {
281-
super.setUp();
282-
verifyNoTestUnitErrors = false;
283-
useLineEndingsForPlatform = true;
284-
}
285-
286285
/// Computes fixes for the given [diagnostic] in [testUnit].
287286
@override
288287
Future<List<Fix>> _computeFixes(
@@ -319,13 +318,6 @@ abstract class FixPriorityTest extends BaseFixProcessorTest {
319318
kinds.sort((a, b) => b.priority.compareTo(a.priority));
320319
expect(kinds, containsAllInOrder(fixKinds));
321320
}
322-
323-
@override
324-
void setUp() {
325-
super.setUp();
326-
verifyNoTestUnitErrors = false;
327-
useLineEndingsForPlatform = true;
328-
}
329321
}
330322

331323
/// A base class defining support for writing fix processor tests that are
@@ -504,13 +496,6 @@ abstract class FixProcessorTest extends BaseFixProcessorTest {
504496
}).toList();
505497
}
506498

507-
@override
508-
void setUp() {
509-
super.setUp();
510-
verifyNoTestUnitErrors = false;
511-
useLineEndingsForPlatform = true;
512-
}
513-
514499
/// Computes fixes, verifies that there is a fix for the given [diagnostic] of
515500
/// the appropriate kind, and returns the fix.
516501
///

0 commit comments

Comments
 (0)