move the application state wait until after setting the root vc

Author: xster

testing/scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m

@@ -38,8 +38,14 @@ @implementation AppLifecycleTests
 - (void)setUp {
   [super setUp];
   self.continueAfterFailure = NO;
+}
+
+- (void)ensureApplicationIsInActiveState {
   // Since this test checks for view controller and application lifecycles, the starting point
   // must be well defined.
+
+  // Make this check after setting the root view controller since it seems to just hang if
+  // done in setUp.
   if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive) {
     NSLog(@"Initial application state is currently %zd. Waiting for active.",
           [UIApplication sharedApplication].applicationState);
@@ -48,7 +54,7 @@ - (void)setUp {
     [self expectationForNotification:UIApplicationDidBecomeActiveNotification
                               object:self
                              handler:nil];
-    [self waitForExpectationsWithTimeout:60.0 handler:nil];
+    [self waitForExpectationsWithTimeout:30.0 handler:nil];
   }
   XCTAssertEqual([UIApplication sharedApplication].applicationState, UIApplicationStateActive);
 }
@@ -68,6 +74,8 @@ - (void)skip_testDismissedFlutterViewControllerNotRespondingToApplicationLifecyc
   application.delegate.window.rootViewController = rootVC;
   FlutterEngine* engine = rootVC.engine;
 
+  [self ensureApplicationIsInActiveState];
+
   NSMutableArray* lifecycleExpectations = [NSMutableArray arrayWithCapacity:10];
 
   // Expected sequence from showing the FlutterViewController is inactive and resumed.
@@ -212,6 +220,8 @@ - (void)skip_testVisibleFlutterViewControllerRespondsToApplicationLifecycle {
   application.delegate.window.rootViewController = rootVC;
   FlutterEngine* engine = rootVC.engine;
 
+  [self ensureApplicationIsInActiveState];
+
   NSMutableArray* lifecycleExpectations = [NSMutableArray arrayWithCapacity:10];
 
   // Expected sequence from showing the FlutterViewController is inactive and resumed.
@@ -322,6 +332,8 @@ - (void)skip_testFlutterViewControllerDetachingSendsApplicationLifecycle {
   application.delegate.window.rootViewController = rootVC;
   FlutterEngine* engine = rootVC.engine;
 
+  [self ensureApplicationIsInActiveState];
+
   NSMutableArray* lifecycleExpectations = [NSMutableArray arrayWithCapacity:10];
 
   // Expected sequence from showing the FlutterViewController is inactive and resumed.