Skip to content

Commit 31f75e7

Browse files
DanTupCommit Queue
DanTup
authored and
Commit Queue
committed
[analysis_server] Remove hard-coded offsets from some more tests
See #60234 Change-Id: I8bc51365611a51596b7511c35135002156acec6e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449806 Reviewed-by: Samuel Rawlins <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 45b31b5 commit 31f75e7

File tree

3 files changed

+83
-76
lines changed

3 files changed

+83
-76
lines changed

‎pkg/analysis_server/test/analysis_server_base.dart‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:analysis_server/src/utilities/mocks.dart';
1313
import 'package:analyzer/dart/analysis/analysis_options.dart' as analysis;
1414
import 'package:analyzer/file_system/file_system.dart';
1515
import 'package:analyzer/instrumentation/service.dart';
16+
import 'package:analyzer/source/source_range.dart';
1617
import 'package:analyzer/src/dart/analysis/byte_store.dart';
1718
import 'package:analyzer/src/generated/sdk.dart';
1819
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
@@ -225,6 +226,12 @@ class PubPackageAnalysisServerTest extends ContextResolutionTest
225226
@override
226227
String get packagesRootPath => resourceProvider.convertPath('/packages');
227228

229+
TestCodeRange get parsedRange => parsedTestCode.range;
230+
231+
List<TestCodeRange> get parsedRanges => parsedTestCode.ranges;
232+
233+
SourceRange get parsedSourceRange => parsedTestCode.range.sourceRange;
234+
228235
File get testFile => getFile(testFilePath);
229236

230237
analysis.AnalysisOptions get testFileAnalysisOptions {

‎pkg/analysis_server/test/edit/refactoring_test.dart‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'dart:async';
77
import 'package:analysis_server/protocol/protocol.dart';
88
import 'package:analysis_server/protocol/protocol_generated.dart';
99
import 'package:analysis_server/src/services/refactoring/legacy/refactoring_manager.dart';
10+
import 'package:analyzer/src/test_utilities/platform.dart';
1011
import 'package:analyzer_plugin/protocol/protocol_common.dart';
1112
import 'package:test/test.dart';
1213
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -1620,7 +1621,7 @@ void f() {
16201621
Future<void> test_class_fromFactoryRedirectingConstructor() {
16211622
addTestFile('''
16221623
class A {
1623-
A() = Test.named;
1624+
A() = [!Test!].named;
16241625
}
16251626
class Test {
16261627
Test.named() {}
@@ -1640,8 +1641,8 @@ class NewName {
16401641
''',
16411642
feedbackValidator: (feedback) {
16421643
var renameFeedback = feedback as RenameFeedback;
1643-
expect(renameFeedback.offset, 18);
1644-
expect(renameFeedback.length, 4);
1644+
expect(renameFeedback.offset, parsedSourceRange.offset);
1645+
expect(renameFeedback.length, parsedSourceRange.length);
16451646
},
16461647
);
16471648
}
@@ -1652,7 +1653,7 @@ class Test {
16521653
Test() {}
16531654
}
16541655
void f() {
1655-
Test();
1656+
[!Test!]();
16561657
}
16571658
''');
16581659
return assertSuccessfulRefactoring(
@@ -1669,8 +1670,8 @@ void f() {
16691670
''',
16701671
feedbackValidator: (feedback) {
16711672
var renameFeedback = feedback as RenameFeedback;
1672-
expect(renameFeedback.offset, 40);
1673-
expect(renameFeedback.length, 4);
1673+
expect(renameFeedback.offset, parsedSourceRange.offset);
1674+
expect(renameFeedback.length, parsedSourceRange.length);
16741675
},
16751676
);
16761677
}
@@ -1681,7 +1682,7 @@ class Test {
16811682
Test.named() {}
16821683
}
16831684
void f() {
1684-
Test.named();
1685+
[!Test!].named();
16851686
}
16861687
''');
16871688
return assertSuccessfulRefactoring(
@@ -1698,8 +1699,8 @@ void f() {
16981699
''',
16991700
feedbackValidator: (feedback) {
17001701
var renameFeedback = feedback as RenameFeedback;
1701-
expect(renameFeedback.offset, 46);
1702-
expect(renameFeedback.length, 4);
1702+
expect(renameFeedback.offset, parsedSourceRange.offset);
1703+
expect(renameFeedback.length, parsedSourceRange.length);
17031704
},
17041705
);
17051706
}
@@ -1710,7 +1711,7 @@ class Test {
17101711
Test() {}
17111712
}
17121713
void f() {
1713-
new Test();
1714+
new [!Test!]();
17141715
}
17151716
''');
17161717
return assertSuccessfulRefactoring(
@@ -1727,8 +1728,8 @@ void f() {
17271728
''',
17281729
feedbackValidator: (feedback) {
17291730
var renameFeedback = feedback as RenameFeedback;
1730-
expect(renameFeedback.offset, 44);
1731-
expect(renameFeedback.length, 4);
1731+
expect(renameFeedback.offset, parsedSourceRange.offset);
1732+
expect(renameFeedback.length, parsedSourceRange.length);
17321733
},
17331734
);
17341735
}
@@ -1739,7 +1740,7 @@ class Test {
17391740
Test.named() {}
17401741
}
17411742
void f() {
1742-
new Test.named();
1743+
new [!Test!].named();
17431744
}
17441745
''');
17451746
return assertSuccessfulRefactoring(
@@ -1756,8 +1757,8 @@ void f() {
17561757
''',
17571758
feedbackValidator: (feedback) {
17581759
var renameFeedback = feedback as RenameFeedback;
1759-
expect(renameFeedback.offset, 50);
1760-
expect(renameFeedback.length, 4);
1760+
expect(renameFeedback.offset, parsedSourceRange.offset);
1761+
expect(renameFeedback.length, parsedSourceRange.length);
17611762
},
17621763
);
17631764
}
@@ -2137,7 +2138,7 @@ class A {
21372138
Future<void> test_constructor_fromFactoryRedirectingConstructor() {
21382139
addTestFile('''
21392140
class A {
2140-
A() = B.test;
2141+
A() = B.[!test!];
21412142
}
21422143
class B {
21432144
B.test() {}
@@ -2157,8 +2158,8 @@ class B {
21572158
''',
21582159
feedbackValidator: (feedback) {
21592160
var renameFeedback = feedback as RenameFeedback;
2160-
expect(renameFeedback.offset, 20);
2161-
expect(renameFeedback.length, 4);
2161+
expect(renameFeedback.offset, parsedSourceRange.offset);
2162+
expect(renameFeedback.length, parsedSourceRange.length);
21622163
},
21632164
);
21642165
}
@@ -2169,7 +2170,7 @@ class A {
21692170
A.test() {}
21702171
}
21712172
void f() {
2172-
A.test();
2173+
A.[!test!]();
21732174
}
21742175
''');
21752176
return assertSuccessfulRefactoring(
@@ -2186,16 +2187,16 @@ void f() {
21862187
''',
21872188
feedbackValidator: (feedback) {
21882189
var renameFeedback = feedback as RenameFeedback;
2189-
expect(renameFeedback.offset, 41);
2190-
expect(renameFeedback.length, 4);
2190+
expect(renameFeedback.offset, parsedSourceRange.offset);
2191+
expect(renameFeedback.length, parsedSourceRange.length);
21912192
},
21922193
);
21932194
}
21942195

21952196
Future<void> test_enum_constructor_add_toSynthetic() {
21962197
addTestFile('''
21972198
enum E {
2198-
v1, v2.new()
2199+
v1, v2.[!new!]()
21992200
}
22002201
''');
22012202
return assertSuccessfulRefactoring(
@@ -2211,16 +2212,16 @@ enum E {
22112212
''',
22122213
feedbackValidator: (feedback) {
22132214
var renameFeedback = feedback as RenameFeedback;
2214-
expect(renameFeedback.offset, 18);
2215-
expect(renameFeedback.length, 3);
2215+
expect(renameFeedback.offset, parsedSourceRange.offset);
2216+
expect(renameFeedback.length, parsedSourceRange.length);
22162217
},
22172218
);
22182219
}
22192220

22202221
Future<void> test_enum_constructor_change() {
22212222
addTestFile('''
22222223
enum E {
2223-
v1.test(), v2.test();
2224+
v1.test(), v2.[!test!]();
22242225
22252226
const E.test();
22262227
}
@@ -2238,8 +2239,8 @@ enum E {
22382239
''',
22392240
feedbackValidator: (feedback) {
22402241
var renameFeedback = feedback as RenameFeedback;
2241-
expect(renameFeedback.offset, 25);
2242-
expect(renameFeedback.length, 4);
2242+
expect(renameFeedback.offset, parsedSourceRange.offset);
2243+
expect(renameFeedback.length, parsedSourceRange.length);
22432244
},
22442245
);
22452246
}
@@ -2266,7 +2267,7 @@ enum E2<NewName> {
22662267

22672268
Future<void> test_extension_atDeclaration() {
22682269
addTestFile('''
2269-
extension Test on int {
2270+
extension [!Test!] on int {
22702271
void foo() {}
22712272
}
22722273
void f() {
@@ -2287,8 +2288,8 @@ void f() {
22872288
''',
22882289
feedbackValidator: (feedback) {
22892290
var renameFeedback = feedback as RenameFeedback;
2290-
expect(renameFeedback.offset, 10);
2291-
expect(renameFeedback.length, 4);
2291+
expect(renameFeedback.offset, parsedSourceRange.offset);
2292+
expect(renameFeedback.length, parsedSourceRange.length);
22922293
},
22932294
);
22942295
}
@@ -2299,7 +2300,7 @@ extension Test on int {
22992300
void foo() {}
23002301
}
23012302
void f() {
2302-
Test(0).foo();
2303+
[!Test!](0).foo();
23032304
}
23042305
''');
23052306
return assertSuccessfulRefactoring(
@@ -2316,8 +2317,8 @@ void f() {
23162317
''',
23172318
feedbackValidator: (feedback) {
23182319
var renameFeedback = feedback as RenameFeedback;
2319-
expect(renameFeedback.offset, 55);
2320-
expect(renameFeedback.length, 4);
2320+
expect(renameFeedback.offset, parsedSourceRange.offset);
2321+
expect(renameFeedback.length, parsedSourceRange.length);
23212322
},
23222323
);
23232324
}
@@ -2610,7 +2611,7 @@ void f() {
26102611
Future<void> test_importPrefix_remove() {
26112612
addTestFile('''
26122613
import 'dart:math' as test;
2613-
import 'dart:async' as test;
2614+
import 'dart:async' as [!test!];
26142615
void f() {
26152616
test.Random r;
26162617
test.Future f;
@@ -2630,8 +2631,8 @@ void f() {
26302631
''',
26312632
feedbackValidator: (feedback) {
26322633
var renameFeedback = feedback as RenameFeedback;
2633-
expect(renameFeedback.offset, 51);
2634-
expect(renameFeedback.length, 4);
2634+
expect(renameFeedback.offset, parsedSourceRange.offset);
2635+
expect(renameFeedback.length, parsedSourceRange.length);
26352636
},
26362637
);
26372638
}
@@ -2936,6 +2937,13 @@ void f() {
29362937
class _AbstractGetRefactoring_Test extends PubPackageAnalysisServerTest {
29372938
bool shouldWaitForFullAnalysis = true;
29382939

2940+
@override
2941+
void addTestFile(String content) {
2942+
// TODO(dantup): Move this normalization into the base class so it happens
2943+
// automatically for all tests unless opted-out with a flag.
2944+
super.addTestFile(normalizeNewlinesForPlatform(content));
2945+
}
2946+
29392947
Future<void> assertEmptySuccessfulRefactoring(
29402948
Future<Response> Function() requestSender, {
29412949
void Function(RefactoringFeedback?)? feedbackValidator,
@@ -3035,6 +3043,7 @@ class _AbstractGetRefactoring_Test extends PubPackageAnalysisServerTest {
30353043
String expectedCode, {
30363044
int changeEdits = 0,
30373045
}) {
3046+
expectedCode = normalizeNewlinesForPlatform(expectedCode);
30383047
var change = result.change!;
30393048
if (changeEdits != 0) {
30403049
expect(change.edits.length, changeEdits);

0 commit comments

Comments
 (0)