From 9fdd4d2e0c621d0e50229b83baf7fc73385c74fd Mon Sep 17 00:00:00 2001
From: chunhtai <47866232+chunhtai@users.noreply.github.com>
Date: Wed, 25 Mar 2020 12:11:01 -0700
Subject: [PATCH] Renamed test class to avoid conflict with the navigator page
 api. (#53279)

---
 dev/integration_tests/android_views/lib/main.dart             | 4 ++--
 .../android_views/lib/motion_events_page.dart                 | 2 +-
 dev/integration_tests/android_views/lib/page.dart             | 4 ++--
 .../flutter_driver_screenshot_test/lib/image_page.dart        | 2 +-
 .../flutter_driver_screenshot_test/lib/main.dart              | 4 ++--
 .../flutter_driver_screenshot_test/lib/page.dart              | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev/integration_tests/android_views/lib/main.dart b/dev/integration_tests/android_views/lib/main.dart
index d911c5f97b..5ff65056c1 100644
--- a/dev/integration_tests/android_views/lib/main.dart
+++ b/dev/integration_tests/android_views/lib/main.dart
@@ -7,7 +7,7 @@ import 'package:flutter_driver/driver_extension.dart';
 import 'motion_events_page.dart';
 import 'page.dart';
 
-final List<Page> _allPages = <Page>[
+final List<PageWidget> _allPages = <PageWidget>[
   const MotionEventsPage(),
 ];
 
@@ -31,7 +31,7 @@ class Home extends StatelessWidget {
     );
   }
 
-  void _pushPage(BuildContext context, Page page) {
+  void _pushPage(BuildContext context, PageWidget page) {
     Navigator.of(context).push(MaterialPageRoute<void>(
         builder: (_) => Scaffold(
               body: page,
diff --git a/dev/integration_tests/android_views/lib/motion_events_page.dart b/dev/integration_tests/android_views/lib/motion_events_page.dart
index a4b508b0a1..7af44b8e2a 100644
--- a/dev/integration_tests/android_views/lib/motion_events_page.dart
+++ b/dev/integration_tests/android_views/lib/motion_events_page.dart
@@ -18,7 +18,7 @@ MethodChannel channel = const MethodChannel('android_views_integration');
 
 const String kEventsFileName = 'touchEvents';
 
-class MotionEventsPage extends Page {
+class MotionEventsPage extends PageWidget {
   const MotionEventsPage()
       : super('Motion Event Tests', const ValueKey<String>('MotionEventsListTile'));
 
diff --git a/dev/integration_tests/android_views/lib/page.dart b/dev/integration_tests/android_views/lib/page.dart
index 1bdabd4ca1..51210a4288 100644
--- a/dev/integration_tests/android_views/lib/page.dart
+++ b/dev/integration_tests/android_views/lib/page.dart
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 /// The base class of all the testing pages
 //
 /// A testing page has to override this in order to be put as one of the items in the main page.
-abstract class Page extends StatelessWidget {
-  const Page(this.title, this.tileKey);
+abstract class PageWidget extends StatelessWidget {
+  const PageWidget(this.title, this.tileKey);
 
   /// The title of the testing page
   ///
diff --git a/dev/integration_tests/flutter_driver_screenshot_test/lib/image_page.dart b/dev/integration_tests/flutter_driver_screenshot_test/lib/image_page.dart
index 86462aec1e..6735f6c8b3 100644
--- a/dev/integration_tests/flutter_driver_screenshot_test/lib/image_page.dart
+++ b/dev/integration_tests/flutter_driver_screenshot_test/lib/image_page.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import './page.dart';
 
 /// The page that shows an image.
-class ImagePage extends Page {
+class ImagePage extends PageWidget {
 
   /// Constructs the ImagePage object.
   const ImagePage()
diff --git a/dev/integration_tests/flutter_driver_screenshot_test/lib/main.dart b/dev/integration_tests/flutter_driver_screenshot_test/lib/main.dart
index 93a24a69bc..9d03adb913 100644
--- a/dev/integration_tests/flutter_driver_screenshot_test/lib/main.dart
+++ b/dev/integration_tests/flutter_driver_screenshot_test/lib/main.dart
@@ -9,7 +9,7 @@ import 'package:device_info/device_info.dart';
 import './image_page.dart';
 import './page.dart';
 
-final List<Page> _allPages = <Page>[
+final List<PageWidget> _allPages = <PageWidget>[
   const ImagePage(),
 ];
 
@@ -62,7 +62,7 @@ class _MyHomePageState extends State<_MyHomePage> {
     );
   }
 
-  void _pushPage(BuildContext context, Page page) {
+  void _pushPage(BuildContext context, PageWidget page) {
     Navigator.of(context).push(MaterialPageRoute<void>(
       builder: (_) => page,
     ));
diff --git a/dev/integration_tests/flutter_driver_screenshot_test/lib/page.dart b/dev/integration_tests/flutter_driver_screenshot_test/lib/page.dart
index 0e44da7567..56b519d22e 100644
--- a/dev/integration_tests/flutter_driver_screenshot_test/lib/page.dart
+++ b/dev/integration_tests/flutter_driver_screenshot_test/lib/page.dart
@@ -5,10 +5,10 @@
 import 'package:flutter/material.dart';
 
 /// The base class for all the pages in this test.
-abstract class Page extends StatelessWidget {
+abstract class PageWidget extends StatelessWidget {
 
   /// Constructs a `Page` object.
-  const Page({@required this.title, @required Key key}):super(key: key);
+  const PageWidget({@required this.title, @required Key key}):super(key: key);
 
   /// The text that shows on the list item on the main page as well as the navigation bar on the sub page.
   final String title;