From b1f5d96a82a91c6b1423d5febafa403bfeb8b632 Mon Sep 17 00:00:00 2001 From: Taha Tesser Date: Thu, 2 Nov 2023 00:03:54 +0200 Subject: [PATCH] Update `framework_test.dart` to remove `ButtonBar` usage and remove references from other clases (#137550) This PR removes `ButtonBar` usage from `framework_test.dart` class and update other references in preparation for `ButtonBar` deprecation related to https://github.com/flutter/flutter/issues/127955 --- packages/flutter/lib/src/material/banner.dart | 6 ++-- .../flutter/test/material/dialog_test.dart | 36 +++++++++---------- .../flutter/test/widgets/framework_test.dart | 12 +++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/flutter/lib/src/material/banner.dart b/packages/flutter/lib/src/material/banner.dart index de2ef0d08ed..3573a108632 100644 --- a/packages/flutter/lib/src/material/banner.dart +++ b/packages/flutter/lib/src/material/banner.dart @@ -318,7 +318,7 @@ class _MaterialBannerState extends State { ?? bannerTheme.leadingPadding ?? const EdgeInsetsDirectional.only(end: 16.0); - final Widget buttonBar = Container( + final Widget actionsBar = Container( alignment: AlignmentDirectional.centerEnd, constraints: const BoxConstraints(minHeight: 52.0), padding: const EdgeInsets.symmetric(horizontal: 8), @@ -372,12 +372,12 @@ class _MaterialBannerState extends State { ), ), if (isSingleRow) - buttonBar, + actionsBar, ], ), ), if (!isSingleRow) - buttonBar, + actionsBar, if (elevation == 0) Divider(height: 0, color: dividerColor), ], diff --git a/packages/flutter/test/material/dialog_test.dart b/packages/flutter/test/material/dialog_test.dart index ab50283e557..be12f2af742 100644 --- a/packages/flutter/test/material/dialog_test.dart +++ b/packages/flutter/test/material/dialog_test.dart @@ -57,7 +57,7 @@ RenderParagraph _getTextRenderObjectFromDialog(WidgetTester tester, String text) // What was the AlertDialog's ButtonBar when many of these tests were written, // is now a Padding widget with an OverflowBar child. The Padding widget's size // and location match the original ButtonBar's size and location. -Finder _findButtonBar() { +Finder _findOverflowBar() { return find.ancestor(of: find.byType(OverflowBar), matching: find.byType(Padding)).first; } @@ -610,7 +610,7 @@ void main() { matching: find.byType(Material), ).first, ); - final Size actionsSize = tester.getSize(_findButtonBar()); + final Size actionsSize = tester.getSize(_findOverflowBar()); expect(actionsSize.width, dialogSize.width); }); @@ -687,25 +687,25 @@ void main() { // First button expect( tester.getTopRight(find.byKey(key1)).dy, - tester.getTopRight(_findButtonBar()).dy + 8.0, + tester.getTopRight(_findOverflowBar()).dy + 8.0, ); // top expect( tester.getBottomRight(find.byKey(key1)).dy, - tester.getBottomRight(_findButtonBar()).dy - 8.0, + tester.getBottomRight(_findOverflowBar()).dy - 8.0, ); // bottom // Second button expect( tester.getTopRight(find.byKey(key2)).dy, - tester.getTopRight(_findButtonBar()).dy + 8.0, + tester.getTopRight(_findOverflowBar()).dy + 8.0, ); // top expect( tester.getBottomRight(find.byKey(key2)).dy, - tester.getBottomRight(_findButtonBar()).dy - 8.0, + tester.getBottomRight(_findOverflowBar()).dy - 8.0, ); // bottom expect( tester.getBottomRight(find.byKey(key2)).dx, - tester.getBottomRight(_findButtonBar()).dx - 8.0, + tester.getBottomRight(_findOverflowBar()).dx - 8.0, ); // right }); @@ -745,25 +745,25 @@ void main() { // First button expect( tester.getTopRight(find.byKey(key1)).dy, - tester.getTopRight(_findButtonBar()).dy, + tester.getTopRight(_findOverflowBar()).dy, ); // top expect( tester.getBottomRight(find.byKey(key1)).dy, - tester.getBottomRight(_findButtonBar()).dy - 24.0, + tester.getBottomRight(_findOverflowBar()).dy - 24.0, ); // bottom // // Second button expect( tester.getTopRight(find.byKey(key2)).dy, - tester.getTopRight(_findButtonBar()).dy, + tester.getTopRight(_findOverflowBar()).dy, ); // top expect( tester.getBottomRight(find.byKey(key2)).dy, - tester.getBottomRight(_findButtonBar()).dy - 24.0, + tester.getBottomRight(_findOverflowBar()).dy - 24.0, ); // bottom expect( tester.getBottomRight(find.byKey(key2)).dx, - tester.getBottomRight(_findButtonBar()).dx - 24.0, + tester.getBottomRight(_findOverflowBar()).dx - 24.0, ); // right }); @@ -809,25 +809,25 @@ void main() { // First button expect( tester.getTopRight(find.byKey(key1)).dy, - tester.getTopRight(_findButtonBar()).dy + ((10.0 + 20.0) / 2), + tester.getTopRight(_findOverflowBar()).dy + ((10.0 + 20.0) / 2), ); // top expect( tester.getBottomRight(find.byKey(key1)).dy, - tester.getBottomRight(_findButtonBar()).dy - ((10.0 + 20.0) / 2), + tester.getBottomRight(_findOverflowBar()).dy - ((10.0 + 20.0) / 2), ); // bottom // Second button expect( tester.getTopRight(find.byKey(key2)).dy, - tester.getTopRight(_findButtonBar()).dy + ((10.0 + 20.0) / 2), + tester.getTopRight(_findOverflowBar()).dy + ((10.0 + 20.0) / 2), ); // top expect( tester.getBottomRight(find.byKey(key2)).dy, - tester.getBottomRight(_findButtonBar()).dy - ((10.0 + 20.0) / 2), + tester.getBottomRight(_findOverflowBar()).dy - ((10.0 + 20.0) / 2), ); // bottom expect( tester.getBottomRight(find.byKey(key2)).dx, - tester.getBottomRight(_findButtonBar()).dx - ((10.0 + 20.0) / 2), + tester.getBottomRight(_findOverflowBar()).dx - ((10.0 + 20.0) / 2), ); // right }); @@ -850,7 +850,7 @@ void main() { final Finder iconFinder = find.byKey(iconKey); final Finder titleFinder = find.byKey(titleKey); final Finder contentFinder = find.byKey(contentKey); - final Finder actionsFinder = _findButtonBar(); + final Finder actionsFinder = _findOverflowBar(); final Finder childrenFinder = find.byKey(childrenKey); Future openDialog(WidgetTester tester, Widget dialog, double textScaleFactor, {bool isM3 = false}) async { diff --git a/packages/flutter/test/widgets/framework_test.dart b/packages/flutter/test/widgets/framework_test.dart index d80e1e56670..19b630698c5 100644 --- a/packages/flutter/test/widgets/framework_test.dart +++ b/packages/flutter/test/widgets/framework_test.dart @@ -1580,10 +1580,10 @@ void main() { textDirection: TextDirection.ltr, child: Placeholder(), )); - final _TestInheritedElement buttonBarTheme = - _TestInheritedElement(const ButtonBarTheme( - data: ButtonBarThemeData( - alignment: MainAxisAlignment.center, + final _TestInheritedElement navigationBarTheme = + _TestInheritedElement(const NavigationBarTheme( + data: NavigationBarThemeData( + indicatorColor: Color(0xff00ff00), ), child: Placeholder(), )); @@ -1592,7 +1592,7 @@ void main() { element ..dependOnInheritedElement(focusTraversalOrder) ..dependOnInheritedElement(directionality) - ..dependOnInheritedElement(buttonBarTheme); + ..dependOnInheritedElement(navigationBarTheme); // Dependencies will be sorted by [debugFillProperties]. element.debugFillProperties(builder); @@ -1607,7 +1607,7 @@ void main() { final Set dependencies = dependenciesProperty.value!; expect(dependencies.length, equals(3)); - expect(dependenciesProperty.toDescription(), '[ButtonBarTheme, Directionality, FocusTraversalOrder]'); + expect(dependenciesProperty.toDescription(), '[Directionality, FocusTraversalOrder, NavigationBarTheme]'); }); testWidgetsWithLeakTracking('BuildOwner.globalKeyCount keeps track of in-use global keys', (WidgetTester tester) async {