@@ -696,7 +696,7 @@ - (void)testSceneWillConnectToSessionOptionsHandledByApplicationPluginMultipleEn
696696
697697 [delegate registerSceneLifeCycleWithFlutterEngine: mockEngine scene: mockScene];
698698 [delegate registerSceneLifeCycleWithFlutterEngine: mockEngine2 scene: mockScene];
699- XCTAssertEqual ([delegate searchFlutterEnginesWithinScene: mockScene].count , 2.0 );
699+ XCTAssertEqual ([delegate searchFlutterEnginesWithinScene: mockScene].count , 2U );
700700
701701 [delegate scene: mockScene willConnectToSession: session options: options];
702702 OCMVerify (times (1 ), [mockLifecycleDelegate scene: mockScene
@@ -1514,6 +1514,106 @@ - (void)testWindowScenePerformActionForShortcutItemHandledByNoPlugin {
15141514 completionHandler: handler]);
15151515}
15161516
1517+ - (void )testWindowSceneDidUpdateEffectiveGeometryUpdatesDisplaysOfEnginesInScene {
1518+ if (@available (iOS 26.0 , *)) {
1519+ FlutterPluginSceneLifeCycleDelegate* delegate =
1520+ [[FlutterPluginSceneLifeCycleDelegate alloc ] init ];
1521+
1522+ id mocks = [self mocksForEvents ];
1523+ id mockScene = mocks[@" mockScene" ];
1524+ // An engine whose view controller is in the scene, e.g. a fixed-size FlutterViewController
1525+ // embedded as a child view controller in an add-to-app host.
1526+ id viewControllerEngine = mocks[@" mockEngine" ];
1527+ id mockWindow = OCMClassMock ([UIWindow class ]);
1528+ id mockHostViewController = OCMClassMock ([UIViewController class ]);
1529+ id mockFlutterViewController = OCMClassMock ([FlutterViewController class ]);
1530+ OCMStub ([mockScene windows ]).andReturn (@[ mockWindow ]);
1531+ OCMStub ([mockWindow rootViewController ]).andReturn (mockHostViewController);
1532+ OCMStub ([mockHostViewController childViewControllers ]).andReturn (@[
1533+ mockFlutterViewController
1534+ ]);
1535+ OCMStub ([mockFlutterViewController engine ]).andReturn (viewControllerEngine);
1536+ // An engine registered with the scene by the developer.
1537+ id registeredEngine = OCMClassMock ([FlutterEngine class ]);
1538+ [delegate registerSceneLifeCycleWithFlutterEngine: registeredEngine scene: mockScene];
1539+ XCTAssertEqual ([delegate searchFlutterEnginesWithinScene: mockScene].count , 2U );
1540+
1541+ id geometry = OCMClassMock ([UIWindowSceneGeometry class ]);
1542+ [delegate windowScene: mockScene didUpdateEffectiveGeometry: geometry];
1543+
1544+ OCMVerify (times (1 ), [viewControllerEngine updateDisplays ]);
1545+ OCMVerify (times (1 ), [registeredEngine updateDisplays ]);
1546+ } else {
1547+ XCTSkip (@" windowScene:didUpdateEffectiveGeometry: requires iOS 26." );
1548+ }
1549+ }
1550+
1551+ - (void )testWindowSceneDidUpdateEffectiveGeometryWithNilPreviousGeometryUpdatesDisplays {
1552+ if (@available (iOS 26.0 , *)) {
1553+ FlutterPluginSceneLifeCycleDelegate* delegate =
1554+ [[FlutterPluginSceneLifeCycleDelegate alloc ] init ];
1555+
1556+ id mocks = [self mocksForEvents ];
1557+ id mockEngine = mocks[@" mockEngine" ];
1558+ id mockScene = mocks[@" mockScene" ];
1559+ [delegate registerSceneLifeCycleWithFlutterEngine: mockEngine scene: mockScene];
1560+
1561+ // UIKit declares `previousEffectiveGeometry` as nonnull, but passes `nil` on the first call
1562+ // while the scene is being created. Passing a literal `nil` here would trigger `-Wnonnull`.
1563+ UIWindowSceneGeometry* previousEffectiveGeometry = nil ;
1564+ [delegate windowScene: mockScene didUpdateEffectiveGeometry: previousEffectiveGeometry];
1565+
1566+ OCMVerify (times (1 ), [mockEngine updateDisplays ]);
1567+ } else {
1568+ XCTSkip (@" windowScene:didUpdateEffectiveGeometry: requires iOS 26." );
1569+ }
1570+ }
1571+
1572+ - (void )testWindowSceneDidUpdateEffectiveGeometryDoesNotUpdateDisplaysOfEnginesInOtherScenes {
1573+ if (@available (iOS 26.0 , *)) {
1574+ FlutterPluginSceneLifeCycleDelegate* delegate =
1575+ [[FlutterPluginSceneLifeCycleDelegate alloc ] init ];
1576+
1577+ id mocks = [self mocksForEvents ];
1578+ id mockEngine = mocks[@" mockEngine" ];
1579+ id mockScene = mocks[@" mockScene" ];
1580+ id otherScene = OCMClassMock ([UIWindowScene class ]);
1581+ [delegate registerSceneLifeCycleWithFlutterEngine: mockEngine scene: otherScene];
1582+
1583+ [delegate windowScene: mockScene
1584+ didUpdateEffectiveGeometry: OCMClassMock ([UIWindowSceneGeometry class ])];
1585+
1586+ OCMVerify (never (), [mockEngine updateDisplays ]);
1587+ } else {
1588+ XCTSkip (@" windowScene:didUpdateEffectiveGeometry: requires iOS 26." );
1589+ }
1590+ }
1591+
1592+ - (void )testWindowSceneDidUpdateEffectiveGeometryUpdatesDisplaysOfEnginesInSingleScene {
1593+ if (@available (iOS 26.0 , *)) {
1594+ id mockApplication = OCMClassMock ([UIApplication class ]);
1595+ OCMStub ([mockApplication sharedApplication ]).andReturn (mockApplication);
1596+ OCMStub ([mockApplication supportsMultipleScenes ]).andReturn (NO );
1597+
1598+ FlutterPluginSceneLifeCycleDelegate* delegate =
1599+ [[FlutterPluginSceneLifeCycleDelegate alloc ] init ];
1600+
1601+ // In a single-scene app, every engine registers itself for the single scene when created.
1602+ id mockEngine = OCMClassMock ([FlutterEngine class ]);
1603+ [FlutterPluginSceneLifeCycleDelegate registerEngineForSingleScene: mockEngine];
1604+
1605+ id mockScene = OCMClassMock ([UIWindowScene class ]);
1606+ [delegate windowScene: mockScene
1607+ didUpdateEffectiveGeometry: OCMClassMock ([UIWindowSceneGeometry class ])];
1608+
1609+ OCMVerify (times (1 ), [mockEngine updateDisplays ]);
1610+
1611+ [mockApplication stopMocking ];
1612+ } else {
1613+ XCTSkip (@" windowScene:didUpdateEffectiveGeometry: requires iOS 26." );
1614+ }
1615+ }
1616+
15171617- (NSDictionary *)mocksForEvents {
15181618 id mockEngine = OCMClassMock ([FlutterEngine class ]);
15191619 id mockLifecycleDelegate = OCMClassMock ([FlutterEnginePluginSceneLifeCycleDelegate class ]);
0 commit comments