Skip to content

Commit c842d69

Browse files
authored
Migrate ios driver tests batch 3 to simulators (flutter#191333)
Part of flutter#186414 This batch migrates 7 Devicelab tests to simulators: * `integration_test_test_ios` * `ios_defines_test` * `keyboard_hot_restart_ios` * `native_platform_view_ui_tests_ios` * `platform_channel_sample_test_ios` * `platform_channel_sample_test_swift` Changes: - Moved targets in `.ci.yaml` from `Mac_ios` to `Mac` (Simulator) with `bringup: true` and injected `ruby` dependency. - Changed tags to `["devicelab", "hostonly", "mac"]`. - Wrapped Devicelab tasks with `testWithNewIOSSimulator`. - Migrated `ios_platform_view_tests` to adopt `UIScene` lifecycle - Handled simulator environment battery fallback for `platform_channel` and `platform_channel_swift`.
1 parent 9e65761 commit c842d69

14 files changed

Lines changed: 206 additions & 72 deletions

File tree

‎.ci.yaml‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5544,13 +5544,16 @@ targets:
55445544
["devicelab", "ios", "mac"]
55455545
task_name: integration_test_test_ios
55465546

5547-
- name: Mac_arm64_ios integration_test_test_ios
5547+
- name: Mac integration_test_test_ios
55485548
recipe: devicelab/devicelab_drone
5549+
bringup: true
55495550
presubmit: false
55505551
timeout: 60
55515552
properties:
5553+
dependencies: >-
5554+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
55525555
tags: >
5553-
["devicelab", "ios", "mac"]
5556+
["devicelab", "hostonly", "mac"]
55545557
task_name: integration_test_test_ios
55555558

55565559
- name: Mac integration_ui_ios_driver
@@ -5634,13 +5637,16 @@ targets:
56345637
["devicelab", "hostonly", "mac", "arm64"]
56355638
task_name: ios_app_with_extensions_test
56365639

5637-
- name: Mac_ios ios_defines_test
5640+
- name: Mac ios_defines_test
56385641
recipe: devicelab/devicelab_drone
5642+
bringup: true
56395643
presubmit: false
56405644
timeout: 60
56415645
properties:
5646+
dependencies: >-
5647+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
56425648
tags: >
5643-
["devicelab", "ios", "mac"]
5649+
["devicelab", "hostonly", "mac"]
56445650
task_name: ios_defines_test
56455651

56465652
- name: Mac_ios hello_world_impeller_ios_sdfs
@@ -5732,13 +5738,16 @@ targets:
57325738
["devicelab", "ios", "mac"]
57335739
task_name: native_assets_ios
57345740

5735-
- name: Mac_ios native_platform_view_ui_tests_ios
5741+
- name: Mac native_platform_view_ui_tests_ios
57365742
recipe: devicelab/devicelab_drone
5743+
bringup: true
57375744
presubmit: false
57385745
timeout: 60
57395746
properties:
5747+
dependencies: >-
5748+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
57405749
tags: >
5741-
["devicelab", "ios", "mac"]
5750+
["devicelab", "hostonly", "mac"]
57425751
task_name: native_platform_view_ui_tests_ios
57435752

57445753
- name: Mac_ios new_gallery_ios__transition_perf
@@ -5759,22 +5768,28 @@ targets:
57595768
["devicelab", "ios", "mac"]
57605769
task_name: new_gallery_skia_ios__transition_perf
57615770

5762-
- name: Mac_ios platform_channel_sample_test_ios
5771+
- name: Mac platform_channel_sample_test_ios
57635772
recipe: devicelab/devicelab_drone
5773+
bringup: true
57645774
presubmit: false
57655775
timeout: 60
57665776
properties:
5777+
dependencies: >-
5778+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
57675779
tags: >
5768-
["devicelab", "ios", "mac"]
5780+
["devicelab", "hostonly", "mac"]
57695781
task_name: platform_channel_sample_test_ios
57705782

5771-
- name: Mac_ios platform_channel_sample_test_swift
5783+
- name: Mac platform_channel_sample_test_swift
57725784
recipe: devicelab/devicelab_drone
5785+
bringup: true
57735786
presubmit: false
57745787
timeout: 60
57755788
properties:
5789+
dependencies: >-
5790+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
57765791
tags: >
5777-
["devicelab", "ios", "mac"]
5792+
["devicelab", "hostonly", "mac"]
57785793
task_name: platform_channel_sample_test_swift
57795794

57805795
- name: Mac_ios platform_channels_benchmarks_ios
@@ -6117,13 +6132,16 @@ targets:
61176132
properties:
61186133
task_name: new_gallery_macos_impeller__transition_perf
61196134

6120-
- name: Mac_ios keyboard_hot_restart_ios
6135+
- name: Mac keyboard_hot_restart_ios
61216136
recipe: devicelab/devicelab_drone
6137+
bringup: true
61226138
presubmit: false
61236139
timeout: 60
61246140
properties:
6141+
dependencies: >-
6142+
[{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}]
61256143
tags: >
6126-
["devicelab", "ios", "mac"]
6144+
["devicelab", "hostonly", "mac"]
61276145
task_name: keyboard_hot_restart_ios
61286146

61296147
- name: Windows build_tests_1_9

‎dev/devicelab/bin/tasks/integration_test_test_ios.dart‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@
44

55
import 'package:flutter_devicelab/framework/devices.dart';
66
import 'package:flutter_devicelab/framework/framework.dart';
7+
import 'package:flutter_devicelab/framework/ios.dart';
8+
import 'package:flutter_devicelab/framework/task_result.dart';
79
import 'package:flutter_devicelab/tasks/integration_tests.dart';
810

911
Future<void> main() async {
1012
deviceOperatingSystem = DeviceOperatingSystem.ios;
11-
await task(createEndToEndIntegrationTest());
13+
await task(() async {
14+
TaskResult? result;
15+
String? simulatorDeviceId;
16+
try {
17+
await testWithNewIOSSimulator('integration_test_test_ios', (String deviceId) async {
18+
simulatorDeviceId = deviceId;
19+
result = await createEndToEndIntegrationTest(deviceIdOverride: deviceId).call();
20+
});
21+
} finally {
22+
await removeIOSSimulator(simulatorDeviceId);
23+
}
24+
return result ?? TaskResult.failure('Simulator creation failed');
25+
});
1226
}

‎dev/devicelab/bin/tasks/ios_defines_test.dart‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,24 @@
44

55
import 'package:flutter_devicelab/framework/devices.dart';
66
import 'package:flutter_devicelab/framework/framework.dart';
7+
import 'package:flutter_devicelab/framework/ios.dart';
8+
import 'package:flutter_devicelab/framework/task_result.dart';
79
import 'package:flutter_devicelab/tasks/integration_tests.dart';
810

911
/// Verify that dart defines work on iOS.
1012
Future<void> main() async {
1113
deviceOperatingSystem = DeviceOperatingSystem.ios;
12-
await task(dartDefinesTask());
14+
await task(() async {
15+
TaskResult? result;
16+
String? simulatorDeviceId;
17+
try {
18+
await testWithNewIOSSimulator('ios_defines_test', (String deviceId) async {
19+
simulatorDeviceId = deviceId;
20+
result = await dartDefinesTask(deviceIdOverride: deviceId).call();
21+
});
22+
} finally {
23+
await removeIOSSimulator(simulatorDeviceId);
24+
}
25+
return result ?? TaskResult.failure('Simulator creation failed');
26+
});
1327
}

‎dev/devicelab/bin/tasks/keyboard_hot_restart_ios.dart‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,23 @@
44

55
import 'package:flutter_devicelab/framework/devices.dart';
66
import 'package:flutter_devicelab/framework/framework.dart';
7+
import 'package:flutter_devicelab/framework/ios.dart';
8+
import 'package:flutter_devicelab/framework/task_result.dart';
79
import 'package:flutter_devicelab/tasks/keyboard_hot_restart_test.dart';
810

911
Future<void> main() async {
12+
deviceOperatingSystem = DeviceOperatingSystem.ios;
1013
await task(() async {
11-
deviceOperatingSystem = DeviceOperatingSystem.ios;
12-
return createKeyboardHotRestartTest()();
14+
TaskResult? result;
15+
String? simulatorDeviceId;
16+
try {
17+
await testWithNewIOSSimulator('keyboard_hot_restart_ios', (String deviceId) async {
18+
simulatorDeviceId = deviceId;
19+
result = await createKeyboardHotRestartTest(deviceIdOverride: deviceId).call();
20+
});
21+
} finally {
22+
await removeIOSSimulator(simulatorDeviceId);
23+
}
24+
return result ?? TaskResult.failure('Simulator creation failed');
1325
});
1426
}

‎dev/devicelab/bin/tasks/native_platform_view_ui_tests_ios.dart‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,46 @@ import 'package:path/path.dart' as path;
1212
Future<void> main() async {
1313
deviceOperatingSystem = DeviceOperatingSystem.ios;
1414
await task(() async {
15-
final projectDirectory =
16-
'${flutterDirectory.path}/dev/integration_tests/ios_platform_view_tests';
17-
18-
await inDirectory(projectDirectory, () async {
19-
// To address "Failed to terminate" failure.
20-
section('Uninstall previously installed app');
21-
22-
await flutter('install', options: <String>['--uninstall-only']);
23-
24-
section('Build clean');
25-
26-
await flutter('clean');
27-
28-
section('Build platform view app');
29-
30-
await flutter('build', options: <String>['ios', '-v', '--release', '--config-only']);
31-
});
32-
33-
section('Run platform view XCUITests');
34-
35-
final Device device = await devices.workingDevice;
36-
if (!await runXcodeTests(
37-
platformDirectory: path.join(projectDirectory, 'ios'),
38-
destination: 'id=${device.deviceId}',
39-
testName: 'native_platform_view_ui_tests_ios',
40-
)) {
41-
return TaskResult.failure('Platform view XCUITests failed');
15+
TaskResult? result;
16+
String? simulatorDeviceId;
17+
try {
18+
await testWithNewIOSSimulator('native_platform_view_ui_tests_ios', (String deviceId) async {
19+
simulatorDeviceId = deviceId;
20+
final projectDirectory =
21+
'${flutterDirectory.path}/dev/integration_tests/ios_platform_view_tests';
22+
23+
await inDirectory(projectDirectory, () async {
24+
// To address "Failed to terminate" failure.
25+
section('Uninstall previously installed app');
26+
27+
await flutter('install', options: <String>['--uninstall-only', '-d', deviceId]);
28+
29+
section('Build clean');
30+
31+
await flutter('clean');
32+
33+
section('Build platform view app');
34+
35+
await flutter('build', options: <String>['ios', '-v', '--simulator', '--config-only']);
36+
});
37+
38+
section('Run platform view XCUITests');
39+
40+
if (!await runXcodeTests(
41+
platformDirectory: path.join(projectDirectory, 'ios'),
42+
destination: 'id=$deviceId',
43+
testName: 'native_platform_view_ui_tests_ios',
44+
configuration: 'Debug',
45+
skipCodesign: true,
46+
)) {
47+
result = TaskResult.failure('Platform view XCUITests failed');
48+
} else {
49+
result = TaskResult.success(null);
50+
}
51+
});
52+
} finally {
53+
await removeIOSSimulator(simulatorDeviceId);
4254
}
43-
44-
return TaskResult.success(null);
55+
return result ?? TaskResult.failure('Simulator creation failed');
4556
});
4657
}

‎dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@
44

55
import 'package:flutter_devicelab/framework/devices.dart';
66
import 'package:flutter_devicelab/framework/framework.dart';
7+
import 'package:flutter_devicelab/framework/ios.dart';
8+
import 'package:flutter_devicelab/framework/task_result.dart';
79
import 'package:flutter_devicelab/tasks/integration_tests.dart';
810

911
Future<void> main() async {
1012
deviceOperatingSystem = DeviceOperatingSystem.ios;
11-
await task(createPlatformChannelSampleTest());
13+
await task(() async {
14+
TaskResult? result;
15+
String? simulatorDeviceId;
16+
try {
17+
await testWithNewIOSSimulator('platform_channel_sample_test_ios', (String deviceId) async {
18+
simulatorDeviceId = deviceId;
19+
result = await createPlatformChannelSampleTest(deviceIdOverride: deviceId).call();
20+
});
21+
} finally {
22+
await removeIOSSimulator(simulatorDeviceId);
23+
}
24+
return result ?? TaskResult.failure('Simulator creation failed');
25+
});
1226
}

‎dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@
44

55
import 'package:flutter_devicelab/framework/devices.dart';
66
import 'package:flutter_devicelab/framework/framework.dart';
7+
import 'package:flutter_devicelab/framework/ios.dart';
8+
import 'package:flutter_devicelab/framework/task_result.dart';
79
import 'package:flutter_devicelab/tasks/integration_tests.dart';
810

911
Future<void> main() async {
1012
deviceOperatingSystem = DeviceOperatingSystem.ios;
11-
await task(createPlatformChannelSwiftSampleTest());
13+
await task(() async {
14+
TaskResult? result;
15+
String? simulatorDeviceId;
16+
try {
17+
await testWithNewIOSSimulator('platform_channel_sample_test_swift', (String deviceId) async {
18+
simulatorDeviceId = deviceId;
19+
result = await createPlatformChannelSwiftSampleTest(deviceIdOverride: deviceId).call();
20+
});
21+
} finally {
22+
await removeIOSSimulator(simulatorDeviceId);
23+
}
24+
return result ?? TaskResult.failure('Simulator creation failed');
25+
});
1226
}

‎dev/devicelab/lib/tasks/integration_tests.dart‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ TaskFunction createPlatformChannelSampleTest({String? deviceIdOverride}) {
6767
).call;
6868
}
6969

70-
TaskFunction createPlatformChannelSwiftSampleTest() {
70+
TaskFunction createPlatformChannelSwiftSampleTest({String? deviceIdOverride}) {
7171
return DriverTest(
7272
'${flutterDirectory.path}/examples/platform_channel_swift',
7373
'test_driver/button_tap.dart',
74+
deviceIdOverride: deviceIdOverride,
7475
).call;
7576
}
7677

@@ -195,10 +196,11 @@ TaskFunction createDisplayCutoutTest() {
195196
).call;
196197
}
197198

198-
TaskFunction dartDefinesTask() {
199+
TaskFunction dartDefinesTask({String? deviceIdOverride}) {
199200
return DriverTest(
200201
'${flutterDirectory.path}/dev/integration_tests/ui',
201202
'lib/defines.dart',
203+
deviceIdOverride: deviceIdOverride,
202204
extraOptions: <String>[
203205
'--dart-define=test.valueA=Example,A',
204206
'--dart-define=test.valueB=Value',
@@ -217,17 +219,19 @@ TaskFunction featureFlagsTask() {
217219
};
218220
}
219221

220-
TaskFunction createEndToEndIntegrationTest() {
222+
TaskFunction createEndToEndIntegrationTest({String? deviceIdOverride}) {
221223
return IntegrationTest(
222224
'${flutterDirectory.path}/dev/integration_tests/ui',
223225
'integration_test/integration_test.dart',
226+
deviceIdOverride: deviceIdOverride,
224227
).call;
225228
}
226229

227-
TaskFunction createSpellCheckIntegrationTest() {
230+
TaskFunction createSpellCheckIntegrationTest({String? deviceIdOverride}) {
228231
return IntegrationTest(
229232
'${flutterDirectory.path}/dev/integration_tests/spell_check',
230233
'integration_test/integration_test.dart',
234+
deviceIdOverride: deviceIdOverride,
231235
).call;
232236
}
233237

‎dev/integration_tests/ios_platform_view_tests/ios/Runner/AppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#import <Flutter/Flutter.h>
66
#import <UIKit/UIKit.h>
77

8-
@interface AppDelegate : FlutterAppDelegate
8+
@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
99

1010
@end

‎dev/integration_tests/ios_platform_view_tests/ios/Runner/AppDelegate.m‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@ @implementation AppDelegate
1515

1616
- (BOOL)application:(UIApplication *)application
1717
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
18-
[GeneratedPluginRegistrant registerWithRegistry:self];
19-
// Override point for customization after application launch.
20-
id<FlutterPluginRegistrar> registrar = [self registrarForPlugin:@"flutter"];
18+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
19+
}
20+
21+
- (void)didInitializeImplicitFlutterEngine:(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
22+
[GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
23+
id<FlutterPluginRegistrar> registrar = [engineBridge.pluginRegistry registrarForPlugin:@"flutter"];
2124
[registrar registerViewFactory:[[ViewFactory alloc] init] withId:@"platform_view"];
2225
[registrar registerViewFactory:[[TextFieldFactory alloc] init] withId:@"platform_text_field"];
2326
[registrar registerViewFactory:[[ButtonFactory alloc] init] withId:@"platform_button"];
2427
[registrar registerViewFactory:[[WebViewFactory alloc] init] withId:@"platform_web_view"];
2528
[registrar registerViewFactory:[[DrawingWebViewFactory alloc] init] withId:@"platform_drawing_web_view"];
2629
[registrar registerViewFactory:[[FakeAdMobBannerFactory alloc] init] withId:@"platform_fake_admob_banner"];
27-
return [super application:application didFinishLaunchingWithOptions:launchOptions];
2830
}
2931

3032
@end

0 commit comments

Comments
 (0)