mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Make hover tests functional and cleanup mouse pointers in Material toggleables (#148808)
Tests in Material toggleables (`Radio`, `Switch`, `Checkbox`) which require hovering using a mouse pointer do not include `addTearDown(gesture.removePointer)` to remove the mouse pointer once the test concludes.
Also, hovering tests in Material `Checkbox` currently have no functionality (i.e what is painted before hovering = what is painted while hovering). For example:
357bd65749/packages/flutter/test/material/checkbox_test.dart (L880-L896)
This PR adds `addTearDown(gesture.removePointer)` to `Radio`, `Switch`, and `Checkbox` tests, and functionality for `Checkbox` hover tests.
Fixes #148809.
This commit is contained in:
parent
7d529a7521
commit
81f962de40
@ -884,6 +884,7 @@ void main() {
|
||||
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
|
||||
await tester.pumpWidget(buildApp());
|
||||
@ -891,6 +892,7 @@ void main() {
|
||||
expect(
|
||||
Material.of(tester.element(find.byType(Checkbox))),
|
||||
paints
|
||||
..circle(color: Colors.orange[500])
|
||||
..path(color: const Color(0xff2196f3))
|
||||
..path(color: const Color(0xffffffff), style: PaintingStyle.stroke, strokeWidth: 2.0),
|
||||
);
|
||||
@ -941,6 +943,7 @@ void main() {
|
||||
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
|
||||
await tester.pumpWidget(buildApp());
|
||||
@ -948,6 +951,7 @@ void main() {
|
||||
expect(
|
||||
Material.of(tester.element(find.byType(Checkbox))),
|
||||
paints
|
||||
..circle(color: Colors.orange[500])
|
||||
..path(color: const Color(0xff6750a4))
|
||||
..path(color: theme.colorScheme.onPrimary, style: PaintingStyle.stroke, strokeWidth: 2.0),
|
||||
);
|
||||
@ -991,7 +995,7 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pumpAndSettle();
|
||||
// On web, switches don't respond to the enter key.
|
||||
// On web, checkboxes don't respond to the enter key.
|
||||
expect(value, kIsWeb ? isTrue : isFalse);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pumpAndSettle();
|
||||
@ -1121,6 +1125,7 @@ void main() {
|
||||
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
|
||||
await gesture.addPointer(location: tester.getCenter(find.byType(Checkbox)));
|
||||
addTearDown(gesture.removePointer);
|
||||
|
||||
await tester.pump();
|
||||
|
||||
@ -1297,6 +1302,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1404,6 +1410,7 @@ void main() {
|
||||
await tester.pumpWidget(buildCheckbox());
|
||||
final TestGesture gesture3 = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture3.addPointer();
|
||||
addTearDown(gesture3.removePointer);
|
||||
await gesture3.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1475,6 +1482,7 @@ void main() {
|
||||
await tester.pumpWidget(buildCheckbox());
|
||||
final TestGesture gesture3 = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture3.addPointer();
|
||||
addTearDown(gesture3.removePointer);
|
||||
await gesture3.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1613,6 +1621,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture5 = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture5.addPointer();
|
||||
addTearDown(gesture5.removePointer);
|
||||
await gesture5.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -2041,6 +2050,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -2132,6 +2142,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Checkbox)));
|
||||
await tester.pumpAndSettle();
|
||||
expectBorder();
|
||||
|
@ -979,6 +979,7 @@ void main() {
|
||||
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
|
||||
await gesture.addPointer(location: tester.getCenter(find.byKey(key)));
|
||||
addTearDown(gesture.removePointer);
|
||||
|
||||
await tester.pump();
|
||||
|
||||
@ -1213,6 +1214,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(radioKey)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1293,6 +1295,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(radioKey)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1441,6 +1444,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(findRadio()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1881,6 +1885,7 @@ void main() {
|
||||
kind: PointerDeviceKind.mouse,
|
||||
);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(center);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1947,6 +1952,7 @@ void main() {
|
||||
kind: PointerDeviceKind.mouse,
|
||||
);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(center);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
|
@ -762,6 +762,7 @@ void main() {
|
||||
kind: PointerDeviceKind.mouse,
|
||||
);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(center);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -809,6 +810,7 @@ void main() {
|
||||
kind: PointerDeviceKind.mouse,
|
||||
);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(center);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -1242,6 +1244,7 @@ void main() {
|
||||
expect(switchSize, const Size(60.0, 48.0));
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
|
||||
await gesture.addPointer(location: tester.getCenter(find.byType(Switch)));
|
||||
addTearDown(gesture.removePointer);
|
||||
await tester.pump();
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
expect(RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
|
||||
@ -1932,6 +1935,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
|
||||
await tester.pumpWidget(buildApp());
|
||||
@ -2011,6 +2015,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
|
||||
await tester.pumpWidget(buildApp());
|
||||
@ -2106,6 +2111,7 @@ void main() {
|
||||
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
|
||||
await gesture.addPointer(location: tester.getCenter(find.byType(Switch)));
|
||||
addTearDown(gesture.removePointer);
|
||||
|
||||
await tester.pump();
|
||||
|
||||
@ -2510,6 +2516,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -2590,6 +2597,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -2846,6 +2854,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -2918,6 +2927,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -3172,6 +3182,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -3731,6 +3742,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@ -3868,6 +3880,7 @@ void main() {
|
||||
// Start hovering
|
||||
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
await gesture.addPointer();
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.moveTo(tester.getCenter(find.byType(Switch)));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user