Skip to content

Commit 1dd4366

Browse files
authored
[cupertino_ui, material_ui] Use range matchers instead of exact positions in scroll tests (flutter#12664)
Relaxes overly strict position assertions in `cupertino_ui` and `material_ui` tests by replacing hardcoded floating-point numbers with range matchers (`inExclusiveRange`) and relative assertions. This avoids coupling tests to exact simulation values when underlying scroll physics change while still verifying that intermediate and final states behave as expected. This PR unblocks flutter#187568 . ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent cd4cdd0 commit 1dd4366

2 files changed

Lines changed: 74 additions & 177 deletions

File tree

‎packages/cupertino_ui/test/refresh_test.dart‎

Lines changed: 73 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -143,41 +143,28 @@ void main() {
143143

144144
expect(
145145
mockHelper.invocations,
146-
containsAllInOrder(<void>[
146+
containsAllInOrder(<Matcher>[
147147
matchesBuilder(
148148
refreshState: RefreshIndicatorMode.drag,
149149
pulledExtent: 50,
150150
refreshTriggerPullDistance: 100, // default value.
151151
refreshIndicatorExtent: 60, // default value.
152152
),
153-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS)
154-
matchesBuilder(
155-
refreshState: RefreshIndicatorMode.drag,
156-
pulledExtent: moreOrLessEquals(48.07979523362715),
157-
refreshTriggerPullDistance: 100, // default value.
158-
refreshIndicatorExtent: 60, // default value.
159-
)
160-
else
161-
matchesBuilder(
162-
refreshState: RefreshIndicatorMode.drag,
163-
pulledExtent: moreOrLessEquals(48.36801747187993),
164-
refreshTriggerPullDistance: 100, // default value.
165-
refreshIndicatorExtent: 60, // default value.
166-
),
167-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS)
168-
matchesBuilder(
169-
refreshState: RefreshIndicatorMode.drag,
170-
pulledExtent: moreOrLessEquals(43.98499220391114),
171-
refreshTriggerPullDistance: 100, // default value.
172-
refreshIndicatorExtent: 60, // default value.
173-
)
174-
else
175-
matchesBuilder(
176-
refreshState: RefreshIndicatorMode.drag,
177-
pulledExtent: moreOrLessEquals(44.63031931875867),
178-
refreshTriggerPullDistance: 100, // default value.
179-
refreshIndicatorExtent: 60, // default value.
153+
matchesBuilder(
154+
refreshState: RefreshIndicatorMode.drag,
155+
pulledExtent: inExclusiveRange(0.0, 50.0),
156+
refreshTriggerPullDistance: 100, // default value.
157+
refreshIndicatorExtent: 60, // default value.
158+
),
159+
matchesBuilder(
160+
refreshState: RefreshIndicatorMode.drag,
161+
pulledExtent: inExclusiveRange(
162+
0.0,
163+
(mockHelper.invocations[1] as BuilderInvocation).pulledExtent,
180164
),
165+
refreshTriggerPullDistance: 100, // default value.
166+
refreshIndicatorExtent: 60, // default value.
167+
),
181168
]),
182169
);
183170
// The builder isn't called again when the sliver completely goes away.
@@ -319,20 +306,12 @@ void main() {
319306
refreshIndicatorExtent: 60, // Default value.
320307
),
321308
equals(const RefreshTaskInvocation()),
322-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS)
323-
matchesBuilder(
324-
refreshState: RefreshIndicatorMode.armed,
325-
pulledExtent: moreOrLessEquals(124.87933920045268),
326-
refreshTriggerPullDistance: 100, // Default value.
327-
refreshIndicatorExtent: 60, // Default value.
328-
)
329-
else
330-
matchesBuilder(
331-
refreshState: RefreshIndicatorMode.armed,
332-
pulledExtent: moreOrLessEquals(127.10396988577114),
333-
refreshTriggerPullDistance: 100, // Default value.
334-
refreshIndicatorExtent: 60, // Default value.
335-
),
309+
matchesBuilder(
310+
refreshState: RefreshIndicatorMode.armed,
311+
pulledExtent: inExclusiveRange(60.0, 150.0),
312+
refreshTriggerPullDistance: 100, // Default value.
313+
refreshIndicatorExtent: 60, // Default value.
314+
),
336315
]),
337316
);
338317

@@ -382,9 +361,6 @@ void main() {
382361
(WidgetTester tester) async {
383362
final error = FlutterError('Oops');
384363
double errorCount = 0;
385-
final TargetPlatform? platform =
386-
debugDefaultTargetPlatformOverride; // Will not be correct within the zone.
387-
388364
await runZonedGuarded(
389365
() async {
390366
mockHelper.refreshCompleter = Completer<void>.sync();
@@ -417,20 +393,12 @@ void main() {
417393
refreshTriggerPullDistance: 100, // Default value.
418394
),
419395
equals(const RefreshTaskInvocation()),
420-
if (platform == TargetPlatform.macOS)
421-
matchesBuilder(
422-
refreshState: RefreshIndicatorMode.armed,
423-
pulledExtent: moreOrLessEquals(124.87933920045268),
424-
refreshTriggerPullDistance: 100, // Default value.
425-
refreshIndicatorExtent: 60, // Default value.
426-
)
427-
else
428-
matchesBuilder(
429-
refreshState: RefreshIndicatorMode.armed,
430-
pulledExtent: moreOrLessEquals(127.10396988577114),
431-
refreshIndicatorExtent: 60, // Default value.
432-
refreshTriggerPullDistance: 100, // Default value.
433-
),
396+
matchesBuilder(
397+
refreshState: RefreshIndicatorMode.armed,
398+
pulledExtent: inExclusiveRange(60.0, 150.0),
399+
refreshIndicatorExtent: 60, // Default value.
400+
refreshTriggerPullDistance: 100, // Default value.
401+
),
434402
]),
435403
);
436404

@@ -762,47 +730,20 @@ void main() {
762730
// Waiting for refresh control to reach approximately 5% of height
763731
await tester.pump(const Duration(milliseconds: 400));
764732

765-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS) {
766-
expect(
767-
tester.getRect(find.widgetWithText(Center, '0')).top,
768-
moreOrLessEquals(3.9543032206542765, epsilon: 4e-1),
769-
);
770-
expect(
771-
tester.getRect(find.widgetWithText(Center, '-1')).height,
772-
moreOrLessEquals(3.9543032206542765, epsilon: 4e-1),
773-
);
774-
expect(
775-
mockHelper.invocations,
776-
contains(
777-
matchesBuilder(
778-
refreshState: RefreshIndicatorMode.inactive,
779-
pulledExtent: 3.9543032206542765, // ~5% of 60.0
780-
refreshTriggerPullDistance: 100, // default value.
781-
refreshIndicatorExtent: 60, // default value.
782-
),
783-
),
784-
);
785-
} else {
786-
expect(
787-
tester.getRect(find.widgetWithText(Center, '0')).top,
788-
moreOrLessEquals(3.0, epsilon: 4e-1),
789-
);
790-
expect(
791-
tester.getRect(find.widgetWithText(Center, '-1')).height,
792-
moreOrLessEquals(3.0, epsilon: 4e-1),
793-
);
794-
expect(
795-
mockHelper.invocations,
796-
contains(
797-
matchesBuilder(
798-
refreshState: RefreshIndicatorMode.inactive,
799-
pulledExtent: 2.6980688300546443, // ~5% of 60.0
800-
refreshTriggerPullDistance: 100, // default value.
801-
refreshIndicatorExtent: 60, // default value.
802-
),
733+
final double top = tester.getRect(find.widgetWithText(Center, '0')).top;
734+
expect(top, inExclusiveRange(0.0, 6.0));
735+
expect(tester.getRect(find.widgetWithText(Center, '-1')).height, top);
736+
expect(
737+
mockHelper.invocations,
738+
contains(
739+
matchesBuilder(
740+
refreshState: RefreshIndicatorMode.inactive,
741+
pulledExtent: moreOrLessEquals(top),
742+
refreshTriggerPullDistance: 100, // default value.
743+
refreshIndicatorExtent: 60, // default value.
803744
),
804-
);
805-
}
745+
),
746+
);
806747
expect(find.text('-1'), findsOneWidget);
807748
},
808749
variant: const TargetPlatformVariant(<TargetPlatform>{
@@ -851,39 +792,19 @@ void main() {
851792
// Let it start going away but not fully.
852793
await tester.pump(const Duration(milliseconds: 100));
853794
// The refresh indicator is still building.
854-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS) {
855-
expect(
856-
mockHelper.invocations,
857-
contains(
858-
matchesBuilder(
859-
refreshState: RefreshIndicatorMode.done,
860-
pulledExtent: 90.13497854600749,
861-
refreshTriggerPullDistance: 100, // default value.
862-
refreshIndicatorExtent: 60, // default value.
863-
),
864-
),
865-
);
866-
expect(
867-
tester.getBottomLeft(find.widgetWithText(Center, '-1')).dy,
868-
moreOrLessEquals(90.13497854600749),
869-
);
870-
} else {
871-
expect(
872-
mockHelper.invocations,
873-
contains(
874-
matchesBuilder(
875-
refreshState: RefreshIndicatorMode.done,
876-
pulledExtent: 91.31180913199277,
877-
refreshTriggerPullDistance: 100, // default value.
878-
refreshIndicatorExtent: 60, // default value.
879-
),
795+
final double retractingDy = tester.getBottomLeft(find.widgetWithText(Center, '-1')).dy;
796+
expect(retractingDy, inExclusiveRange(0.0, 150.0));
797+
expect(
798+
mockHelper.invocations,
799+
contains(
800+
matchesBuilder(
801+
refreshState: RefreshIndicatorMode.done,
802+
pulledExtent: moreOrLessEquals(retractingDy),
803+
refreshTriggerPullDistance: 100, // default value.
804+
refreshIndicatorExtent: 60, // default value.
880805
),
881-
);
882-
expect(
883-
tester.getBottomLeft(find.widgetWithText(Center, '-1')).dy,
884-
moreOrLessEquals(91.311809131992776),
885-
);
886-
}
806+
),
807+
);
887808

888809
// Start another drag by an amount that would have been enough to
889810
// trigger another refresh if it were in the right state.
@@ -898,31 +819,19 @@ void main() {
898819

899820
// Instead, it's still in the done state because the sliver never
900821
// fully retracted.
901-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS) {
902-
expect(
903-
mockHelper.invocations,
904-
contains(
905-
matchesBuilder(
906-
refreshState: RefreshIndicatorMode.done,
907-
pulledExtent: 118.29756539042118,
908-
refreshTriggerPullDistance: 100, // default value.
909-
refreshIndicatorExtent: 60, // default value.
910-
),
911-
),
912-
);
913-
} else {
914-
expect(
915-
mockHelper.invocations,
916-
contains(
917-
matchesBuilder(
918-
refreshState: RefreshIndicatorMode.done,
919-
pulledExtent: 147.3772721631821,
920-
refreshTriggerPullDistance: 100, // default value.
921-
refreshIndicatorExtent: 60, // default value.
922-
),
822+
final double draggedDy = tester.getBottomLeft(find.widgetWithText(Center, '-1')).dy;
823+
expect(draggedDy, inExclusiveRange(retractingDy, 150.0 + retractingDy));
824+
expect(
825+
mockHelper.invocations,
826+
contains(
827+
matchesBuilder(
828+
refreshState: RefreshIndicatorMode.done,
829+
pulledExtent: moreOrLessEquals(draggedDy),
830+
refreshTriggerPullDistance: 100, // default value.
831+
refreshIndicatorExtent: 60, // default value.
923832
),
924-
);
925-
}
833+
),
834+
);
926835

927836
// Now let it fully go away.
928837
await tester.pump(const Duration(seconds: 5));
@@ -1180,27 +1089,15 @@ void main() {
11801089

11811090
await tester.pump(const Duration(milliseconds: 10));
11821091

1183-
if (debugDefaultTargetPlatformOverride == TargetPlatform.macOS) {
1184-
expect(
1185-
mockHelper.invocations.last,
1186-
matchesBuilder(
1187-
refreshState: RefreshIndicatorMode.done,
1188-
pulledExtent: moreOrLessEquals(148.36088180097366),
1189-
refreshTriggerPullDistance: 100.0, // Default value.
1190-
refreshIndicatorExtent: 60.0, // Default value.
1191-
),
1192-
);
1193-
} else {
1194-
expect(
1195-
mockHelper.invocations.last,
1196-
matchesBuilder(
1197-
refreshState: RefreshIndicatorMode.done,
1198-
pulledExtent: moreOrLessEquals(148.6463892921364),
1199-
refreshTriggerPullDistance: 100.0, // Default value.
1200-
refreshIndicatorExtent: 60.0, // Default value.
1201-
),
1202-
);
1203-
}
1092+
expect(
1093+
mockHelper.invocations.last,
1094+
matchesBuilder(
1095+
refreshState: RefreshIndicatorMode.done,
1096+
pulledExtent: inExclusiveRange(0.0, 150.0),
1097+
refreshTriggerPullDistance: 100.0, // Default value.
1098+
refreshIndicatorExtent: 60.0, // Default value.
1099+
),
1100+
);
12041101

12051102
await tester.pump(const Duration(seconds: 5));
12061103
expect(find.text('-1'), findsNothing);

‎packages/material_ui/example/test/app_bar/sliver_app_bar.4_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void main() {
3030
expect(find.widgetWithText(SliverAppBar, 'SliverAppBar'), findsOneWidget);
3131
expect(
3232
tester.getBottomLeft(find.text('SliverAppBar')).dy,
33-
187.63506380825314,
33+
inExclusiveRange(184.0, 184.0 + _kOffset.dy),
3434
);
3535

3636
await tester.tap(switchFinder);

0 commit comments

Comments
 (0)