Remove timeout from add2app test for iOS (#28746)

dev/integration_tests/ios_add2app/README.md

@@ -6,16 +6,23 @@ interaction.
 
 The following functionality is currently implemented:
 
-1. A regular iOS view controller (UIViewController), similar to the default `flutter create` template.
-1. A FlutterViewController subclass that takes over full screen. Demos showing this both from a cold/fresh engine state and a warm engine state.
+1. A regular iOS view controller (UIViewController), similar to the default
+   `flutter create` template (NativeViewController.m).
+1. A FlutterViewController subclass that takes over full screen. Demos showing
+   this both from a cold/fresh engine state and a warm engine state
+   (FullScreenViewController.m).
 1. A demo of pushing a FlutterViewController on as a child view.
-1. A demo of showing both the native and the Flutter views using a platform channel to to interact with each other.
-1. A demo of showing two FlutterViewControllers simultaneously.
+1. A demo of showing both the native and the Flutter views using a platform
+   channel to to interact with each other (HybridViewController.m).
+1. A demo of showing two FlutterViewControllers simultaneously
+   (DualViewController.m).
 
-A few key things are tested here:
+A few key things are tested here (IntegrationTests.m):
 
-1. The ability to pre-warm the engine and attach/detatch a ViewController from it.
-1. The ability to simultaneously run two instances of the engine.
+1. The ability to pre-warm the engine and attach/detatch a ViewController from
+   it.
 1. The ability to use platform channels to communicate between views.
-1. That a FlutterViewController can be freed when no longer in use.
+1. The ability to simultaneously run two instances of the engine.
+1. That a FlutterViewController can be freed when no longer in use (also tested
+   from FlutterViewControllerTests.m).
 1. That a FlutterEngine can be freed when no longer in use.
\ No newline at end of file

dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/project.pbxproj

@@ -500,6 +500,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -559,6 +560,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;

dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.h

@@ -8,6 +8,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface DualFlutterViewController : UIViewController
 
+@property (readonly, strong, nonatomic) FlutterViewController* topFlutterViewController;
+@property (readonly, strong, nonatomic) FlutterViewController* bottomFlutterViewController;
+
 @end
 
 NS_ASSUME_NONNULL_END

dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.m

@@ -23,19 +23,18 @@
   stackView.layoutMarginsRelativeArrangement = YES;
   [self.view addSubview:stackView];
 
-
-  FlutterViewController* topFlutterViewController = [[FlutterViewController alloc] init];
-  FlutterViewController* bottomFlutterViewController= [[FlutterViewController alloc] init];
-
-  [topFlutterViewController setInitialRoute:@"marquee_green"];
-  [self addChildViewController:topFlutterViewController];
-  [stackView addArrangedSubview:topFlutterViewController.view];
-  [topFlutterViewController didMoveToParentViewController:self];
-
-  [bottomFlutterViewController setInitialRoute:@"marquee_purple"];
-  [self addChildViewController:bottomFlutterViewController];
-  [stackView addArrangedSubview:bottomFlutterViewController.view];
-  [topFlutterViewController didMoveToParentViewController:self];
+  _topFlutterViewController = [[FlutterViewController alloc] init];
+  _bottomFlutterViewController= [[FlutterViewController alloc] init];
+
+  [_topFlutterViewController setInitialRoute:@"marquee_green"];
+  [self addChildViewController:_topFlutterViewController];
+  [stackView addArrangedSubview:_topFlutterViewController.view];
+  [_topFlutterViewController didMoveToParentViewController:self];
+
+  [_bottomFlutterViewController setInitialRoute:@"marquee_purple"];
+  [self addChildViewController:_bottomFlutterViewController];
+  [stackView addArrangedSubview:_bottomFlutterViewController.view];
+  [_bottomFlutterViewController didMoveToParentViewController:self];
 }
 
 @end

dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.h

@@ -10,6 +10,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface HybridViewController : UIViewController<NativeViewControllerDelegate>
 
+@property (readonly, strong, nonatomic) FlutterViewController* flutterViewController;
+
 @end
 
 NS_ASSUME_NONNULL_END

dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.m

@@ -43,7 +43,7 @@ static NSString *_kPing = @"ping";
   [stackView addArrangedSubview:nativeViewController.view];
   [nativeViewController didMoveToParentViewController:self];
 
-  FlutterViewController *flutterViewController =
+  _flutterViewController =
       [[FlutterViewController alloc] initWithEngine:[self engine]
                                             nibName:nil
                                              bundle:nil];
@@ -51,11 +51,11 @@ static NSString *_kPing = @"ping";
 
   _messageChannel = [[FlutterBasicMessageChannel alloc]
          initWithName:_kChannel
-      binaryMessenger:flutterViewController
+      binaryMessenger:_flutterViewController
                 codec:[FlutterStringCodec sharedInstance]];
-  [self addChildViewController:flutterViewController];
-  [stackView addArrangedSubview:flutterViewController.view];
-  [flutterViewController didMoveToParentViewController:self];
+  [self addChildViewController:_flutterViewController];
+  [stackView addArrangedSubview:_flutterViewController.view];
+  [_flutterViewController didMoveToParentViewController:self];
 
   __weak NativeViewController *weakNativeViewController = nativeViewController;
   [_messageChannel setMessageHandler:^(id message, FlutterReply reply) {