Skip to content

F
Front-End
Unverified Commit c78c9133 authored by Alexandre Ardhuin's avatar Alexandre Ardhuin Committed by GitHub
Browse files
Options

add missing trailing commas (#81042)

parent d332cbdf
Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 185 deletions
packages/flutter/test/services/autofill_test.dart
View file @ c78c9133
......@@ -88,7 +88,8 @@ void main() {
));
expect(client2.currentTextEditingValue, text2);
});
},
);
});
}
......@@ -212,7 +213,8 @@ class FakeTextChannel implements MethodChannel {
print(
'Index $i did not match:\n'
' actual: ${outgoingCalls[i]}\n'
' expected: ${calls[i]}');
' expected: ${calls[i]}',
);
hasError = true;
}
}
......
packages/flutter/test/services/binding_test.dart
View file @ c78c9133
......@@ -56,11 +56,15 @@ void main() {
final List<LicenseEntry> licenses = await LicenseRegistry.licenses.toList();
expect(licenses[0].packages, equals(<String>['L1Package1', 'L1Package2', 'L1Package3']));
expect(licenses[0].paragraphs.map((LicenseParagraph p) => p.text),
equals(<String>['L1Paragraph1', 'L1Paragraph2', 'L1Paragraph3']));
expect(
licenses[0].paragraphs.map((LicenseParagraph p) => p.text),
equals(<String>['L1Paragraph1', 'L1Paragraph2', 'L1Paragraph3']),
);
expect(licenses[1].packages, equals(<String>['L2Package1', 'L2Package2', 'L2Package3']));
expect(licenses[1].paragraphs.map((LicenseParagraph p) => p.text),
equals(<String>['L2Paragraph1', 'L2Paragraph2', 'L2Paragraph3']));
expect(
licenses[1].paragraphs.map((LicenseParagraph p) => p.text),
equals(<String>['L2Paragraph1', 'L2Paragraph2', 'L2Paragraph3']),
);
});
}
packages/flutter/test/services/default_binary_messenger_test.dart
View file @ c78c9133
......@@ -22,12 +22,14 @@ void main() {
int count = 0;
const String channel = 'foo';
ServicesBinding.instance!.defaultBinaryMessenger.handlePlatformMessage(
channel, _makeByteData('bar'), (ByteData? message) async {
channel,
_makeByteData('bar'),
(ByteData? message) async {
count += 1;
});
},
);
expect(count, equals(0));
await ui.channelBuffers.drain(channel,
(ByteData? data, ui.PlatformMessageResponseCallback callback) async {
await ui.channelBuffers.drain(channel, (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
callback(null);
});
expect(count, equals(1));
......
packages/flutter/test/services/keyboard_key_test.dart
View file @ c78c9133
......@@ -72,7 +72,8 @@ void main() {
LogicalKeyboardKey.control,
LogicalKeyboardKey.alt,
LogicalKeyboardKey.meta,
}));
}),
);
expect(
LogicalKeyboardKey.collapseSynonyms(<LogicalKeyboardKey>{
LogicalKeyboardKey.shiftRight,
......@@ -85,7 +86,8 @@ void main() {
LogicalKeyboardKey.control,
LogicalKeyboardKey.alt,
LogicalKeyboardKey.meta,
}));
}),
);
expect(
LogicalKeyboardKey.collapseSynonyms(<LogicalKeyboardKey>{
LogicalKeyboardKey.shiftLeft,
......@@ -102,7 +104,8 @@ void main() {
LogicalKeyboardKey.control,
LogicalKeyboardKey.alt,
LogicalKeyboardKey.meta,
}));
}),
);
});
test('Values are equal', () async {
expect(LogicalKeyboardKey.keyA == LogicalKeyboardKey(LogicalKeyboardKey.keyA.keyId), true);
......
packages/flutter/test/services/message_codecs_test.dart
View file @ c78c9133
......@@ -55,10 +55,13 @@ void main() {
);
expect(
() => method.decodeEnvelope(errorData),
throwsA(predicate((PlatformException e) =>
throwsA(predicate(
(PlatformException e) =>
e.code == 'errorCode' &&
e.message == 'errorMessage' &&
e.details == 'errorDetails')));
e.details == 'errorDetails',
)),
);
});
test('should decode error envelope with native stacktrace.', () {
final WriteBuffer buffer = WriteBuffer();
......@@ -70,8 +73,8 @@ void main() {
final ByteData errorData = buffer.done();
expect(
() => method.decodeEnvelope(errorData),
throwsA(predicate((PlatformException e) =>
e.stacktrace == 'errorStacktrace')));
throwsA(predicate((PlatformException e) => e.stacktrace == 'errorStacktrace')),
);
});
test('should allow null error message,', () {
......@@ -104,23 +107,25 @@ void main() {
);
expect(
() => jsonMethodCodec.decodeEnvelope(errorData),
throwsA(predicate((PlatformException e) =>
throwsA(predicate(
(PlatformException e) =>
e.code == 'errorCode' &&
e.message == 'errorMessage' &&
e.details == 'errorDetails')));
e.details == 'errorDetails',
)),
);
});
test('should decode error envelope with native stacktrace.', () {
final ByteData? errorData = stringCodec.encodeMessage(json
.encode(<dynamic>[
final ByteData? errorData = stringCodec.encodeMessage(json.encode(<dynamic>[
'errorCode',
'errorMessage',
'errorDetails',
'errorStacktrace'
'errorStacktrace',
]));
expect(
() => jsonMethodCodec.decodeEnvelope(errorData!),
throwsA(predicate((PlatformException e) =>
e.stacktrace == 'errorStacktrace')));
throwsA(predicate((PlatformException e) => e.stacktrace == 'errorStacktrace')),
);
});
});
group('JSON message codec', () {
......
packages/flutter/test/services/message_codecs_testing.dart
View file @ c78c9133
......@@ -46,8 +46,7 @@ bool deepEquals(dynamic valueA, dynamic valueB) {
bool deepEqualsTypedData(TypedData valueA, TypedData valueB) {
if (valueA is ByteData) {
return valueB is ByteData
&& deepEqualsList(
valueA.buffer.asUint8List(), valueB.buffer.asUint8List());
&& deepEqualsList(valueA.buffer.asUint8List(), valueB.buffer.asUint8List());
}
if (valueA is Uint8List)
return valueB is Uint8List && deepEqualsList(valueA, valueB);
......
packages/flutter/test/services/message_codecs_vm_test.dart
View file @ c78c9133
......@@ -74,8 +74,7 @@ void main() {
test('should encode and decode a list containing big numbers', () {
final List<dynamic> message = <dynamic>[
-7000000000000000007,
Int64List.fromList(
<int>[-0x7fffffffffffffff - 1, 0, 0x7fffffffffffffff]),
Int64List.fromList(<int>[-0x7fffffffffffffff - 1, 0, 0x7fffffffffffffff]),
];
checkEncodeDecode<dynamic>(standard, message);
});
......
packages/flutter/test/services/platform_views_test.dart
View file @ c78c9133
......@@ -54,7 +54,8 @@ void main() {
const FakeAndroidPlatformView(0, 'webview', Size(100.0, 100.0), AndroidViewController.kAndroidLayoutDirectionLtr, null),
const FakeAndroidPlatformView(1, 'webview', Size(200.0, 300.0), AndroidViewController.kAndroidLayoutDirectionRtl, null),
const FakeAndroidPlatformView(2, 'webview', null, AndroidViewController.kAndroidLayoutDirectionRtl, true),
]));
]),
);
});
test('reuse Android view id', () async {
......@@ -66,8 +67,12 @@ void main() {
).setSize(const Size(100.0, 100.0));
expect(
() => PlatformViewsService.initAndroidView(
id: 0, viewType: 'web', layoutDirection: TextDirection.ltr).setSize(const Size(100.0, 100.0)),
throwsA(isA<PlatformException>()));
id: 0,
viewType: 'web',
layoutDirection: TextDirection.ltr,
).setSize(const Size(100.0, 100.0)),
throwsA(isA<PlatformException>()),
);
await PlatformViewsService.initSurfaceAndroidView(
id: 1,
......@@ -76,14 +81,21 @@ void main() {
).create();
expect(
() => PlatformViewsService.initSurfaceAndroidView(
id: 1, viewType: 'web', layoutDirection: TextDirection.ltr).create(),
throwsA(isA<PlatformException>()));
id: 1,
viewType: 'web',
layoutDirection: TextDirection.ltr,
).create(),
throwsA(isA<PlatformException>()),
);
});
test('dispose Android view', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initAndroidView(
id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr).setSize(const Size(100.0, 100.0));
id: 0,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
).setSize(const Size(100.0, 100.0));
final AndroidViewController viewController =
PlatformViewsService.initAndroidView(id: 1, viewType: 'webview', layoutDirection: TextDirection.ltr);
await viewController.setSize(const Size(200.0, 300.0));
......@@ -97,13 +109,17 @@ void main() {
viewsController.views,
unorderedEquals(<FakeAndroidPlatformView>[
const FakeAndroidPlatformView(0, 'webview', Size(100.0, 100.0), AndroidViewController.kAndroidLayoutDirectionLtr, null),
]));
]),
);
});
test('dispose inexisting Android view', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initAndroidView(
id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr).setSize(const Size(100.0, 100.0));
id: 0,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
).setSize(const Size(100.0, 100.0));
final AndroidViewController viewController =
PlatformViewsService.initAndroidView(id: 1, viewType: 'webview', layoutDirection: TextDirection.ltr);
await viewController.setSize(const Size(200.0, 300.0));
......@@ -118,7 +134,7 @@ void main() {
id: 0,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
onFocus: () { didFocus = true; }
onFocus: () { didFocus = true; },
);
await viewController.setSize(const Size(100.0, 100.0));
await viewController.dispose();
......@@ -131,7 +147,10 @@ void main() {
test('resize Android view', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initAndroidView(
id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr).setSize(const Size(100.0, 100.0));
id: 0,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
).setSize(const Size(100.0, 100.0));
final AndroidViewController viewController =
PlatformViewsService.initAndroidView(id: 1, viewType: 'webview', layoutDirection: TextDirection.ltr);
await viewController.setSize(const Size(200.0, 300.0));
......@@ -141,7 +160,8 @@ void main() {
unorderedEquals(<FakeAndroidPlatformView>[
const FakeAndroidPlatformView(0, 'webview', Size(100.0, 100.0), AndroidViewController.kAndroidLayoutDirectionLtr, null),
const FakeAndroidPlatformView(1, 'webview', Size(500.0, 500.0), AndroidViewController.kAndroidLayoutDirectionLtr, null),
]));
]),
);
});
test('OnPlatformViewCreated callback', () async {
......@@ -181,7 +201,8 @@ void main() {
viewsController.views,
unorderedEquals(<FakeAndroidPlatformView>[
const FakeAndroidPlatformView(0, 'webview', Size(100.0, 100.0), AndroidViewController.kAndroidLayoutDirectionLtr, null),
]));
]),
);
});
test("change Android view's directionality after creation", () async {
......@@ -194,7 +215,8 @@ void main() {
viewsController.views,
unorderedEquals(<FakeAndroidPlatformView>[
const FakeAndroidPlatformView(0, 'webview', Size(100.0, 100.0), AndroidViewController.kAndroidLayoutDirectionRtl, null),
]));
]),
);
});
});
......@@ -219,10 +241,8 @@ void main() {
test('create iOS views', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initUiKitView(
id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr);
await PlatformViewsService.initUiKitView(
id: 1, viewType: 'webview', layoutDirection: TextDirection.rtl);
await PlatformViewsService.initUiKitView(id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr);
await PlatformViewsService.initUiKitView(id: 1, viewType: 'webview', layoutDirection: TextDirection.rtl);
expect(
viewsController.views,
unorderedEquals(<FakeUiKitView>[
......@@ -240,32 +260,37 @@ void main() {
layoutDirection: TextDirection.ltr,
);
expect(
() => PlatformViewsService.initUiKitView(
id: 0, viewType: 'web', layoutDirection: TextDirection.ltr),
() => PlatformViewsService.initUiKitView(id: 0, viewType: 'web', layoutDirection: TextDirection.ltr),
throwsA(isA<PlatformException>()),
);
});
test('dispose iOS view', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initUiKitView(
id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr);
await PlatformViewsService.initUiKitView(id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr);
final UiKitViewController viewController = await PlatformViewsService.initUiKitView(
id: 1, viewType: 'webview', layoutDirection: TextDirection.ltr);
id: 1,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
);
viewController.dispose();
expect(
viewsController.views,
unorderedEquals(<FakeUiKitView>[
const FakeUiKitView(0, 'webview'),
]));
]),
);
});
test('dispose inexisting iOS view', () async {
viewsController.registerViewType('webview');
await PlatformViewsService.initUiKitView(id: 0, viewType: 'webview', layoutDirection: TextDirection.ltr);
final UiKitViewController viewController = await PlatformViewsService.initUiKitView(
id: 1, viewType: 'webview', layoutDirection: TextDirection.ltr);
id: 1,
viewType: 'webview',
layoutDirection: TextDirection.ltr,
);
await viewController.dispose();
expect(
() async {
......
packages/flutter/test/services/raw_keyboard_test.dart
View file @ c78c9133
......@@ -119,7 +119,8 @@ void main() {
if (platform != 'macos') LogicalKeyboardKey.fn,
},
),
reason: 'on $platform');
reason: 'on $platform',
);
await simulateKeyDownEvent(LogicalKeyboardKey.f12, platform: platform);
expect(
RawKeyboard.instance.keysPressed,
......@@ -1539,7 +1540,7 @@ void main() {
(ByteData? data) {
final Map<String, dynamic> decoded = SystemChannels.keyEvent.codec.decodeMessage(data) as Map<String, dynamic>;
lastHandled = decoded['handled'] as bool;
}
},
);
}
RawKeyboard.instance.addListener(events.add);
......
packages/flutter/test/services/restoration_bucket_test.dart
View file @ c78c9133
......@@ -191,7 +191,7 @@ void main() {
'The following IDs were claimed multiple times from the parent RestorationBucket(restorationId: root, owner: MockManager):\n'
' * "child1" was claimed by:\n'
' * SecondClaim\n'
' * FirstClaim (current owner)'
' * FirstClaim (current owner)',
);
}
});
......
packages/flutter/test/services/restoration_test.dart
View file @ c78c9133
......@@ -322,7 +322,7 @@ Map<dynamic, dynamic> _createEncodedRestorationData1() {
'child1' : <String, dynamic>{
valuesMapKey : <String, dynamic>{
'another value': 22,
}
},
},
},
};
......@@ -338,7 +338,7 @@ Map<dynamic, dynamic> _createEncodedRestorationData2() {
'childFoo' : <String, dynamic>{
valuesMapKey : <String, dynamic>{
'bar': 'Hello',
}
},
},
},
};
......
packages/flutter/test/services/system_chrome_test.dart
View file @ c78c9133
......@@ -47,7 +47,7 @@ void main() {
});
await SystemChrome.setApplicationSwitcherDescription(
const ApplicationSwitcherDescription(label: 'Example label', primaryColor: 0xFF00FF00)
const ApplicationSwitcherDescription(label: 'Example label', primaryColor: 0xFF00FF00),
);
expect(log, hasLength(1));
......@@ -65,7 +65,7 @@ void main() {
});
await SystemChrome.setApplicationSwitcherDescription(
const ApplicationSwitcherDescription(label: 'Example label', primaryColor: 0xFF00FF00)
const ApplicationSwitcherDescription(label: 'Example label', primaryColor: 0xFF00FF00),
);
expect(log, isNotEmpty);
......
packages/flutter/test/services/text_formatter_test.dart
View file @ c78c9133
......@@ -22,7 +22,7 @@ void main() {
calledOldValue = oldValue;
calledNewValue = newValue;
return TextEditingValue.empty;
}
},
);
formatterUnderTest.formatEditUpdate(testOldValue, testNewValue);
......@@ -416,7 +416,7 @@ void main() {
LengthLimitingTextInputFormatter(maxLength);
final TextEditingValue formatted = formatter.formatEditUpdate(
oldValue,
newValue
newValue,
);
expect(formatted.text, newValue.text);
});
......@@ -436,7 +436,7 @@ void main() {
LengthLimitingTextInputFormatter(maxLength);
final TextEditingValue formatted = formatter.formatEditUpdate(
oldValue,
newValue
newValue,
);
expect(formatted.text, oldValue.text);
});
......@@ -456,7 +456,7 @@ void main() {
LengthLimitingTextInputFormatter(maxLength);
final TextEditingValue formatted = formatter.formatEditUpdate(
oldValue,
newValue
newValue,
);
expect(formatted.text, 'bbbbbbbbbb');
});
......@@ -575,8 +575,7 @@ void main() {
final TextInputFormatter formatter =
FilteringTextInputFormatter.digitsOnly;
TextEditingValue formatted = formatter.formatEditUpdate(oldValue,
newValue);
TextEditingValue formatted = formatter.formatEditUpdate(oldValue, newValue);
// assert that we are passing digits only at the first time
expect(oldValue.text, equals('123'));
......@@ -586,8 +585,7 @@ void main() {
expect(formatted.selection.baseOffset, equals(6));
// move cursor at the middle of the text and then add the number 9.
oldValue = newValue.copyWith(
selection: const TextSelection.collapsed(offset: 4));
oldValue = newValue.copyWith(selection: const TextSelection.collapsed(offset: 4));
newValue = oldValue.copyWith(text: '1239456');
formatted = formatter.formatEditUpdate(oldValue, newValue);
......@@ -608,8 +606,7 @@ void main() {
final TextInputFormatter formatter =
FilteringTextInputFormatter.digitsOnly;
TextEditingValue formatted = formatter.formatEditUpdate(oldValue,
newValue);
TextEditingValue formatted = formatter.formatEditUpdate(oldValue, newValue);
// assert that we are passing digits only at the first time
expect(oldValue.text, equals('123'));
......@@ -619,8 +616,7 @@ void main() {
expect(formatted.selection.baseOffset, equals(6));
// move cursor at the middle of the text and then add the number 9.
oldValue = newValue.copyWith(
selection: const TextSelection.collapsed(offset: 4));
oldValue = newValue.copyWith(selection: const TextSelection.collapsed(offset: 4));
newValue = oldValue.copyWith(text: '1239456');
formatted = formatter.formatEditUpdate(oldValue, newValue);
......
packages/flutter/test/services/text_input_test.dart
View file @ c78c9133
......@@ -70,7 +70,8 @@ void main() {
'selectionIsDirectional': false,
'composingBase': -1,
'composingExtent': -1,
}),
},
),
]);
});
});
......@@ -197,8 +198,7 @@ void main() {
final ByteData? messageBytes = const JSONMessageCodec().encodeMessage(<String, dynamic>{
'args': <dynamic>[
1,
jsonDecode(
'{"action": "actionCommand", "data": {"input_context" : "abcdefg"}}')
jsonDecode('{"action": "actionCommand", "data": {"input_context" : "abcdefg"}}'),
],
'method': 'TextInputClient.performPrivateCommand',
});
......@@ -211,8 +211,7 @@ void main() {
expect(client.latestMethodCall, 'performPrivateCommand');
});
test('TextInputClient performPrivateCommand method is called with float',
() async {
test('TextInputClient performPrivateCommand method is called with float', () async {
// Assemble a TextInputConnection so we can verify its change in state.
final FakeTextInputClient client = FakeTextInputClient(TextEditingValue.empty);
const TextInputConfiguration configuration = TextInputConfiguration();
......@@ -224,8 +223,7 @@ void main() {
final ByteData? messageBytes = const JSONMessageCodec().encodeMessage(<String, dynamic>{
'args': <dynamic>[
1,
jsonDecode(
'{"action": "actionCommand", "data": {"input_context" : 0.5}}')
jsonDecode('{"action": "actionCommand", "data": {"input_context" : 0.5}}'),
],
'method': 'TextInputClient.performPrivateCommand',
});
......@@ -238,9 +236,7 @@ void main() {
expect(client.latestMethodCall, 'performPrivateCommand');
});
test(
'TextInputClient performPrivateCommand method is called with CharSequence array',
() async {
test('TextInputClient performPrivateCommand method is called with CharSequence array', () async {
// Assemble a TextInputConnection so we can verify its change in state.
final FakeTextInputClient client = FakeTextInputClient(TextEditingValue.empty);
const TextInputConfiguration configuration = TextInputConfiguration();
......@@ -252,8 +248,7 @@ void main() {
final ByteData? messageBytes = const JSONMessageCodec().encodeMessage(<String, dynamic>{
'args': <dynamic>[
1,
jsonDecode(
'{"action": "actionCommand", "data": {"input_context" : ["abc", "efg"]}}')
jsonDecode('{"action": "actionCommand", "data": {"input_context" : ["abc", "efg"]}}'),
],
'method': 'TextInputClient.performPrivateCommand',
});
......@@ -266,9 +261,7 @@ void main() {
expect(client.latestMethodCall, 'performPrivateCommand');
});
test(
'TextInputClient performPrivateCommand method is called with CharSequence',
() async {
test('TextInputClient performPrivateCommand method is called with CharSequence', () async {
// Assemble a TextInputConnection so we can verify its change in state.
final FakeTextInputClient client = FakeTextInputClient(TextEditingValue.empty);
const TextInputConfiguration configuration = TextInputConfiguration();
......@@ -281,8 +274,7 @@ void main() {
const JSONMessageCodec().encodeMessage(<String, dynamic>{
'args': <dynamic>[
1,
jsonDecode(
'{"action": "actionCommand", "data": {"input_context" : "abc"}}')
jsonDecode('{"action": "actionCommand", "data": {"input_context" : "abc"}}'),
],
'method': 'TextInputClient.performPrivateCommand',
});
......@@ -295,9 +287,7 @@ void main() {
expect(client.latestMethodCall, 'performPrivateCommand');
});
test(
'TextInputClient performPrivateCommand method is called with float array',
() async {
test('TextInputClient performPrivateCommand method is called with float array', () async {
// Assemble a TextInputConnection so we can verify its change in state.
final FakeTextInputClient client = FakeTextInputClient(TextEditingValue.empty);
const TextInputConfiguration configuration = TextInputConfiguration();
......@@ -310,8 +300,7 @@ void main() {
const JSONMessageCodec().encodeMessage(<String, dynamic>{
'args': <dynamic>[
1,
jsonDecode(
'{"action": "actionCommand", "data": {"input_context" : [0.5, 0.8]}}')
jsonDecode('{"action": "actionCommand", "data": {"input_context" : [0.5, 0.8]}}'),
],
'method': 'TextInputClient.performPrivateCommand',
});
......@@ -324,8 +313,7 @@ void main() {
expect(client.latestMethodCall, 'performPrivateCommand');
});
test('TextInputClient showAutocorrectionPromptRect method is called',
() async {
test('TextInputClient showAutocorrectionPromptRect method is called', () async {
// Assemble a TextInputConnection so we can verify its change in state.
final FakeTextInputClient client = FakeTextInputClient(TextEditingValue.empty);
const TextInputConfiguration configuration = TextInputConfiguration();
......@@ -477,7 +465,8 @@ class FakeTextChannel implements MethodChannel {
print(
'Index $i did not match:\n'
' actual: $outgoingString\n'
' expected: $expectedString');
' expected: $expectedString',
);
hasError = true;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab