From 0f72e7d300aa1d64f4fcee40ee2785e17cd069e1 Mon Sep 17 00:00:00 2001 From: Polina Cherkasova Date: Tue, 4 Jul 2023 10:03:39 -0700 Subject: [PATCH] Fix lints and warnings. (#5982) --- .../network_request_inspector_views.dart | 2 +- .../network_request_inspector_test.dart | 250 +++++++++--------- packages/pubspec.yaml | 9 + 3 files changed, 138 insertions(+), 123 deletions(-) create mode 100644 packages/pubspec.yaml diff --git a/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart b/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart index 5ac4c2d6f02..2f054040041 100644 --- a/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart +++ b/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart @@ -360,7 +360,7 @@ class HttpTextResponseViewer extends StatelessWidget { responseBody, style: textStyle, ), - _ => const SizedBox() + _ => const SizedBox(), }; }, ); diff --git a/packages/devtools_app/test/network/network_request_inspector_test.dart b/packages/devtools_app/test/network/network_request_inspector_test.dart index e4db35b6d3d..6359a5aff68 100644 --- a/packages/devtools_app/test/network/network_request_inspector_test.dart +++ b/packages/devtools_app/test/network/network_request_inspector_test.dart @@ -134,154 +134,160 @@ void main() { group('HttpResponseTrailingDropDown', () { testWidgets( - 'drop down value should update when response view type changes', - (tester) async { - NetworkResponseViewType? getCurrentDropDownValue() { - final RoundedDropDownButton dropDownWidget = - find - .byType(RoundedDropDownButton) - .evaluate() - .first - .widget as RoundedDropDownButton; - return dropDownWidget.value; - } - - final currentResponseViewType = ValueNotifier( - NetworkResponseViewType.auto, - ); - - // Matches Drop Down value with currentResponseViewType - void checkDropDownValue() { - final currentDropDownValue = getCurrentDropDownValue(); - expect(currentDropDownValue, equals(currentResponseViewType.value)); - } - - await tester.pumpWidget( - wrapWithControllers( - HttpResponseTrailingDropDown( - httpGet, - currentResponseViewType: currentResponseViewType, - onChanged: (value) { - currentResponseViewType.value = value; - }, + 'drop down value should update when response view type changes', + (tester) async { + NetworkResponseViewType? getCurrentDropDownValue() { + final RoundedDropDownButton + dropDownWidget = find + .byType(RoundedDropDownButton) + .evaluate() + .first + .widget as RoundedDropDownButton; + return dropDownWidget.value; + } + + final currentResponseViewType = + ValueNotifier( + NetworkResponseViewType.auto, + ); + + // Matches Drop Down value with currentResponseViewType + void checkDropDownValue() { + final currentDropDownValue = getCurrentDropDownValue(); + expect(currentDropDownValue, equals(currentResponseViewType.value)); + } + + await tester.pumpWidget( + wrapWithControllers( + HttpResponseTrailingDropDown( + httpGet, + currentResponseViewType: currentResponseViewType, + onChanged: (value) { + currentResponseViewType.value = value; + }, + ), + debugger: createMockDebuggerControllerWithDefaults(), ), - debugger: createMockDebuggerControllerWithDefaults(), - ), - ); + ); - await tester.pumpAndSettle(); - checkDropDownValue(); + await tester.pumpAndSettle(); + checkDropDownValue(); - currentResponseViewType.value = NetworkResponseViewType.text; - await tester.pumpAndSettle(); - checkDropDownValue(); + currentResponseViewType.value = NetworkResponseViewType.text; + await tester.pumpAndSettle(); + checkDropDownValue(); - currentResponseViewType.value = NetworkResponseViewType.auto; - await tester.pumpAndSettle(); - checkDropDownValue(); + currentResponseViewType.value = NetworkResponseViewType.auto; + await tester.pumpAndSettle(); + checkDropDownValue(); - // pumpAndSettle so residual http timers can clear. - await tester.pumpAndSettle(const Duration(seconds: 1)); - }); + // pumpAndSettle so residual http timers can clear. + await tester.pumpAndSettle(const Duration(seconds: 1)); + }, + ); testWidgets( - 'onChanged handler should trigger when changing drop down value', - (tester) async { - final currentResponseViewType = ValueNotifier( - NetworkResponseViewType.auto, - ); - String initial = 'Not changed'; - const String afterOnChanged = 'changed'; - - await tester.pumpWidget( - wrapWithControllers( - HttpResponseTrailingDropDown( - httpGet, - currentResponseViewType: currentResponseViewType, - onChanged: (value) { - initial = afterOnChanged; - }, + 'onChanged handler should trigger when changing drop down value', + (tester) async { + final currentResponseViewType = + ValueNotifier( + NetworkResponseViewType.auto, + ); + String initial = 'Not changed'; + const String afterOnChanged = 'changed'; + + await tester.pumpWidget( + wrapWithControllers( + HttpResponseTrailingDropDown( + httpGet, + currentResponseViewType: currentResponseViewType, + onChanged: (value) { + initial = afterOnChanged; + }, + ), + debugger: createMockDebuggerControllerWithDefaults(), ), - debugger: createMockDebuggerControllerWithDefaults(), - ), - ); + ); - final dropDownFinder = find.byType( - RoundedDropDownButton, - ); + final dropDownFinder = find.byType( + RoundedDropDownButton, + ); - await tester.tap(dropDownFinder); - await tester.pumpAndSettle(); + await tester.tap(dropDownFinder); + await tester.pumpAndSettle(); - // Select Json from drop down - await tester.tap( - find.text( - NetworkResponseViewType.json.toString(), - ), - ); + // Select Json from drop down + await tester.tap( + find.text( + NetworkResponseViewType.json.toString(), + ), + ); - await tester.pumpAndSettle(); + await tester.pumpAndSettle(); - expect( - initial, - afterOnChanged, - ); + expect( + initial, + afterOnChanged, + ); - // pumpAndSettle so residual http timers can clear. - await tester.pumpAndSettle(const Duration(seconds: 1)); - }); + // pumpAndSettle so residual http timers can clear. + await tester.pumpAndSettle(const Duration(seconds: 1)); + }, + ); }); testWidgets( - 'should update response view display when drop down value changes', - (tester) async { - final currentResponseNotifier = - ValueNotifier(NetworkResponseViewType.auto); - const contentType = 'application/json'; - final responseBody = httpGet.requestBody ?? '{}'; - const textStyle = TextStyle(); + 'should update response view display when drop down value changes', + (tester) async { + final currentResponseNotifier = ValueNotifier( + NetworkResponseViewType.auto, + ); + const contentType = 'application/json'; + final responseBody = httpGet.requestBody ?? '{}'; + const textStyle = TextStyle(); - await tester.pumpWidget( - wrapWithControllers( - Column( - children: [ - HttpTextResponseViewer( - contentType: contentType, - responseBody: responseBody, - currentResponseNotifier: currentResponseNotifier, - textStyle: textStyle, - ), - HttpResponseTrailingDropDown( - httpGet, - currentResponseViewType: currentResponseNotifier, - onChanged: (value) {}, - ), - ], + await tester.pumpWidget( + wrapWithControllers( + Column( + children: [ + HttpTextResponseViewer( + contentType: contentType, + responseBody: responseBody, + currentResponseNotifier: currentResponseNotifier, + textStyle: textStyle, + ), + HttpResponseTrailingDropDown( + httpGet, + currentResponseViewType: currentResponseNotifier, + onChanged: (value) {}, + ), + ], + ), + debugger: createMockDebuggerControllerWithDefaults(), ), - debugger: createMockDebuggerControllerWithDefaults(), - ), - ); + ); - await tester.pumpAndSettle(); + await tester.pumpAndSettle(); - currentResponseNotifier.value = NetworkResponseViewType.json; + currentResponseNotifier.value = NetworkResponseViewType.json; - await tester.pumpAndSettle(); + await tester.pumpAndSettle(); - // Check that Json viewer is visible - Finder jsonViewer = find.byType(JsonViewer); - expect(jsonViewer, findsOneWidget); + // Check that Json viewer is visible + Finder jsonViewer = find.byType(JsonViewer); + expect(jsonViewer, findsOneWidget); - currentResponseNotifier.value = NetworkResponseViewType.text; + currentResponseNotifier.value = NetworkResponseViewType.text; - await tester.pumpAndSettle(); + await tester.pumpAndSettle(); - // Check that Json viewer is not visible - jsonViewer = find.byType(JsonViewer); - expect(jsonViewer, findsNothing); + // Check that Json viewer is not visible + jsonViewer = find.byType(JsonViewer); + expect(jsonViewer, findsNothing); - // pumpAndSettle so residual http timers can clear. - await tester.pumpAndSettle(const Duration(seconds: 1)); - }); + // pumpAndSettle so residual http timers can clear. + await tester.pumpAndSettle(const Duration(seconds: 1)); + }, + ); }); } diff --git a/packages/pubspec.yaml b/packages/pubspec.yaml new file mode 100644 index 00000000000..6029551ab70 --- /dev/null +++ b/packages/pubspec.yaml @@ -0,0 +1,9 @@ +# This file exists to serve analysis_options.yaml +name: devtools_root +publish_to: none + +environment: + sdk: '>=3.0.0 <4.0.0' + +dev_dependencies: + flutter_lints: ^2.0.0