firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix and re-land "re-enable android_view_test (#54214)" (#54312)

Browse Source
This commit is contained in:
Chris Yang 2020-04-09 11:03:02 -07:00 committed by GitHub
parent d390f4d9c6
commit 13052b10e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/integration_tests/android_views/android/app/src/main/java/io/flutter/integration/androidviews/SimplePlatformView.java
View File

@ -52,21 +52,27 @@ public class SimplePlatformView implements PlatformView, MethodChannel.MethodCal
touchPipe.disable();
result.success(null);
return;
case "showAlertDialog":
showAlertDialog(result);
case "showAndHideAlertDialog":
showAndHideAlertDialog(result);
return;
}
result.notImplemented();
}
private void showAlertDialog(MethodChannel.Result result) {
private void showAndHideAlertDialog(MethodChannel.Result result) {
Context context = view.getContext();
AlertDialog.Builder builder = new AlertDialog.Builder(context);
TextView textView = new TextView(context);
textView.setText("Alert!");
textView.setText("This alert dialog will close in 1 second");
builder.setView(textView);
final AlertDialog alertDialog = builder.show();
result.success(null);
view.postDelayed(new Runnable() {
@Override
public void run() {
alertDialog.hide();
}
}, 1000);
}
}

7
dev/integration_tests/android_views/lib/motion_events_page.dart
View File

@ -105,6 +105,13 @@ class MotionEventsBodyState extends State<MotionEventsBody> {
child: const Text('PLAY FILE'),
onPressed: () { playEventsFile(); },
),
Expanded(
child: RaisedButton(
key: const ValueKey<String>('back'),
child: const Text('BACK'),
onPressed: () { Navigator.pop(context); },
),
),
],
),
],

2
dev/integration_tests/android_views/lib/wm_integrations.dart
View File

@ -84,7 +84,7 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
});
}
try {
await viewChannel.invokeMethod<void>('showAlertDialog');
await viewChannel.invokeMethod<void>('showAndHideAlertDialog');
setState(() {
lastTestStatus = _LastTestStatus.success;
});

9
dev/integration_tests/android_views/test_driver/main_test.dart
View File

@ -17,6 +17,8 @@ Future<void> main() async {
driver.close();
});
// Each test below must return back to the home page after finishing.
test('MotionEvent recomposition', () async {
final SerializableFinder motionEventsListTile =
find.byValueKey('MotionEventsListTile');
@ -24,9 +26,8 @@ Future<void> main() async {
await driver.waitFor(find.byValueKey('PlatformView'));
final String errorMessage = await driver.requestData('run test');
expect(errorMessage, '');
},
// TODO(amirh): enable this test https://github.com/flutter/flutter/issues/54022
skip: true);
await driver.tap(find.byValueKey('back'));
});
test('AlertDialog from platform view context', () async {
final SerializableFinder wmListTile =
@ -38,5 +39,7 @@ Future<void> main() async {
await driver.tap(showAlertDialog);
final String status = await driver.getText(find.byValueKey('Status'));
expect(status, 'Success');
await driver.waitFor(find.pageBack());
await driver.tap(find.pageBack());
});
}