Skip to content

Commit

Permalink
Reverts "Update framework_test.dart to remove ButtonBar usage and…
Browse files Browse the repository at this point in the history
… remove references from other clases" (#137731)

Reverts flutter/flutter#137550
Initiated by: Piinks
This change reverts the following previous change:
Original Description:
This PR removes `ButtonBar` usage from `framework_test.dart` class and update other references in preparation for `ButtonBar` deprecation

related to flutter/flutter#127955
  • Loading branch information
auto-submit[bot] authored Nov 1, 2023
1 parent 43dc3fc commit b47e4c4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions packages/flutter/lib/src/material/banner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class _MaterialBannerState extends State<MaterialBanner> {
?? bannerTheme.leadingPadding
?? const EdgeInsetsDirectional.only(end: 16.0);

final Widget actionsBar = Container(
final Widget buttonBar = Container(
alignment: AlignmentDirectional.centerEnd,
constraints: const BoxConstraints(minHeight: 52.0),
padding: const EdgeInsets.symmetric(horizontal: 8),
Expand Down Expand Up @@ -372,12 +372,12 @@ class _MaterialBannerState extends State<MaterialBanner> {
),
),
if (isSingleRow)
actionsBar,
buttonBar,
],
),
),
if (!isSingleRow)
actionsBar,
buttonBar,
if (elevation == 0)
Divider(height: 0, color: dividerColor),
],
Expand Down
36 changes: 18 additions & 18 deletions packages/flutter/test/material/dialog_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 _findOverflowBar() {
Finder _findButtonBar() {
return find.ancestor(of: find.byType(OverflowBar), matching: find.byType(Padding)).first;
}

Expand Down Expand Up @@ -610,7 +610,7 @@ void main() {
matching: find.byType(Material),
).first,
);
final Size actionsSize = tester.getSize(_findOverflowBar());
final Size actionsSize = tester.getSize(_findButtonBar());

expect(actionsSize.width, dialogSize.width);
});
Expand Down Expand Up @@ -687,25 +687,25 @@ void main() {
// First button
expect(
tester.getTopRight(find.byKey(key1)).dy,
tester.getTopRight(_findOverflowBar()).dy + 8.0,
tester.getTopRight(_findButtonBar()).dy + 8.0,
); // top
expect(
tester.getBottomRight(find.byKey(key1)).dy,
tester.getBottomRight(_findOverflowBar()).dy - 8.0,
tester.getBottomRight(_findButtonBar()).dy - 8.0,
); // bottom

// Second button
expect(
tester.getTopRight(find.byKey(key2)).dy,
tester.getTopRight(_findOverflowBar()).dy + 8.0,
tester.getTopRight(_findButtonBar()).dy + 8.0,
); // top
expect(
tester.getBottomRight(find.byKey(key2)).dy,
tester.getBottomRight(_findOverflowBar()).dy - 8.0,
tester.getBottomRight(_findButtonBar()).dy - 8.0,
); // bottom
expect(
tester.getBottomRight(find.byKey(key2)).dx,
tester.getBottomRight(_findOverflowBar()).dx - 8.0,
tester.getBottomRight(_findButtonBar()).dx - 8.0,
); // right
});

Expand Down Expand Up @@ -745,25 +745,25 @@ void main() {
// First button
expect(
tester.getTopRight(find.byKey(key1)).dy,
tester.getTopRight(_findOverflowBar()).dy,
tester.getTopRight(_findButtonBar()).dy,
); // top
expect(
tester.getBottomRight(find.byKey(key1)).dy,
tester.getBottomRight(_findOverflowBar()).dy - 24.0,
tester.getBottomRight(_findButtonBar()).dy - 24.0,
); // bottom

// // Second button
expect(
tester.getTopRight(find.byKey(key2)).dy,
tester.getTopRight(_findOverflowBar()).dy,
tester.getTopRight(_findButtonBar()).dy,
); // top
expect(
tester.getBottomRight(find.byKey(key2)).dy,
tester.getBottomRight(_findOverflowBar()).dy - 24.0,
tester.getBottomRight(_findButtonBar()).dy - 24.0,
); // bottom
expect(
tester.getBottomRight(find.byKey(key2)).dx,
tester.getBottomRight(_findOverflowBar()).dx - 24.0,
tester.getBottomRight(_findButtonBar()).dx - 24.0,
); // right
});

Expand Down Expand Up @@ -809,25 +809,25 @@ void main() {
// First button
expect(
tester.getTopRight(find.byKey(key1)).dy,
tester.getTopRight(_findOverflowBar()).dy + ((10.0 + 20.0) / 2),
tester.getTopRight(_findButtonBar()).dy + ((10.0 + 20.0) / 2),
); // top
expect(
tester.getBottomRight(find.byKey(key1)).dy,
tester.getBottomRight(_findOverflowBar()).dy - ((10.0 + 20.0) / 2),
tester.getBottomRight(_findButtonBar()).dy - ((10.0 + 20.0) / 2),
); // bottom

// Second button
expect(
tester.getTopRight(find.byKey(key2)).dy,
tester.getTopRight(_findOverflowBar()).dy + ((10.0 + 20.0) / 2),
tester.getTopRight(_findButtonBar()).dy + ((10.0 + 20.0) / 2),
); // top
expect(
tester.getBottomRight(find.byKey(key2)).dy,
tester.getBottomRight(_findOverflowBar()).dy - ((10.0 + 20.0) / 2),
tester.getBottomRight(_findButtonBar()).dy - ((10.0 + 20.0) / 2),
); // bottom
expect(
tester.getBottomRight(find.byKey(key2)).dx,
tester.getBottomRight(_findOverflowBar()).dx - ((10.0 + 20.0) / 2),
tester.getBottomRight(_findButtonBar()).dx - ((10.0 + 20.0) / 2),
); // right
});

Expand All @@ -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 = _findOverflowBar();
final Finder actionsFinder = _findButtonBar();
final Finder childrenFinder = find.byKey(childrenKey);

Future<void> openDialog(WidgetTester tester, Widget dialog, double textScaleFactor, {bool isM3 = false}) async {
Expand Down
12 changes: 6 additions & 6 deletions packages/flutter/test/widgets/framework_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1580,10 +1580,10 @@ void main() {
textDirection: TextDirection.ltr,
child: Placeholder(),
));
final _TestInheritedElement navigationBarTheme =
_TestInheritedElement(const NavigationBarTheme(
data: NavigationBarThemeData(
indicatorColor: Color(0xff00ff00),
final _TestInheritedElement buttonBarTheme =
_TestInheritedElement(const ButtonBarTheme(
data: ButtonBarThemeData(
alignment: MainAxisAlignment.center,
),
child: Placeholder(),
));
Expand All @@ -1592,7 +1592,7 @@ void main() {
element
..dependOnInheritedElement(focusTraversalOrder)
..dependOnInheritedElement(directionality)
..dependOnInheritedElement(navigationBarTheme);
..dependOnInheritedElement(buttonBarTheme);

// Dependencies will be sorted by [debugFillProperties].
element.debugFillProperties(builder);
Expand All @@ -1607,7 +1607,7 @@ void main() {

final Set<InheritedElement> dependencies = dependenciesProperty.value!;
expect(dependencies.length, equals(3));
expect(dependenciesProperty.toDescription(), '[Directionality, FocusTraversalOrder, NavigationBarTheme]');
expect(dependenciesProperty.toDescription(), '[ButtonBarTheme, Directionality, FocusTraversalOrder]');
});

testWidgetsWithLeakTracking('BuildOwner.globalKeyCount keeps track of in-use global keys', (WidgetTester tester) async {
Expand Down

0 comments on commit b47e4c4

Please sign in to comment.