Skip to content

Commit bf13a57

Browse files
munificentCommit Queue
authored andcommitted
Reformat tests/lib/collection, /convert, and /developer using 3.8 style.
Change-Id: I550bb08a2c933799cbaa9586c85869bfc56ce1b0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425328 Auto-Submit: Bob Nystrom <[email protected]> Commit-Queue: Lasse Nielsen <[email protected]> Reviewed-by: Lasse Nielsen <[email protected]>
1 parent f94efba commit bf13a57

40 files changed

+1857
-1053
lines changed

tests/lib/collection/queue_test.dart

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,31 @@ abstract class QueueTest {
225225
queue.retainWhere((x) => x != 3);
226226
testLength(23, queue);
227227

228-
Expect.listEquals(
229-
[6, 8, 9, 1, 2, 4, 5, 6, 8, 9, 10, 1, 2, 4, 5, 6, 8, 9, 10, 1, 2, 4, 5],
230-
queue.toList());
228+
Expect.listEquals([
229+
6,
230+
8,
231+
9,
232+
1,
233+
2,
234+
4,
235+
5,
236+
6,
237+
8,
238+
9,
239+
10,
240+
1,
241+
2,
242+
4,
243+
5,
244+
6,
245+
8,
246+
9,
247+
10,
248+
1,
249+
2,
250+
4,
251+
5,
252+
], queue.toList());
231253

232254
// Regression test: http://dartbug.com/16270
233255
// These should all do nothing, and should not throw.

tests/lib/collection/regress_47852_test.dart

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ void originalError() {
1414
map.putIfAbsent(key, () {
1515
wasAbsent = true;
1616
Expect.isFalse(
17-
map.containsKey(key), 'containsKey should be false in putIfAbsent');
17+
map.containsKey(key),
18+
'containsKey should be false in putIfAbsent',
19+
);
1820
return key;
1921
});
2022
Expect.isTrue(wasAbsent);
@@ -39,7 +41,7 @@ class Dumb {
3941
final keys = [
4042
123,
4143
3.14,
42-
10.0, // int or double depending on platform.
44+
10.0, // int or double depending on platform.
4345
'aString',
4446
#someSymbol,
4547
true,
@@ -66,8 +68,10 @@ void testMap(Map<Object?, Object?> map) {
6668
bool wasAbsent = false;
6769
map.putIfAbsent(key, () {
6870
wasAbsent = true;
69-
Expect.isFalse(map.containsKey(key),
70-
'containsKey should be false in putIfAbsent. key = $key');
71+
Expect.isFalse(
72+
map.containsKey(key),
73+
'containsKey should be false in putIfAbsent. key = $key',
74+
);
7175
return key;
7276
});
7377
Expect.isTrue(wasAbsent);
@@ -88,12 +92,18 @@ void main() {
8892
testMap(LinkedHashMap.identity()); // Should be same as `Map.identity()`.
8993

9094
// Custom maps:
91-
testMap(HashMap(
95+
testMap(
96+
HashMap(
9297
equals: (k1, k2) => k2 == k1,
9398
hashCode: (key) => key.hashCode + 1,
94-
isValidKey: (_) => true));
95-
testMap(LinkedHashMap(
99+
isValidKey: (_) => true,
100+
),
101+
);
102+
testMap(
103+
LinkedHashMap(
96104
equals: (k1, k2) => k2 == k1,
97105
hashCode: (key) => key.hashCode + 1,
98-
isValidKey: (_) => true));
106+
isValidKey: (_) => true,
107+
),
108+
);
99109
}

tests/lib/convert/ascii_test.dart

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import 'dart:convert';
88
var asciiStrings = [
99
"pure ascii",
1010
"\x00 with control characters \n",
11-
"\x01 edge cases \x7f"
11+
"\x01 edge cases \x7f",
1212
];
1313

1414
var nonAsciiStrings = [
1515
"\x80 edge case first",
1616
"Edge case ASCII \u{80}",
1717
"Edge case byte \u{ff}",
18-
"Edge case super-BMP \u{10000}"
18+
"Edge case super-BMP \u{10000}",
1919
];
2020

2121
void main() {
@@ -50,9 +50,13 @@ void testDirectConversions() {
5050
}
5151

5252
for (var nonAsciiString in nonAsciiStrings) {
53-
Expect.throws(() {
54-
print(codec.encoder.convert(nonAsciiString));
55-
}, (_) => true, nonAsciiString);
53+
Expect.throws(
54+
() {
55+
print(codec.encoder.convert(nonAsciiString));
56+
},
57+
(_) => true,
58+
nonAsciiString,
59+
);
5660
}
5761

5862
var encode = codec.encoder.convert;
@@ -113,7 +117,10 @@ void testDirectConversions() {
113117
}
114118

115119
List<int> encode(
116-
String str, int chunkSize, Converter<String, List<int>> converter) {
120+
String str,
121+
int chunkSize,
122+
Converter<String, List<int>> converter,
123+
) {
117124
List<int> bytes = <int>[];
118125
var byteSink = new ByteConversionSink.withCallback(bytes.addAll);
119126
var stringConversionSink = converter.startChunkedConversion(byteSink);
@@ -129,7 +136,10 @@ List<int> encode(
129136
}
130137

131138
String decode(
132-
List<int> bytes, int chunkSize, Converter<List<int>, String> converter) {
139+
List<int> bytes,
140+
int chunkSize,
141+
Converter<List<int>, String> converter,
142+
) {
133143
StringBuffer buf = new StringBuffer();
134144
var stringSink = new StringConversionSink.fromStringSink(buf);
135145
var byteConversionSink = converter.startChunkedConversion(stringSink);
@@ -149,7 +159,7 @@ void testChunkedConversions() {
149159
for (var converter in [
150160
ascii.encoder,
151161
new AsciiCodec().encoder,
152-
new AsciiEncoder()
162+
new AsciiEncoder(),
153163
]) {
154164
for (int chunkSize in [1, 2, 5, 50]) {
155165
for (var asciiString in asciiStrings) {
@@ -168,7 +178,7 @@ void testChunkedConversions() {
168178
for (var converter in [
169179
ascii.decoder,
170180
new AsciiCodec().decoder,
171-
new AsciiDecoder()
181+
new AsciiDecoder(),
172182
]) {
173183
for (int chunkSize in [1, 2, 5, 50]) {
174184
for (var asciiString in asciiStrings) {

tests/lib/convert/chunked_conversion1_test.dart

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,11 @@ main() {
127127

128128
// Test int->bool converter individually.
129129
Converter<int, bool> int2boolConverter = new IntBoolConverter1();
130-
Expect.listEquals(
131-
[true, false, true], [2, -2, 2].map(int2boolConverter.convert).toList());
130+
Expect.listEquals([
131+
true,
132+
false,
133+
true,
134+
], [2, -2, 2].map(int2boolConverter.convert).toList());
132135
var hasExecuted = false;
133136
boolSink = new MyChunkedBoolSink.withCallback((value) {
134137
hasExecuted = true;
@@ -146,8 +149,11 @@ main() {
146149

147150
// Test bool->int converter individually.
148151
Converter<bool, int> bool2intConverter = new BoolIntConverter1();
149-
Expect.listEquals(
150-
[1, 0, 1], [true, false, true].map(bool2intConverter.convert).toList());
152+
Expect.listEquals([
153+
1,
154+
0,
155+
1,
156+
], [true, false, true].map(bool2intConverter.convert).toList());
151157
hasExecuted = false;
152158
intSink = new MyChunkedIntSink.withCallback((value) {
153159
hasExecuted = true;
@@ -237,8 +243,9 @@ main() {
237243
hasExecuted = false;
238244

239245
// With identity between the two converters.
240-
fused =
241-
int2boolConverter.fuse(new IdentityConverter()).fuse(bool2intConverter);
246+
fused = int2boolConverter
247+
.fuse(new IdentityConverter())
248+
.fuse(bool2intConverter);
242249
Expect.listEquals([1, 0, 1], [2, -2, 2].map(fused.convert).toList());
243250
hasExecuted = false;
244251
intSink2 = new MyChunkedIntSink.withCallback((value) {

tests/lib/convert/chunked_conversion_json_decode1_test.dart

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,42 @@ final TESTS = [
1717
[[], "[]"],
1818
[
1919
[3, -4.5, true, "hi", false],
20-
'[3,-4.5,true,"hi",false]'
20+
'[3,-4.5,true,"hi",false]',
2121
],
2222
[
2323
[null],
24-
"[null]"
24+
"[null]",
2525
],
2626
[
2727
[
28-
[null]
28+
[null],
2929
],
30-
"[[null]]"
30+
"[[null]]",
3131
],
3232
[
3333
[
34-
[3]
34+
[3],
3535
],
36-
"[[3]]"
36+
"[[3]]",
3737
],
3838
[{}, "{}"],
3939
[
4040
{"x": 3, "y": 4.5, "z": "hi", "u": true, "v": false},
41-
'{"x":3,"y":4.5,"z":"hi","u":true,"v":false}'
41+
'{"x":3,"y":4.5,"z":"hi","u":true,"v":false}',
4242
],
4343
[
4444
{"x": null},
45-
'{"x":null}'
45+
'{"x":null}',
4646
],
4747
[
4848
{"x": {}},
49-
'{"x":{}}'
49+
'{"x":{}}',
5050
],
5151
// Note that -0.0 won't be treated the same in JS. The Json spec seems to
5252
// allow it, though.
5353
[
5454
{"hi there": 499, "'": -0.0},
55-
'{"hi there":499,"\'":-0.0}'
55+
'{"hi there":499,"\'":-0.0}',
5656
],
5757
[r'\foo', r'"\\foo"'],
5858
];
@@ -81,8 +81,9 @@ bool isJsonEqual(o1, o2) {
8181
Object? decode(String str) {
8282
Object? result;
8383
var decoder = new JsonDecoder(null);
84-
ChunkedConversionSink objectSink =
85-
new ChunkedConversionSink.withCallback((x) => result = x.single);
84+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
85+
(x) => result = x.single,
86+
);
8687
var stringConversionSink = decoder.startChunkedConversion(objectSink);
8788
stringConversionSink.add(str);
8889
stringConversionSink.close();
@@ -92,8 +93,9 @@ Object? decode(String str) {
9293
Object? decode2(String str) {
9394
Object? result;
9495
var decoder = new JsonDecoder(null);
95-
ChunkedConversionSink objectSink =
96-
new ChunkedConversionSink.withCallback((x) => result = x.single);
96+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
97+
(x) => result = x.single,
98+
);
9799
var stringConversionSink = decoder.startChunkedConversion(objectSink);
98100
ClosableStringSink stringSink = stringConversionSink.asStringSink();
99101
stringSink.write(str);
@@ -104,8 +106,9 @@ Object? decode2(String str) {
104106
Object? decode3(String str) {
105107
Object? result;
106108
var decoder = new JsonDecoder(null);
107-
ChunkedConversionSink objectSink =
108-
new ChunkedConversionSink.withCallback((x) => result = x.single);
109+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
110+
(x) => result = x.single,
111+
);
109112
var stringConversionSink = decoder.startChunkedConversion(objectSink);
110113
ClosableStringSink stringSink = stringConversionSink.asStringSink();
111114
str.codeUnits.forEach(stringSink.writeCharCode);
@@ -116,8 +119,9 @@ Object? decode3(String str) {
116119
Object? decode4(String str) {
117120
Object? result;
118121
var decoder = new JsonDecoder(null);
119-
ChunkedConversionSink objectSink =
120-
new ChunkedConversionSink.withCallback((x) => result = x.single);
122+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
123+
(x) => result = x.single,
124+
);
121125
var stringConversionSink = decoder.startChunkedConversion(objectSink);
122126
ClosableStringSink stringSink = stringConversionSink.asStringSink();
123127
str.runes.forEach(stringSink.writeCharCode);
@@ -128,8 +132,9 @@ Object? decode4(String str) {
128132
Object? decode5(String str) {
129133
Object? result;
130134
var decoder = new JsonDecoder(null);
131-
ChunkedConversionSink objectSink =
132-
new ChunkedConversionSink.withCallback((x) => result = x.single);
135+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
136+
(x) => result = x.single,
137+
);
133138
var stringConversionSink = decoder.startChunkedConversion(objectSink);
134139
ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(false);
135140
var tmpBytes = utf8.encode(str);
@@ -141,8 +146,9 @@ Object? decode5(String str) {
141146
Object? decode6(String str) {
142147
Object? result;
143148
var decoder = new JsonDecoder(null);
144-
ChunkedConversionSink objectSink =
145-
new ChunkedConversionSink.withCallback((x) => result = x.single);
149+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
150+
(x) => result = x.single,
151+
);
146152
var stringConversionSink = decoder.startChunkedConversion(objectSink);
147153
ByteConversionSink inputByteSink = stringConversionSink.asUtf8Sink(false);
148154
var tmpBytes = utf8.encode(str);
@@ -154,8 +160,9 @@ Object? decode6(String str) {
154160
Object? decode7(String str) {
155161
Object? result;
156162
var decoder = new JsonDecoder(null);
157-
ChunkedConversionSink objectSink =
158-
new ChunkedConversionSink.withCallback((x) => result = x.single);
163+
ChunkedConversionSink objectSink = new ChunkedConversionSink.withCallback(
164+
(x) => result = x.single,
165+
);
159166
var stringConversionSink = decoder.startChunkedConversion(objectSink);
160167
stringConversionSink.addSlice("1" + str + "2", 1, str.length + 1, false);
161168
stringConversionSink.close();
@@ -166,14 +173,15 @@ main() {
166173
var tests = TESTS.expand((test) {
167174
var object = test[0];
168175
var string = test[1];
169-
var longString = " "
176+
var longString =
177+
" "
170178
" "
171179
"$string"
172180
" "
173181
" ";
174182
return [
175183
test,
176-
[object, longString]
184+
[object, longString],
177185
];
178186
});
179187
for (var test in tests) {

0 commit comments

Comments
 (0)