Unverified Commit 4b98c056 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

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

This reverts commit 13052b10.
parent 292bbd87
...@@ -52,27 +52,21 @@ public class SimplePlatformView implements PlatformView, MethodChannel.MethodCal ...@@ -52,27 +52,21 @@ public class SimplePlatformView implements PlatformView, MethodChannel.MethodCal
touchPipe.disable(); touchPipe.disable();
result.success(null); result.success(null);
return; return;
case "showAndHideAlertDialog": case "showAlertDialog":
showAndHideAlertDialog(result); showAlertDialog(result);
return; return;
} }
result.notImplemented(); result.notImplemented();
} }
private void showAndHideAlertDialog(MethodChannel.Result result) { private void showAlertDialog(MethodChannel.Result result) {
Context context = view.getContext(); Context context = view.getContext();
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
TextView textView = new TextView(context); TextView textView = new TextView(context);
textView.setText("This alert dialog will close in 1 second"); textView.setText("Alert!");
builder.setView(textView); builder.setView(textView);
final AlertDialog alertDialog = builder.show(); final AlertDialog alertDialog = builder.show();
result.success(null); result.success(null);
view.postDelayed(new Runnable() {
@Override
public void run() {
alertDialog.hide();
}
}, 1000);
} }
} }
...@@ -105,13 +105,6 @@ class MotionEventsBodyState extends State<MotionEventsBody> { ...@@ -105,13 +105,6 @@ class MotionEventsBodyState extends State<MotionEventsBody> {
child: const Text('PLAY FILE'), child: const Text('PLAY FILE'),
onPressed: () { playEventsFile(); }, onPressed: () { playEventsFile(); },
), ),
Expanded(
child: RaisedButton(
key: const ValueKey<String>('back'),
child: const Text('BACK'),
onPressed: () { Navigator.pop(context); },
),
),
], ],
), ),
], ],
......
...@@ -84,7 +84,7 @@ class WindowManagerBodyState extends State<WindowManagerBody> { ...@@ -84,7 +84,7 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
}); });
} }
try { try {
await viewChannel.invokeMethod<void>('showAndHideAlertDialog'); await viewChannel.invokeMethod<void>('showAlertDialog');
setState(() { setState(() {
lastTestStatus = _LastTestStatus.success; lastTestStatus = _LastTestStatus.success;
}); });
......
...@@ -17,8 +17,6 @@ Future<void> main() async { ...@@ -17,8 +17,6 @@ Future<void> main() async {
driver.close(); driver.close();
}); });
// Each test below must return back to the home page after finishing.
test('MotionEvent recomposition', () async { test('MotionEvent recomposition', () async {
final SerializableFinder motionEventsListTile = final SerializableFinder motionEventsListTile =
find.byValueKey('MotionEventsListTile'); find.byValueKey('MotionEventsListTile');
...@@ -26,8 +24,9 @@ Future<void> main() async { ...@@ -26,8 +24,9 @@ Future<void> main() async {
await driver.waitFor(find.byValueKey('PlatformView')); await driver.waitFor(find.byValueKey('PlatformView'));
final String errorMessage = await driver.requestData('run test'); final String errorMessage = await driver.requestData('run test');
expect(errorMessage, ''); expect(errorMessage, '');
await driver.tap(find.byValueKey('back')); },
}); // TODO(amirh): enable this test https://github.com/flutter/flutter/issues/54022
skip: true);
test('AlertDialog from platform view context', () async { test('AlertDialog from platform view context', () async {
final SerializableFinder wmListTile = final SerializableFinder wmListTile =
...@@ -39,7 +38,5 @@ Future<void> main() async { ...@@ -39,7 +38,5 @@ Future<void> main() async {
await driver.tap(showAlertDialog); await driver.tap(showAlertDialog);
final String status = await driver.getText(find.byValueKey('Status')); final String status = await driver.getText(find.byValueKey('Status'));
expect(status, 'Success'); expect(status, 'Success');
await driver.waitFor(find.pageBack());
await driver.tap(find.pageBack());
}); });
} }
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