@@ -57,7 +57,7 @@ RenderParagraph _getTextRenderObjectFromDialog(WidgetTester tester, String text)
5757// What was the AlertDialog's ButtonBar when many of these tests were written,
5858// is now a Padding widget with an OverflowBar child. The Padding widget's size
5959// and location match the original ButtonBar's size and location.
60- Finder _findButtonBar () {
60+ Finder _findOverflowBar () {
6161 return find.ancestor (of: find.byType (OverflowBar ), matching: find.byType (Padding )).first;
6262}
6363
@@ -610,7 +610,7 @@ void main() {
610610 matching: find.byType (Material ),
611611 ).first,
612612 );
613- final Size actionsSize = tester.getSize (_findButtonBar ());
613+ final Size actionsSize = tester.getSize (_findOverflowBar ());
614614
615615 expect (actionsSize.width, dialogSize.width);
616616 });
@@ -687,25 +687,25 @@ void main() {
687687 // First button
688688 expect (
689689 tester.getTopRight (find.byKey (key1)).dy,
690- tester.getTopRight (_findButtonBar ()).dy + 8.0 ,
690+ tester.getTopRight (_findOverflowBar ()).dy + 8.0 ,
691691 ); // top
692692 expect (
693693 tester.getBottomRight (find.byKey (key1)).dy,
694- tester.getBottomRight (_findButtonBar ()).dy - 8.0 ,
694+ tester.getBottomRight (_findOverflowBar ()).dy - 8.0 ,
695695 ); // bottom
696696
697697 // Second button
698698 expect (
699699 tester.getTopRight (find.byKey (key2)).dy,
700- tester.getTopRight (_findButtonBar ()).dy + 8.0 ,
700+ tester.getTopRight (_findOverflowBar ()).dy + 8.0 ,
701701 ); // top
702702 expect (
703703 tester.getBottomRight (find.byKey (key2)).dy,
704- tester.getBottomRight (_findButtonBar ()).dy - 8.0 ,
704+ tester.getBottomRight (_findOverflowBar ()).dy - 8.0 ,
705705 ); // bottom
706706 expect (
707707 tester.getBottomRight (find.byKey (key2)).dx,
708- tester.getBottomRight (_findButtonBar ()).dx - 8.0 ,
708+ tester.getBottomRight (_findOverflowBar ()).dx - 8.0 ,
709709 ); // right
710710 });
711711
@@ -745,25 +745,25 @@ void main() {
745745 // First button
746746 expect (
747747 tester.getTopRight (find.byKey (key1)).dy,
748- tester.getTopRight (_findButtonBar ()).dy,
748+ tester.getTopRight (_findOverflowBar ()).dy,
749749 ); // top
750750 expect (
751751 tester.getBottomRight (find.byKey (key1)).dy,
752- tester.getBottomRight (_findButtonBar ()).dy - 24.0 ,
752+ tester.getBottomRight (_findOverflowBar ()).dy - 24.0 ,
753753 ); // bottom
754754
755755 // // Second button
756756 expect (
757757 tester.getTopRight (find.byKey (key2)).dy,
758- tester.getTopRight (_findButtonBar ()).dy,
758+ tester.getTopRight (_findOverflowBar ()).dy,
759759 ); // top
760760 expect (
761761 tester.getBottomRight (find.byKey (key2)).dy,
762- tester.getBottomRight (_findButtonBar ()).dy - 24.0 ,
762+ tester.getBottomRight (_findOverflowBar ()).dy - 24.0 ,
763763 ); // bottom
764764 expect (
765765 tester.getBottomRight (find.byKey (key2)).dx,
766- tester.getBottomRight (_findButtonBar ()).dx - 24.0 ,
766+ tester.getBottomRight (_findOverflowBar ()).dx - 24.0 ,
767767 ); // right
768768 });
769769
@@ -809,25 +809,25 @@ void main() {
809809 // First button
810810 expect (
811811 tester.getTopRight (find.byKey (key1)).dy,
812- tester.getTopRight (_findButtonBar ()).dy + ((10.0 + 20.0 ) / 2 ),
812+ tester.getTopRight (_findOverflowBar ()).dy + ((10.0 + 20.0 ) / 2 ),
813813 ); // top
814814 expect (
815815 tester.getBottomRight (find.byKey (key1)).dy,
816- tester.getBottomRight (_findButtonBar ()).dy - ((10.0 + 20.0 ) / 2 ),
816+ tester.getBottomRight (_findOverflowBar ()).dy - ((10.0 + 20.0 ) / 2 ),
817817 ); // bottom
818818
819819 // Second button
820820 expect (
821821 tester.getTopRight (find.byKey (key2)).dy,
822- tester.getTopRight (_findButtonBar ()).dy + ((10.0 + 20.0 ) / 2 ),
822+ tester.getTopRight (_findOverflowBar ()).dy + ((10.0 + 20.0 ) / 2 ),
823823 ); // top
824824 expect (
825825 tester.getBottomRight (find.byKey (key2)).dy,
826- tester.getBottomRight (_findButtonBar ()).dy - ((10.0 + 20.0 ) / 2 ),
826+ tester.getBottomRight (_findOverflowBar ()).dy - ((10.0 + 20.0 ) / 2 ),
827827 ); // bottom
828828 expect (
829829 tester.getBottomRight (find.byKey (key2)).dx,
830- tester.getBottomRight (_findButtonBar ()).dx - ((10.0 + 20.0 ) / 2 ),
830+ tester.getBottomRight (_findOverflowBar ()).dx - ((10.0 + 20.0 ) / 2 ),
831831 ); // right
832832 });
833833
@@ -850,7 +850,7 @@ void main() {
850850 final Finder iconFinder = find.byKey (iconKey);
851851 final Finder titleFinder = find.byKey (titleKey);
852852 final Finder contentFinder = find.byKey (contentKey);
853- final Finder actionsFinder = _findButtonBar ();
853+ final Finder actionsFinder = _findOverflowBar ();
854854 final Finder childrenFinder = find.byKey (childrenKey);
855855
856856 Future <void > openDialog (WidgetTester tester, Widget dialog, double textScaleFactor, {bool isM3 = false }) async {
0 commit comments