Update unit tests in material library for Material 3 (#128725)

Updates most of the unit tests in the packages/flutter/test/material folder so that they'll pass if ThemeData.useMaterial3 defaults to true. All of the tests have wired useMaterial3 to false and will need to be updated with a M3 version. related to #127064
flutter · Jun 13, 2023 · a5f8b64 · a5f8b64
1 parent d499533
commit a5f8b64
Show file tree

Hide file tree

Showing 62 changed files with 1,127 additions and 780 deletions.
diff --git a/packages/flutter/test/material/about_test.dart b/packages/flutter/test/material/about_test.dart
@@ -63,6 +63,7 @@ void main() {
 
     await tester.pumpWidget(
       MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         title: 'Pirate app',
         home: Scaffold(
           appBar: AppBar(
@@ -167,8 +168,9 @@ void main() {
     });
 
     await tester.pumpWidget(
-      const MaterialApp(
-        home: Center(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
+        home: const Center(
           child: LicensePage(),
         ),
       ),
@@ -220,9 +222,10 @@ void main() {
     });
 
     await tester.pumpWidget(
-      const MaterialApp(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         title: 'Pirate app',
-        home: Center(
+        home: const Center(
           child: LicensePage(
             applicationName: 'LicensePage test app',
             applicationVersion: '0.1.2',
@@ -298,6 +301,7 @@ void main() {
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
+          useMaterial3: false,
           primaryTextTheme: const TextTheme(
             titleLarge: titleTextStyle,
             titleSmall: subtitleTextStyle,
@@ -384,8 +388,9 @@ void main() {
     });
 
     await tester.pumpWidget(
-      const MaterialApp(
-        home: MediaQuery(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
+        home: const MediaQuery(
           data: MediaQueryData(
             padding: EdgeInsets.all(safeareaPadding),
           ),
@@ -830,7 +835,7 @@ void main() {
     const Color cardColor = Color(0xFF654321);
 
     await tester.pumpWidget(MaterialApp(
-      theme: ThemeData.light().copyWith(
+      theme: ThemeData.light(useMaterial3: false).copyWith(
         scaffoldBackgroundColor: scaffoldColor,
         cardColor: cardColor,
       ),
@@ -1051,7 +1056,12 @@ void main() {
 
   testWidgetsWithLeakTracking('Error handling test', (WidgetTester tester) async {
     LicenseRegistry.addLicense(() => Stream<LicenseEntry>.error(Exception('Injected failure')));
-    await tester.pumpWidget(const MaterialApp(home: Material(child: AboutListTile())));
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
+        home: const Material(child: AboutListTile())
+      )
+    );
     await tester.tap(find.byType(ListTile));
     await tester.pump();
     await tester.pump(const Duration(seconds: 2));
@@ -1082,9 +1092,10 @@ void main() {
     await tester.binding.setSurfaceSize(defaultSize);
 
     await tester.pumpWidget(
-      const MaterialApp(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         title: title,
-        home: Scaffold(
+        home: const Scaffold(
           body: Directionality(
             textDirection: textDirection,
             child: LicensePage(),
@@ -1145,9 +1156,10 @@ void main() {
     await tester.binding.setSurfaceSize(defaultSize);
 
     await tester.pumpWidget(
-      const MaterialApp(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         title: title,
-        home: Scaffold(
+        home: const Scaffold(
           body: Directionality(
             textDirection: textDirection,
             child: LicensePage(),

diff --git a/packages/flutter/test/material/app_builder_test.dart b/packages/flutter/test/material/app_builder_test.dart
@@ -10,6 +10,7 @@ void main() {
     final List<String> log = <String>[];
     final Widget app = MaterialApp(
       theme: ThemeData(
+        useMaterial3: false,
         primarySwatch: Colors.green,
       ),
       home: const Placeholder(),
@@ -42,6 +43,7 @@ void main() {
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
+          useMaterial3: false,
           primarySwatch: Colors.yellow,
         ),
         home: Builder(

diff --git a/packages/flutter/test/material/app_test.dart b/packages/flutter/test/material/app_test.dart
@@ -995,6 +995,7 @@ void main() {
     const Color secondaryColor = Color(0xff008800);
     final Color glowSecondaryColor = secondaryColor.withOpacity(0.05);
     final ThemeData theme = ThemeData.from(
+      useMaterial3: false,
       colorScheme: const ColorScheme.light().copyWith(secondary: secondaryColor),
     );
     await tester.pumpWidget(
@@ -1264,6 +1265,7 @@ void main() {
 
   testWidgets('ScrollBehavior default android overscroll indicator', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
+      theme: ThemeData(useMaterial3: false),
       scrollBehavior: const MaterialScrollBehavior(),
       home: ListView(
         children: const <Widget>[

diff --git a/packages/flutter/test/material/autocomplete_test.dart b/packages/flutter/test/material/autocomplete_test.dart
@@ -459,7 +459,7 @@ void main() {
     const Color highlightColor = Color(0xFF112233);
     await tester.pumpWidget(
       MaterialApp(
-        theme: ThemeData.light().copyWith(
+        theme: ThemeData.light(useMaterial3: false).copyWith(
           focusColor: highlightColor,
         ),
         home: Scaffold(

diff --git a/packages/flutter/test/material/banner_theme_test.dart b/packages/flutter/test/material/banner_theme_test.dart
@@ -457,6 +457,7 @@ void main() {
       const String contentText = 'Content';
 
       await tester.pumpWidget(MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         home: Scaffold(
           body: MaterialBanner(
             content: const Text(contentText),
@@ -503,6 +504,7 @@ void main() {
       const Key tapTarget = Key('tap-target');
 
       await tester.pumpWidget(MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         home: Scaffold(
           body: Builder(
             builder: (BuildContext context) {

diff --git a/packages/flutter/test/material/bottom_app_bar_test.dart b/packages/flutter/test/material/bottom_app_bar_test.dart
@@ -120,6 +120,7 @@ void main() {
           child: RepaintBoundary(
             key: key,
             child: MaterialApp(
+              theme: ThemeData(useMaterial3: false),
               home: Scaffold(
                 floatingActionButton: FloatingActionButton(
                   onPressed: () { },
@@ -217,9 +218,10 @@ void main() {
     expect(babRect, const Rect.fromLTRB(240, 520, 560, 600));
   });
 
-  testWidgets('color defaults to Theme.bottomAppBarColor', (WidgetTester tester) async {
+  testWidgets('color defaults to Theme.bottomAppBarColor in M2', (WidgetTester tester) async {
     await tester.pumpWidget(
       MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         home: Builder(
           builder: (BuildContext context) {
             return Theme(
@@ -245,6 +247,7 @@ void main() {
   testWidgets('color overrides theme color', (WidgetTester tester) async {
     await tester.pumpWidget(
       MaterialApp(
+        theme: ThemeData(useMaterial3: false),
         home: Builder(
           builder: (BuildContext context) {
             return Theme(
@@ -324,7 +327,7 @@ void main() {
   testWidgets('dark theme applies an elevation overlay color', (WidgetTester tester) async {
     await tester.pumpWidget(
       MaterialApp(
-        theme: ThemeData.from(colorScheme: const ColorScheme.dark()),
+        theme: ThemeData.from(useMaterial3: false, colorScheme: const ColorScheme.dark()),
         home: Scaffold(
           bottomNavigationBar: BottomAppBar(
             color: const ColorScheme.dark().surface,
@@ -508,8 +511,9 @@ void main() {
 
   testWidgets('observes safe area', (WidgetTester tester) async {
     await tester.pumpWidget(
-      const MaterialApp(
-        home: MediaQuery(
+      MaterialApp(
+        theme: ThemeData(useMaterial3: false),
+        home: const MediaQuery(
           data: MediaQueryData(
             padding: EdgeInsets.all(50.0),
           ),
@@ -566,8 +570,10 @@ void main() {
 
   testWidgets('BottomAppBar with shape when Scaffold.bottomNavigationBar == null', (WidgetTester tester) async {
     // Regression test for https://github.com/flutter/flutter/issues/80878
+    final ThemeData theme = ThemeData();
     await tester.pumpWidget(
       MaterialApp(
+        theme: theme,
         home: Scaffold(
           floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
           floatingActionButton: FloatingActionButton(
@@ -595,7 +601,7 @@ void main() {
     );
 
     expect(tester.getRect(find.byType(FloatingActionButton)), const Rect.fromLTRB(372, 528, 428, 584));
-    expect(tester.getSize(find.byType(BottomAppBar)), const Size(800, 50));
+    expect(tester.getSize(find.byType(BottomAppBar)), theme.useMaterial3 ? const Size(800, 80) : const Size(800, 50));
   });
 
   testWidgets('notch with margin and top padding, home safe area', (WidgetTester tester) async {

diff --git a/packages/flutter/test/material/bottom_app_bar_theme_test.dart b/packages/flutter/test/material/bottom_app_bar_theme_test.dart
@@ -36,6 +36,7 @@ void main() {
 
       await tester.pumpWidget(MaterialApp(
         theme: ThemeData(
+          useMaterial3: false,
           bottomAppBarTheme: theme,
           bottomAppBarColor: themeColor
         ),
@@ -53,6 +54,7 @@ void main() {
 
       await tester.pumpWidget(MaterialApp(
         theme: ThemeData(
+          useMaterial3: false,
           bottomAppBarTheme: theme,
           bottomAppBarColor: themeColor
         ),
@@ -67,7 +69,7 @@ void main() {
       const Color themeColor = Colors.white10;
 
       await tester.pumpWidget(MaterialApp(
-        theme: ThemeData(bottomAppBarColor: themeColor),
+        theme: ThemeData(useMaterial3: false, bottomAppBarColor: themeColor),
         home: const Scaffold(body: BottomAppBar()),
       ));
 
@@ -77,7 +79,7 @@ void main() {
 
     testWidgets('BAB color - Default', (WidgetTester tester) async {
       await tester.pumpWidget(MaterialApp(
-        theme: ThemeData(),
+        theme: ThemeData(useMaterial3: false),
         home: const Scaffold(body: BottomAppBar()),
       ));
 
@@ -102,8 +104,9 @@ void main() {
     });
 
     testWidgets('BAB theme does not affect defaults', (WidgetTester tester) async {
-      await tester.pumpWidget(const MaterialApp(
-        home: Scaffold(body: BottomAppBar()),
+      await tester.pumpWidget(MaterialApp(
+        theme: ThemeData(useMaterial3: false),
+        home: const Scaffold(body: BottomAppBar()),
       ));
 
       final PhysicalShape widget = _getBabRenderObject(tester);