Skip to content

Commit 611e264

Browse files
bwilkersonCommit Queue
bwilkerson
authored and
Commit Queue
committed
[cq] Clean up more uses of comment-based markers in tests
Change-Id: Ie069c39bc3a5e2c5132ee078af024730a10c9a6b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/414300 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Phil Quitslund <pquitslund@google.com>
1 parent 2aa14db commit 611e264

File tree

49 files changed

+439
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+439
-469
lines changed

‎pkg/analysis_server/test/src/services/correction/assist/add_diagnostic_property_reference_test.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import 'package:flutter/foundation.dart';
3232
import 'package:flutter/widgets.dart';
3333
3434
class W extends Widget {
35-
bool /*caret*/property = true;
35+
bool ^property = true;
3636
@override
3737
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
3838
super.debugFillProperties(properties);
@@ -62,7 +62,7 @@ import 'package:flutter/widgets.dart';
6262
class W {}
6363
6464
augment class W extends Widget {
65-
String get foo/*caret*/ => '';
65+
String get foo^ => '';
6666
}
6767
''');
6868
await assertNoAssist();
@@ -72,7 +72,7 @@ augment class W extends Widget {
7272
verifyNoTestUnitErrors = false;
7373
await resolveTestCode('''
7474
mixin MyMixin {
75-
String get foo/*caret*/() {}
75+
String get foo^() {}
7676
}
7777
''');
7878
await assertNoAssist();
@@ -81,7 +81,7 @@ mixin MyMixin {
8181
Future<void> test_notAvailable_outsideDiagnosticable() async {
8282
await resolveTestCode('''
8383
class C {
84-
String get f/*caret*/ => '';
84+
String get f^ => '';
8585
}
8686
''');
8787
await assertNoAssist();

‎pkg/analysis_server/test/src/services/correction/assist/add_digit_separators_test.dart‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,123 +20,123 @@ class AddDigitSeparatorsTest extends AssistProcessorTest {
2020
AssistKind get kind => DartAssistKind.ADD_DIGIT_SEPARATORS;
2121

2222
Future<void> test_double_manyDigitsLeftOfDecimal() async {
23-
await resolveTestCode('var i = /*caret*/123456.78;');
23+
await resolveTestCode('var i = ^123456.78;');
2424
await assertHasAssist('var i = 123_456.78;');
2525
}
2626

2727
Future<void> test_double_multipleOfThreeDigits_rightOfDecimal() async {
28-
await resolveTestCode('var i = /*caret*/1.234567;');
28+
await resolveTestCode('var i = ^1.234567;');
2929
await assertHasAssist('var i = 1.234_567;');
3030
}
3131

3232
Future<void> test_double_multipleOfThreeDigitsPlusOne_rightOfDecimal() async {
33-
await resolveTestCode('var i = /*caret*/1.2345678;');
33+
await resolveTestCode('var i = ^1.2345678;');
3434
await assertHasAssist('var i = 1.234_567_8;');
3535
}
3636

3737
Future<void> test_double_multipleOfThreeDigitsPlusTwo_rightOfDecimal() async {
38-
await resolveTestCode('var i = /*caret*/1.23456789;');
38+
await resolveTestCode('var i = ^1.23456789;');
3939
await assertHasAssist('var i = 1.234_567_89;');
4040
}
4141

4242
Future<void> test_double_tooFewDigits() async {
43-
await resolveTestCode('var i = /*caret*/1234.5678;');
43+
await resolveTestCode('var i = ^1234.5678;');
4444
await assertNoAssist();
4545
}
4646

4747
Future<void> test_doubleScientific_manyDigitsInExponential() async {
48-
await resolveTestCode('var i = /*caret*/1e23456;');
48+
await resolveTestCode('var i = ^1e23456;');
4949
await assertHasAssist('var i = 1e23_456;');
5050
}
5151

5252
Future<void> test_doubleScientific_manyDigitsInExponential_negative() async {
53-
await resolveTestCode('var i = /*caret*/1e-234567;');
53+
await resolveTestCode('var i = ^1e-234567;');
5454
await assertHasAssist('var i = 1e-234_567;');
5555
}
5656

5757
Future<void>
5858
test_doubleScientific_manyDigitsInExponential_withFractional() async {
59-
await resolveTestCode('var i = /*caret*/1.2e34567;');
59+
await resolveTestCode('var i = ^1.2e34567;');
6060
await assertHasAssist('var i = 1.2e34_567;');
6161
}
6262

6363
Future<void> test_doubleScientific_manyDigitsInFractional() async {
64-
await resolveTestCode('var i = /*caret*/1.23456e7;');
64+
await resolveTestCode('var i = ^1.23456e7;');
6565
await assertHasAssist('var i = 1.234_56e7;');
6666
}
6767

6868
Future<void> test_doubleScientific_manyDigitsInWhole() async {
69-
await resolveTestCode('var i = /*caret*/12345e6;');
69+
await resolveTestCode('var i = ^12345e6;');
7070
await assertHasAssist('var i = 12_345e6;');
7171
}
7272

7373
Future<void> test_doubleScientific_manyDigitsInWhole_negative() async {
74-
await resolveTestCode('var i = /*caret*/12345e-6;');
74+
await resolveTestCode('var i = ^12345e-6;');
7575
await assertHasAssist('var i = 12_345e-6;');
7676
}
7777

7878
Future<void> test_doubleScientific_manyDigitsInWhole_withFractional() async {
79-
await resolveTestCode('var i = /*caret*/12345.6e7;');
79+
await resolveTestCode('var i = ^12345.6e7;');
8080
await assertHasAssist('var i = 12_345.6e7;');
8181
}
8282

8383
Future<void> test_intDecimal_existingSeparators() async {
84-
await resolveTestCode('var i = /*caret*/123__456_78;');
84+
await resolveTestCode('var i = ^123__456_78;');
8585
await assertHasAssist('var i = 12_345_678;');
8686
}
8787

8888
Future<void> test_intDecimal_existingSeparators_correct() async {
89-
await resolveTestCode('var i = /*caret*/12_345_678;');
89+
await resolveTestCode('var i = ^12_345_678;');
9090
await assertNoAssist();
9191
}
9292

9393
Future<void> test_intDecimal_fourDigits() async {
94-
await resolveTestCode('var i = /*caret*/1234;');
94+
await resolveTestCode('var i = ^1234;');
9595
await assertNoAssist();
9696
}
9797

9898
Future<void> test_intDecimal_multipleOfThreeDigits() async {
99-
await resolveTestCode('var i = /*caret*/123456;');
99+
await resolveTestCode('var i = ^123456;');
100100
await assertHasAssist('var i = 123_456;');
101101
}
102102

103103
Future<void> test_intDecimal_multipleOfThreeDigitsPlusOne() async {
104-
await resolveTestCode('var i = /*caret*/1234567;');
104+
await resolveTestCode('var i = ^1234567;');
105105
await assertHasAssist('var i = 1_234_567;');
106106
}
107107

108108
Future<void> test_intDecimal_multipleOfThreeDigitsPlusTwo() async {
109-
await resolveTestCode('var i = /*caret*/12345678;');
109+
await resolveTestCode('var i = ^12345678;');
110110
await assertHasAssist('var i = 12_345_678;');
111111
}
112112

113113
Future<void> test_intDecimal_negativeNumber() async {
114-
await resolveTestCode('var i = -/*caret*/12345678;');
114+
await resolveTestCode('var i = -^12345678;');
115115
await assertHasAssist('var i = -12_345_678;');
116116
}
117117

118118
Future<void> test_intHex_evenNumberOfDigits() async {
119-
await resolveTestCode('var i = /*caret*/0x123456;');
119+
await resolveTestCode('var i = ^0x123456;');
120120
await assertHasAssist('var i = 0x12_34_56;');
121121
}
122122

123123
Future<void> test_intHex_existingSeparators() async {
124-
await resolveTestCode('var i = /*caret*/0X1___234__5_6;');
124+
await resolveTestCode('var i = ^0X1___234__5_6;');
125125
await assertHasAssist('var i = 0X12_34_56;');
126126
}
127127

128128
Future<void> test_intHex_existingSeparators_correct() async {
129-
await resolveTestCode('var i = /*caret*/0x12_34_56;');
129+
await resolveTestCode('var i = ^0x12_34_56;');
130130
await assertNoAssist();
131131
}
132132

133133
Future<void> test_intHex_threeDigits() async {
134-
await resolveTestCode('var i = /*caret*/0x123;');
134+
await resolveTestCode('var i = ^0x123;');
135135
await assertNoAssist();
136136
}
137137

138138
Future<void> test_intHex_upperCase() async {
139-
await resolveTestCode('var i = /*caret*/0X123456;');
139+
await resolveTestCode('var i = ^0X123456;');
140140
await assertHasAssist('var i = 0X12_34_56;');
141141
}
142142
}

‎pkg/analysis_server/test/src/services/correction/assist/add_return_type_test.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AddReturnTypeTest extends AssistProcessorTest {
2424
await resolveTestCode('''
2525
class A {
2626
void m() {
27-
/*caret*/f() {
27+
^f() {
2828
return '';
2929
}
3030
}
@@ -45,7 +45,7 @@ class A {
4545
await resolveTestCode('''
4646
class A {
4747
void m() {
48-
/*caret*/f() => '';
48+
^f() => '';
4949
}
5050
}
5151
''');
@@ -61,7 +61,7 @@ class A {
6161
Future<void> test_method_block_noReturn() async {
6262
await resolveTestCode('''
6363
class A {
64-
/*caret*/m() {}
64+
^m() {}
6565
}
6666
''');
6767
await assertHasAssist('''
@@ -74,7 +74,7 @@ class A {
7474
Future<void> test_method_block_returnDynamic() async {
7575
await resolveTestCode('''
7676
class A {
77-
/*caret*/m(p) {
77+
^m(p) {
7878
return p;
7979
}
8080
}
@@ -91,7 +91,7 @@ class A {
9191
Future<void> test_method_block_returnNoValue() async {
9292
await resolveTestCode('''
9393
class A {
94-
/*caret*/m() {
94+
^m() {
9595
return;
9696
}
9797
}
@@ -108,7 +108,7 @@ class A {
108108
Future<void> test_method_block_singleReturn() async {
109109
await resolveTestCode('''
110110
class A {
111-
/*caret*/m() {
111+
^m() {
112112
return '';
113113
}
114114
}
@@ -125,7 +125,7 @@ class A {
125125
Future<void> test_method_expression() async {
126126
await resolveTestCode('''
127127
class A {
128-
/*caret*/m() => '';
128+
^m() => '';
129129
}
130130
''');
131131
await assertHasAssist('''
@@ -138,7 +138,7 @@ class A {
138138
Future<void> test_method_getter() async {
139139
await resolveTestCode('''
140140
class A {
141-
get /*caret*/foo => 0;
141+
get ^foo => 0;
142142
}
143143
''');
144144
await assertHasAssist('''
@@ -151,7 +151,7 @@ class A {
151151
Future<void> test_method_setter() async {
152152
await resolveTestCode('''
153153
class A {
154-
set /*caret*/foo(int a) {
154+
set ^foo(int a) {
155155
if (a == 0) return;
156156
}
157157
}
@@ -163,7 +163,7 @@ class A {
163163
createAnalysisOptionsFile(lints: [LintNames.avoid_return_types_on_setters]);
164164
await resolveTestCode('''
165165
class A {
166-
set /*caret*/foo(int a) {
166+
set ^foo(int a) {
167167
if (a == 0) return;
168168
}
169169
}
@@ -173,7 +173,7 @@ class A {
173173

174174
Future<void> test_topLevelFunction_block() async {
175175
await resolveTestCode('''
176-
/*caret*/f() {
176+
^f() {
177177
return '';
178178
}
179179
''');
@@ -186,7 +186,7 @@ String f() {
186186

187187
Future<void> test_topLevelFunction_expression() async {
188188
await resolveTestCode('''
189-
/*caret*/f() => '';
189+
^f() => '';
190190
''');
191191
await assertHasAssist('''
192192
String f() => '';
@@ -197,14 +197,14 @@ String f() => '';
197197
createAnalysisOptionsFile(lints: [LintNames.always_declare_return_types]);
198198
verifyNoTestUnitErrors = false;
199199
await resolveTestCode('''
200-
/*caret*/f() => '';
200+
^f() => '';
201201
''');
202202
await assertNoAssist();
203203
}
204204

205205
Future<void> test_topLevelFunction_getter() async {
206206
await resolveTestCode('''
207-
get /*caret*/foo => 0;
207+
get ^foo => 0;
208208
''');
209209
await assertHasAssist('''
210210
int get foo => 0;
@@ -213,7 +213,7 @@ int get foo => 0;
213213

214214
Future<void> test_topLevelFunction_setter() async {
215215
await resolveTestCode('''
216-
set /*caret*/foo(int a) {
216+
set ^foo(int a) {
217217
if (a == 0) return;
218218
}
219219
''');
@@ -224,7 +224,7 @@ set /*caret*/foo(int a) {
224224
test_topLevelFunction_setter_lint_avoidReturnTypesOnSetters() async {
225225
createAnalysisOptionsFile(lints: [LintNames.avoid_return_types_on_setters]);
226226
await resolveTestCode('''
227-
set /*caret*/foo(int a) {
227+
set ^foo(int a) {
228228
if (a == 0) return;
229229
}
230230
''');

‎pkg/analysis_server/test/src/services/correction/assist/add_type_annotation_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class A {
3838
verifyNoTestUnitErrors = false;
3939
await resolveTestCode('''
4040
class A {
41-
/*caret*/final f = 0;
41+
^final f = 0;
4242
}
4343
''');
4444
await assertNoAssist();
@@ -244,7 +244,7 @@ part 'test.dart';
244244
addTestSource(r'''
245245
part of 'app.dart';
246246
void f() {
247-
var /*caret*/v = getMap();
247+
var ^v = getMap();
248248
}
249249
''');
250250

0 commit comments

Comments
 (0)