Skip to content

Commit 4b98c05

Browse files
author
Jonah Williams
authored
Revert "fix and re-land "re-enable android_view_test (flutter#54214)" (flutter#54312)" (flutter#54387)
This reverts commit 13052b1.
1 parent 292bbd8 commit 4b98c05

File tree

4 files changed

+8
-24
lines changed

4 files changed

+8
-24
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,21 @@ public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) {
5252
touchPipe.disable();
5353
result.success(null);
5454
return;
55-
case "showAndHideAlertDialog":
56-
showAndHideAlertDialog(result);
55+
case "showAlertDialog":
56+
showAlertDialog(result);
5757
return;
5858
}
5959
result.notImplemented();
6060
}
6161

62-
private void showAndHideAlertDialog(MethodChannel.Result result) {
62+
private void showAlertDialog(MethodChannel.Result result) {
6363
Context context = view.getContext();
6464
AlertDialog.Builder builder = new AlertDialog.Builder(context);
6565
TextView textView = new TextView(context);
66-
textView.setText("This alert dialog will close in 1 second");
66+
textView.setText("Alert!");
6767
builder.setView(textView);
6868
final AlertDialog alertDialog = builder.show();
6969
result.success(null);
70-
view.postDelayed(new Runnable() {
71-
@Override
72-
public void run() {
73-
alertDialog.hide();
74-
}
75-
}, 1000);
7670
}
7771

7872
}

dev/integration_tests/android_views/lib/motion_events_page.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ class MotionEventsBodyState extends State<MotionEventsBody> {
105105
child: const Text('PLAY FILE'),
106106
onPressed: () { playEventsFile(); },
107107
),
108-
Expanded(
109-
child: RaisedButton(
110-
key: const ValueKey<String>('back'),
111-
child: const Text('BACK'),
112-
onPressed: () { Navigator.pop(context); },
113-
),
114-
),
115108
],
116109
),
117110
],

dev/integration_tests/android_views/lib/wm_integrations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
8484
});
8585
}
8686
try {
87-
await viewChannel.invokeMethod<void>('showAndHideAlertDialog');
87+
await viewChannel.invokeMethod<void>('showAlertDialog');
8888
setState(() {
8989
lastTestStatus = _LastTestStatus.success;
9090
});

dev/integration_tests/android_views/test_driver/main_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ Future<void> main() async {
1717
driver.close();
1818
});
1919

20-
// Each test below must return back to the home page after finishing.
21-
2220
test('MotionEvent recomposition', () async {
2321
final SerializableFinder motionEventsListTile =
2422
find.byValueKey('MotionEventsListTile');
2523
await driver.tap(motionEventsListTile);
2624
await driver.waitFor(find.byValueKey('PlatformView'));
2725
final String errorMessage = await driver.requestData('run test');
2826
expect(errorMessage, '');
29-
await driver.tap(find.byValueKey('back'));
30-
});
27+
},
28+
// TODO(amirh): enable this test https://github.com/flutter/flutter/issues/54022
29+
skip: true);
3130

3231
test('AlertDialog from platform view context', () async {
3332
final SerializableFinder wmListTile =
@@ -39,7 +38,5 @@ Future<void> main() async {
3938
await driver.tap(showAlertDialog);
4039
final String status = await driver.getText(find.byValueKey('Status'));
4140
expect(status, 'Success');
42-
await driver.waitFor(find.pageBack());
43-
await driver.tap(find.pageBack());
4441
});
4542
}

0 commit comments

Comments
 (0)