Unverified Commit 9fdd4d2e authored by chunhtai's avatar chunhtai Committed by GitHub

Renamed test class to avoid conflict with the navigator page api. (#53279)

parent ec3653f4
...@@ -7,7 +7,7 @@ import 'package:flutter_driver/driver_extension.dart'; ...@@ -7,7 +7,7 @@ import 'package:flutter_driver/driver_extension.dart';
import 'motion_events_page.dart'; import 'motion_events_page.dart';
import 'page.dart'; import 'page.dart';
final List<Page> _allPages = <Page>[ final List<PageWidget> _allPages = <PageWidget>[
const MotionEventsPage(), const MotionEventsPage(),
]; ];
...@@ -31,7 +31,7 @@ class Home extends StatelessWidget { ...@@ -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>( Navigator.of(context).push(MaterialPageRoute<void>(
builder: (_) => Scaffold( builder: (_) => Scaffold(
body: page, body: page,
......
...@@ -18,7 +18,7 @@ MethodChannel channel = const MethodChannel('android_views_integration'); ...@@ -18,7 +18,7 @@ MethodChannel channel = const MethodChannel('android_views_integration');
const String kEventsFileName = 'touchEvents'; const String kEventsFileName = 'touchEvents';
class MotionEventsPage extends Page { class MotionEventsPage extends PageWidget {
const MotionEventsPage() const MotionEventsPage()
: super('Motion Event Tests', const ValueKey<String>('MotionEventsListTile')); : super('Motion Event Tests', const ValueKey<String>('MotionEventsListTile'));
......
...@@ -7,8 +7,8 @@ import 'package:flutter/material.dart'; ...@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
/// The base class of all the testing pages /// 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. /// 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 { abstract class PageWidget extends StatelessWidget {
const Page(this.title, this.tileKey); const PageWidget(this.title, this.tileKey);
/// The title of the testing page /// The title of the testing page
/// ///
......
...@@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; ...@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import './page.dart'; import './page.dart';
/// The page that shows an image. /// The page that shows an image.
class ImagePage extends Page { class ImagePage extends PageWidget {
/// Constructs the ImagePage object. /// Constructs the ImagePage object.
const ImagePage() const ImagePage()
......
...@@ -9,7 +9,7 @@ import 'package:device_info/device_info.dart'; ...@@ -9,7 +9,7 @@ import 'package:device_info/device_info.dart';
import './image_page.dart'; import './image_page.dart';
import './page.dart'; import './page.dart';
final List<Page> _allPages = <Page>[ final List<PageWidget> _allPages = <PageWidget>[
const ImagePage(), const ImagePage(),
]; ];
...@@ -62,7 +62,7 @@ class _MyHomePageState extends State<_MyHomePage> { ...@@ -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>( Navigator.of(context).push(MaterialPageRoute<void>(
builder: (_) => page, builder: (_) => page,
)); ));
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// The base class for all the pages in this test. /// The base class for all the pages in this test.
abstract class Page extends StatelessWidget { abstract class PageWidget extends StatelessWidget {
/// Constructs a `Page` object. /// 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. /// 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; final String title;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment