Skip to content

Commit 3a3939a

Browse files
authored
Revert "Skia Gold Support for Local & PreSubmit Testing in package:flutter (flutter#40710)" (flutter#43227)
This reverts commit 8df0d65.
1 parent 22f0bf8 commit 3a3939a

40 files changed

+1062
-1434
lines changed

bin/internal/goldens.version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
65bd07204149c4f7612bbf179cf088a2d69ca549

packages/flutter/test/cupertino/activity_indicator_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void main() {
4545

4646
await expectLater(
4747
find.byKey(key),
48-
matchesGoldenFile('activityIndicator.paused.light.png'),
48+
matchesGoldenFile('activityIndicator.paused.light.png', version: 0),
4949
);
5050

5151
await tester.pumpWidget(
@@ -65,7 +65,7 @@ void main() {
6565

6666
await expectLater(
6767
find.byKey(key),
68-
matchesGoldenFile('activityIndicator.paused.dark.png'),
68+
matchesGoldenFile('activityIndicator.paused.dark.png', version: 0),
6969
);
7070
});
7171

packages/flutter/test/cupertino/date_picker_test.dart

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,10 @@ void main() {
922922

923923
await expectLater(
924924
find.byType(CupertinoDatePicker),
925-
matchesGoldenFile('date_picker_test.datetime.initial.png'),
925+
matchesGoldenFile(
926+
'date_picker_test.datetime.initial.png',
927+
version: 2,
928+
),
926929
);
927930

928931
// Slightly drag the hour component to make the current hour off-center.
@@ -931,7 +934,10 @@ void main() {
931934

932935
await expectLater(
933936
find.byType(CupertinoDatePicker),
934-
matchesGoldenFile('date_picker_test.datetime.drag.png'),
937+
matchesGoldenFile(
938+
'date_picker_test.datetime.drag.png',
939+
version: 2,
940+
),
935941
);
936942
});
937943
});
@@ -965,7 +971,10 @@ void main() {
965971

966972
await expectLater(
967973
find.byType(CupertinoTimerPicker),
968-
matchesGoldenFile('timer_picker_test.datetime.initial.png'),
974+
matchesGoldenFile(
975+
'timer_picker_test.datetime.initial.png',
976+
version: 1,
977+
),
969978
);
970979

971980
// Slightly drag the minute component to make the current minute off-center.
@@ -974,7 +983,10 @@ void main() {
974983

975984
await expectLater(
976985
find.byType(CupertinoTimerPicker),
977-
matchesGoldenFile('timer_picker_test.datetime.drag.png'),
986+
matchesGoldenFile(
987+
'timer_picker_test.datetime.drag.png',
988+
version: 1,
989+
),
978990
);
979991
});
980992

packages/flutter/test/cupertino/nav_bar_test.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,10 @@ void main() {
820820

821821
await expectLater(
822822
find.byType(RepaintBoundary).last,
823-
matchesGoldenFile('nav_bar_test.standard_title.png'),
823+
matchesGoldenFile(
824+
'nav_bar_test.standard_title.png',
825+
version: 2,
826+
),
824827
);
825828
},
826829
);
@@ -851,7 +854,10 @@ void main() {
851854

852855
await expectLater(
853856
find.byType(RepaintBoundary).last,
854-
matchesGoldenFile('nav_bar_test.large_title.png'),
857+
matchesGoldenFile(
858+
'nav_bar_test.large_title.png',
859+
version: 2,
860+
),
855861
);
856862
},
857863
);

packages/flutter/test/cupertino/segmented_control_test.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,10 @@ void main() {
14141414

14151415
await expectLater(
14161416
find.byType(RepaintBoundary),
1417-
matchesGoldenFile('segmented_control_test.0.png'),
1417+
matchesGoldenFile(
1418+
'segmented_control_test.0.png',
1419+
version: 0,
1420+
),
14181421
);
14191422
});
14201423

@@ -1452,7 +1455,10 @@ void main() {
14521455

14531456
await expectLater(
14541457
find.byType(RepaintBoundary),
1455-
matchesGoldenFile('segmented_control_test.1.png'),
1458+
matchesGoldenFile(
1459+
'segmented_control_test.1.png',
1460+
version: 0,
1461+
),
14561462
);
14571463
});
14581464
}

packages/flutter/test/cupertino/switch_test.dart

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,10 @@ void main() {
542542

543543
await expectLater(
544544
find.byKey(switchKey),
545-
matchesGoldenFile('switch.tap.off.png'),
545+
matchesGoldenFile(
546+
'switch.tap.off.png',
547+
version: 1,
548+
),
546549
);
547550

548551
await tester.tap(find.byKey(switchKey));
@@ -553,13 +556,19 @@ void main() {
553556
await tester.pump(const Duration(milliseconds: 60));
554557
await expectLater(
555558
find.byKey(switchKey),
556-
matchesGoldenFile('switch.tap.turningOn.png'),
559+
matchesGoldenFile(
560+
'switch.tap.turningOn.png',
561+
version: 1,
562+
),
557563
);
558564

559565
await tester.pumpAndSettle();
560566
await expectLater(
561567
find.byKey(switchKey),
562-
matchesGoldenFile('switch.tap.on.png'),
568+
matchesGoldenFile(
569+
'switch.tap.on.png',
570+
version: 1,
571+
),
563572
);
564573
});
565574

@@ -595,7 +604,10 @@ void main() {
595604

596605
await expectLater(
597606
find.byKey(switchKey),
598-
matchesGoldenFile('switch.tap.off.dark.png'),
607+
matchesGoldenFile(
608+
'switch.tap.off.dark.png',
609+
version: 0,
610+
),
599611
);
600612

601613
await tester.tap(find.byKey(switchKey));
@@ -604,7 +616,10 @@ void main() {
604616
await tester.pumpAndSettle();
605617
await expectLater(
606618
find.byKey(switchKey),
607-
matchesGoldenFile('switch.tap.on.dark.png'),
619+
matchesGoldenFile(
620+
'switch.tap.on.dark.png',
621+
version: 0,
622+
),
608623
);
609624
});
610625
}

packages/flutter/test/cupertino/text_field_test.dart

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ void main() {
503503

504504
await expectLater(
505505
find.byKey(const ValueKey<int>(1)),
506-
matchesGoldenFile('text_field_cursor_test.cupertino.0.png'),
506+
matchesGoldenFile(
507+
'text_field_cursor_test.cupertino.0.png',
508+
version: 3,
509+
),
507510
);
508511
});
509512

@@ -533,7 +536,10 @@ void main() {
533536
debugDefaultTargetPlatformOverride = null;
534537
await expectLater(
535538
find.byKey(const ValueKey<int>(1)),
536-
matchesGoldenFile('text_field_cursor_test.cupertino.1.png'),
539+
matchesGoldenFile(
540+
'text_field_cursor_test.cupertino.1.png',
541+
version: 3,
542+
),
537543
);
538544
});
539545

@@ -3036,7 +3042,10 @@ void main() {
30363042

30373043
await expectLater(
30383044
find.byKey(const ValueKey<int>(1)),
3039-
matchesGoldenFile('text_field_test.disabled.png'),
3045+
matchesGoldenFile(
3046+
'text_field_test.disabled.png',
3047+
version: 1,
3048+
),
30403049
);
30413050
});
30423051

packages/flutter/test/material/bottom_app_bar_test.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,19 @@ void main() {
7171
await pump(FloatingActionButtonLocation.endDocked);
7272
await expectLater(
7373
find.byKey(key),
74-
matchesGoldenFile('bottom_app_bar.custom_shape.1.png'),
74+
matchesGoldenFile(
75+
'bottom_app_bar.custom_shape.1.png',
76+
version: null,
77+
),
7578
);
7679
await pump(FloatingActionButtonLocation.centerDocked);
7780
await tester.pumpAndSettle();
7881
await expectLater(
7982
find.byKey(key),
80-
matchesGoldenFile('bottom_app_bar.custom_shape.2.png'),
83+
matchesGoldenFile(
84+
'bottom_app_bar.custom_shape.2.png',
85+
version: null,
86+
),
8187
);
8288
}, skip: isBrowser);
8389

packages/flutter/test/material/bottom_app_bar_theme_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ void main() {
8080

8181
await expectLater(
8282
find.byKey(_painterKey),
83-
matchesGoldenFile('bottom_app_bar_theme.custom_shape.png'),
83+
matchesGoldenFile(
84+
'bottom_app_bar_theme.custom_shape.png',
85+
version: null,
86+
),
8487
);
8588
}, skip: isBrowser);
8689

packages/flutter/test/material/bottom_navigation_bar_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,10 @@ void main() {
14261426
await tester.pump(const Duration(milliseconds: 30));
14271427
await expectLater(
14281428
find.byType(BottomNavigationBar),
1429-
matchesGoldenFile('bottom_navigation_bar.shifting_transition.$pump.png'),
1429+
matchesGoldenFile(
1430+
'bottom_navigation_bar.shifting_transition.$pump.png',
1431+
version: 2,
1432+
),
14301433
);
14311434
}
14321435
}, skip: isBrowser);

0 commit comments

Comments
 (0)