Skip to content

Commit 37410f2

Browse files
authored
Migrate ios driver tests batch 4 to simulators (flutter#192463)
Part of flutter#186414 This batch migrates 2 Devicelab tests to simulators: * `external_ui_integration_test_ios` (`external_textures_integration_test_ios`) * `hello_world_impeller_ios_sdfs` 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 `external_textures_integration_test_ios` Devicelab task with `testWithNewIOSSimulator`. - Migrated `dev/integration_tests/external_textures` and `examples/hello_world` iOS projects to adopt `UIScene` .
1 parent 5be6f10 commit 37410f2

8 files changed

Lines changed: 80 additions & 11 deletions

File tree

‎.ci.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5422,13 +5422,18 @@ targets:
54225422
#
54235423
# Also, rename this to "external_textures_integration_test" to be consistent
54245424
# with the Android test, but that can wait until we've figured out the flake.
5425-
- name: Mac_ios external_ui_integration_test_ios
5425+
- name: Mac external_ui_integration_test_ios
54265426
recipe: devicelab/devicelab_drone
54275427
presubmit: false
5428+
bringup: true
54285429
timeout: 60
54295430
properties:
5431+
dependencies: >-
5432+
[
5433+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5434+
]
54305435
tags: >
5431-
["devicelab", "ios", "mac"]
5436+
["devicelab", "hostonly", "mac"]
54325437
task_name: external_textures_integration_test_ios
54335438
ignore_flakiness: "true"
54345439

@@ -5663,13 +5668,18 @@ targets:
56635668
["devicelab", "hostonly", "mac"]
56645669
task_name: ios_defines_test
56655670

5666-
- name: Mac_ios hello_world_impeller_ios_sdfs
5671+
- name: Mac hello_world_impeller_ios_sdfs
56675672
recipe: devicelab/devicelab_drone
56685673
presubmit: false
5674+
bringup: true
56695675
timeout: 60
56705676
properties:
5677+
dependencies: >-
5678+
[
5679+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5680+
]
56715681
tags: >
5672-
["devicelab", "ios", "mac"]
5682+
["devicelab", "hostonly", "mac"]
56735683
task_name: hello_world_impeller_ios_sdfs
56745684

56755685
- name: Mac_ios large_image_changer_perf_ios

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,29 @@
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(createExternalTexturesFrameRateIntegrationTest());
13+
await task(() async {
14+
String? simulatorDeviceId;
15+
TaskResult? result;
16+
try {
17+
await testWithNewIOSSimulator('external_textures_integration_test_ios', (
18+
String deviceId,
19+
) async {
20+
simulatorDeviceId = deviceId;
21+
result = await createExternalTexturesFrameRateIntegrationTest(
22+
deviceIdOverride: deviceId,
23+
).call();
24+
});
25+
} finally {
26+
if (simulatorDeviceId != null) {
27+
await removeIOSSimulator(simulatorDeviceId);
28+
}
29+
}
30+
return result ?? TaskResult.failure('Simulator creation failed');
31+
});
1232
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ TaskFunction createIntegrationTestFlavorsTest({
5353

5454
TaskFunction createExternalTexturesFrameRateIntegrationTest({
5555
List<String> extraOptions = const <String>[],
56+
String? deviceIdOverride,
5657
}) {
5758
return DriverTest(
5859
'${flutterDirectory.path}/dev/integration_tests/external_textures',
5960
'lib/frame_rate_main.dart',
6061
extraOptions: extraOptions,
62+
deviceIdOverride: deviceIdOverride,
6163
).call;
6264
}
6365

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

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

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

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,15 @@
55
#import "AppDelegate.h"
66

77
@implementation AppDelegate
8+
9+
- (BOOL)application:(UIApplication *)application
10+
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
11+
return [super application:application
12+
didFinishLaunchingWithOptions:launchOptions];
13+
}
14+
15+
- (void)didInitializeImplicitFlutterEngine:
16+
(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
17+
}
18+
819
@end

‎examples/hello_world/ios/Runner/AppDelegate.h‎

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

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

1010
@end

‎examples/hello_world/ios/Runner/AppDelegate.m‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@
77

88
@implementation AppDelegate
99

10-
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
11-
[GeneratedPluginRegistrant registerWithRegistry:self];
12-
// Override point for customization after application launch.
13-
return [super application:application didFinishLaunchingWithOptions:launchOptions];
10+
- (BOOL)application:(UIApplication *)application
11+
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
12+
return [super application:application
13+
didFinishLaunchingWithOptions:launchOptions];
14+
}
15+
16+
- (void)didInitializeImplicitFlutterEngine:
17+
(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
18+
[GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
1419
}
1520
@end

‎examples/hello_world/ios/Runner/Info.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,26 @@
4343
<true/>
4444
<key>UIApplicationSupportsIndirectInputEvents</key>
4545
<true/>
46+
<key>UIApplicationSceneManifest</key>
47+
<dict>
48+
<key>UIApplicationSupportsMultipleScenes</key>
49+
<false/>
50+
<key>UISceneConfigurations</key>
51+
<dict>
52+
<key>UIWindowSceneSessionRoleApplication</key>
53+
<array>
54+
<dict>
55+
<key>UISceneClassName</key>
56+
<string>UIWindowScene</string>
57+
<key>UISceneConfigurationName</key>
58+
<string>flutter</string>
59+
<key>UISceneDelegateClassName</key>
60+
<string>FlutterSceneDelegate</string>
61+
<key>UISceneStoryboardFile</key>
62+
<string>Main</string>
63+
</dict>
64+
</array>
65+
</dict>
66+
</dict>
4667
</dict>
4768
</plist>

0 commit comments

Comments
 (0)