Turn on add-to-app iOS platform unit tests (#61007)

.cirrus.yml

@@ -272,8 +272,6 @@ task:
     - name: hostonly_devicelab_tests-3_last-linux
       << : *LINUX_SHARD_TEMPLATE
 
-    # TODO(ianh): name: add_to_app_tests-linux
-
     - name: docs-linux # linux-only
       only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_drive/**', 'packages/flutter_localizations/**', 'packages/flutter_goldens/**', 'bin/**') || $CIRRUS_PR == ''"
       environment:
@@ -508,8 +506,6 @@ task:
         CPU: 4
         MEMORY: 6G
 
-    # TODO(ianh): name: add_to_app_tests-windows
-
     - name: customer_testing-windows
       environment:
         # As of December 2019, the customer_testing-windows shard got faster with more CPUs up to 4
@@ -624,13 +620,6 @@ task:
     - name: hostonly_devicelab_tests-3_last-macos
       << : *MACOS_SHARD_TEMPLATE
 
-    - name: add_to_app_tests-macos
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41940
-      skip: true # https://github.com/flutter/flutter/pull/42444
-      script:
-        - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
-        - dart --enable-asserts dev/bots/test.dart
-
     - name: customer_testing-macos
       script:
         - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976

dev/bots/test.dart

@@ -121,7 +121,6 @@ Future<void> main(List<String> args) async {
     await _runSmokeTests();
     print('═' * 80);
     await selectShard(const <String, ShardRunner>{
-      'add_to_app_tests': _runAddToAppTests,
       'add_to_app_life_cycle_tests': _runAddToAppLifeCycleTests,
       'build_tests': _runBuildTests,
       'firebase_test_lab_tests': _runFirebaseTestLabTests,
@@ -525,17 +524,6 @@ Future<void> _flutterBuildDart2js(String relativePathToApplication, String targe
   );
 }
 
-Future<void> _runAddToAppTests() async {
-  if (Platform.isMacOS) {
-    print('${green}Running add-to-app iOS integration tests$reset...');
-    final String addToAppDir = path.join(flutterRoot, 'dev', 'integration_tests', 'ios_add2app');
-    await runCommand('./build_and_test.sh',
-      <String>[],
-      workingDirectory: addToAppDir,
-    );
-  }
-}
-
 Future<void> _runAddToAppLifeCycleTests() async {
   if (Platform.isMacOS) {
     print('${green}Running add-to-app life cycle iOS integration tests$reset...');

dev/devicelab/bin/tasks/module_test_ios.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/ios.dart';
 import 'package:flutter_devicelab/framework/utils.dart';
 import 'package:path/path.dart' as path;
 
@@ -30,6 +31,18 @@ Future<void> main() async {
         );
       });
 
+      // Copy test dart files to new module app.
+      final Directory flutterModuleLibSource = Directory(path.join(flutterDirectory.path, 'dev', 'integration_tests', 'ios_host_app', 'flutterapp', 'lib'));
+      final Directory flutterModuleLibDestination = Directory(path.join(projectDir.path, 'lib'));
+
+      // These test files don't have a .dart prefix so the analyzer will ignore them. They aren't in a
+      // package and don't work on their own outside of the test module just created.
+      final File main = File(path.join(flutterModuleLibSource.path, 'main'));
+      main.copySync(path.join(flutterModuleLibDestination.path, 'main.dart'));
+
+      final File marquee = File(path.join(flutterModuleLibSource.path, 'marquee'));
+      marquee.copySync(path.join(flutterModuleLibDestination.path, 'marquee.dart'));
+
       section('Build ephemeral host app in release mode without CocoaPods');
 
       await inDirectory(projectDir, () async {
@@ -181,42 +194,6 @@ Future<void> main() async {
         return TaskResult.failure('Building ephemeral host app Podfile.lock does not contain expected pods');
       }
 
-      section('Clean build');
-
-      await inDirectory(projectDir, () async {
-        await flutter('clean');
-      });
-
-      section('Make iOS host app editable');
-
-      await inDirectory(projectDir, () async {
-        await flutter(
-          'make-host-app-editable',
-          options: <String>['ios'],
-        );
-      });
-
-      section('Build editable host app');
-
-      await inDirectory(projectDir, () async {
-        await flutter(
-          'build',
-          options: <String>['ios', '--no-codesign'],
-        );
-      });
-
-      final bool editableHostAppBuilt = exists(Directory(path.join(
-        projectDir.path,
-        'build',
-        'ios',
-        'iphoneos',
-        'Runner.app',
-      )));
-
-      if (!editableHostAppBuilt) {
-        return TaskResult.failure('Failed to build editable host .app');
-      }
-
       section('Add to existing iOS Objective-C app');
 
       final Directory objectiveCHostApp = Directory(path.join(tempDir.path, 'hello_host_app'));
@@ -277,10 +254,34 @@ Future<void> main() async {
         );
       }
 
+      section('Run platform unit tests');
+      await testWithNewiOSSimulator('TestAdd2AppSim', (String deviceId) =>
+        inDirectory(objectiveCHostApp, () =>
+          exec(
+            'xcodebuild',
+            <String>[
+              '-workspace',
+              'Host.xcworkspace',
+              '-scheme',
+              'Host',
+              '-configuration',
+              'Debug',
+              '-destination',
+              'id=$deviceId',
+              'test',
+              'CODE_SIGNING_ALLOWED=NO',
+              'CODE_SIGNING_REQUIRED=NO',
+              'CODE_SIGN_IDENTITY=-',
+              'EXPANDED_CODE_SIGN_IDENTITY=-',
+              'COMPILER_INDEX_STORE_ENABLE=NO',
+            ],
+          )
+        )
+      );
+
       section('Fail building existing Objective-C iOS app if flutter script fails');
-      int xcodebuildExitCode = 0;
-      await inDirectory(objectiveCHostApp, () async {
-        xcodebuildExitCode = await exec(
+      final int xcodebuildExitCode = await inDirectory<int>(objectiveCHostApp, () =>
+        exec(
           'xcodebuild',
           <String>[
             '-workspace',
@@ -298,8 +299,8 @@ Future<void> main() async {
             'COMPILER_INDEX_STORE_ENABLE=NO',
           ],
           canFail: true,
-        );
-      });
+        )
+      );
 
       if (xcodebuildExitCode != 65) { // 65 returned on PhaseScriptExecution failure.
         return TaskResult.failure('Host Objective-C app build succeeded though flutter script failed');

dev/devicelab/lib/framework/ios.dart

@@ -7,6 +7,8 @@ import 'dart:convert';
 
 import 'utils.dart';
 
+typedef SimulatorFunction = Future<void> Function(String deviceId);
+
 void _checkExitCode(int code) {
   if (code != 0) {
     throw Exception(
@@ -99,3 +101,85 @@ Future<bool> containsBitcode(String pathToBinary) async {
   });
   return !emptyBitcodeMarkerFound;
 }
+
+/// Creates and boots a new simulator, passes the new simulator's identifier to
+/// `testFunction`, then shuts down and deletes simulator.
+Future<void> testWithNewiOSSimulator(
+  String deviceName,
+  SimulatorFunction testFunction, {
+  String deviceTypeId = 'com.apple.CoreSimulator.SimDeviceType.iPhone-11',
+}) async {
+  // Xcode 11.4 simctl create makes the runtime argument optional, and defaults to latest.
+  // TODO(jmagman): Remove runtime parsing when devicelab upgrades to Xcode 11.4 https://github.com/flutter/flutter/issues/54889
+  final String availableRuntimes = await eval(
+    'xcrun',
+    <String>[
+      'simctl',
+      'list',
+      'runtimes',
+    ],
+    workingDirectory: flutterDirectory.path,
+  );
+
+  String iOSSimRuntime;
+
+  final RegExp iOSRuntimePattern = RegExp(r'iOS .*\) - (.*)');
+
+  for (final String runtime in LineSplitter.split(availableRuntimes)) {
+    // These seem to be in order, so allow matching multiple lines so it grabs
+    // the last (hopefully latest) one.
+    final RegExpMatch iOSRuntimeMatch = iOSRuntimePattern.firstMatch(runtime);
+    if (iOSRuntimeMatch != null) {
+      iOSSimRuntime = iOSRuntimeMatch.group(1).trim();
+      continue;
+    }
+  }
+  if (iOSSimRuntime == null) {
+    throw 'No iOS simulator runtime found. Available runtimes:\n$availableRuntimes';
+  }
+
+  final String deviceId = await eval(
+    'xcrun',
+    <String>[
+      'simctl',
+      'create',
+      deviceName,
+      deviceTypeId,
+      iOSSimRuntime,
+    ],
+    workingDirectory: flutterDirectory.path,
+  );
+  await eval(
+    'xcrun',
+    <String>[
+      'simctl',
+      'boot',
+      deviceId,
+    ],
+    workingDirectory: flutterDirectory.path,
+  );
+
+  await testFunction(deviceId);
+
+  if (deviceId != null && deviceId != '') {
+    await eval(
+      'xcrun',
+      <String>[
+        'simctl',
+        'shutdown',
+        deviceId
+      ],
+      canFail: true,
+      workingDirectory: flutterDirectory.path,
+    );
+    await eval(
+      'xcrun',
+      <String>[
+        'simctl',
+        'delete',
+        deviceId],
+      canFail: true,
+      workingDirectory: flutterDirectory.path,
+    );
+  }
+}

dev/integration_tests/ios_add2app/.gitignore

-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-.DS_Store
-
-## Build generated
-build/
-DerivedData/
-Pods/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
\ No newline at end of file

dev/integration_tests/ios_add2app/Podfile

-platform :ios, '12.0'
-
-flutter_application_path = 'flutterapp/'
-
-load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
-
-target 'ios_add2app' do
-  install_all_flutter_pods(flutter_application_path)
-end
-
-target 'ios_add2appTests' do
-  inherit! :search_paths
-  install_flutter_engine_pod
-  pod 'EarlGrey'
-end

dev/integration_tests/ios_add2app/README.md

-# iOS Add2App Test
-
-This application demonstrates some basic functionality for Add2App,
-along with a native iOS ViewController as a baseline and to demonstrate
-interaction.
-
-The following functionality is currently implemented:
-
-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 interact with each other (HybridViewController.m).
-1. A demo of showing two FlutterViewControllers simultaneously
-   (DualViewController.m).
-
-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 use platform channels to communicate between views.
-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/build_and_test.sh

-#!/usr/bin/env bash
-# Copyright 2014 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-set -e
-
-cd "$(dirname "$0")"
-
-pushd flutterapp
-../../../../bin/flutter build ios --debug --simulator --no-codesign
-popd
-
-pod install
-os_version=$(xcrun --show-sdk-version --sdk iphonesimulator)
-
-PRETTY="cat"
-if which xcpretty; then
-  PRETTY="xcpretty"
-fi
-
-set -o pipefail && xcodebuild \
-  -workspace ios_add2app.xcworkspace \
-  -scheme ios_add2appTests \
-  -sdk "iphonesimulator$os_version" \
-  -destination "OS=$os_version,name=iPhone X" test | $PRETTY

dev/integration_tests/ios_add2app/flutterapp/.gitignore

-.DS_Store
-.dart_tool/
-
-.packages
-.pub/
-
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-*.swp
-profile
-
-DerivedData/
-
-.generated/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
-
-*.pyc
-*sync/
-Icon?
-.tags*
-
-build/
-.android/
-.ios/
-.flutter-plugins
-.flutter-plugins-dependencies

dev/integration_tests/ios_add2app/flutterapp/.metadata

-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: 06179457d553b96b4d7421a08ac90535ca2c9632
-  channel: unknown
-
-project_type: module

dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2appTests.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1000"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "24D2933421A29627008787A5"
-               BuildableName = "ios_add2appTests.xctest"
-               BlueprintName = "ios_add2appTests"
-               ReferencedContainer = "container:ios_add2app.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "DYLD_INSERT_LIBRARIES"
-            value = "@executable_path/EarlGrey.framework/EarlGrey"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/contents.xcworkspacedata

-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:ios_add2app.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>

dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.h

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-#import <Flutter/Flutter.h>
-
-@interface AppDelegate : FlutterAppDelegate
-
-@property(nonatomic, strong) FlutterEngine* engine;
-@property(nonatomic, strong) FlutterBasicMessageChannel* reloadMessageChannel;
-
-@end

dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.m

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "AppDelegate.h"
-#import "MainViewController.h"
-
-@interface AppDelegate ()
-
-@end
-
-static NSString *_kReloadChannelName = @"reload";
-
-@implementation AppDelegate {
-  MainViewController *_mainViewController;
-  UINavigationController *_navigationController;
-  FlutterEngine *_engine;
-  FlutterBasicMessageChannel *_reloadMessageChannel;
-}
-
-- (FlutterEngine *)engine {
-  return _engine;
-}
-
-- (FlutterBasicMessageChannel *)reloadMessabeChannel {
-  return _reloadMessageChannel;
-}
-
-- (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-
-  _mainViewController = [[MainViewController alloc] init];
-  _navigationController = [[UINavigationController alloc]
-      initWithRootViewController:_mainViewController];
-
-  _navigationController.navigationBar.translucent = NO;
-
-  _engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
-  [_engine runWithEntrypoint:nil];
-
-  _reloadMessageChannel = [[FlutterBasicMessageChannel alloc]
-         initWithName:_kReloadChannelName
-      binaryMessenger:_engine.binaryMessenger
-                codec:[FlutterStringCodec sharedInstance]];
-
-  self.window.rootViewController = _navigationController;
-  [self.window makeKeyAndVisible];
-
-  return YES;
-}
-
-@end

dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json

-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/Contents.json

-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

dev/integration_tests/ios_add2app/ios_add2app/Info.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

dev/integration_tests/ios_add2app/ios_add2app/Launch Screen.storyboard

-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2018 The Flutter Authors. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
-                                <rect key="frame" x="0.0" y="626" width="375" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ios_add2app" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
-                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
-                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>

dev/integration_tests/ios_add2app/ios_add2app/main.m

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}

dev/integration_tests/ios_add2app/ios_add2appTests/FlutterViewControllerTests.m

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(dnfield): This belongs in the engine repo.
-#import <Flutter/Flutter.h>
-#import <XCTest/XCTest.h>
-
-@interface ViewControllerRelease : XCTestCase
-@end
-
-
-@implementation ViewControllerRelease
-
-- (void)testReleaseFlutterViewController {
- __weak FlutterEngine* weakEngine;
- @autoreleasepool {
-   FlutterViewController* viewController = [[FlutterViewController alloc]
-   init];
-   weakEngine = viewController.engine;
-   [viewController viewWillAppear:NO];
-   [viewController viewDidDisappear:NO];
- }
- XCTAssertNil(weakEngine, @"Engine failed to release.");
-}
-
-@end

dev/integration_tests/ios_add2app/ios_add2appTests/IntegrationTests.m

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <EarlGrey/EarlGrey.h>
-#import <XCTest/XCTest.h>
-
-#import "../ios_add2app/AppDelegate.h"
-#import "../ios_add2app/DualFlutterViewController.h"
-#import "../ios_add2app/FullScreenViewController.h"
-#import "../ios_add2app/MainViewController.h"
-#import "../ios_add2app/HybridViewController.h"
-
-@interface FlutterTests : XCTestCase
-@end
-
-@implementation FlutterTests {
-  int _flutterWarmEngineTaps;
-}
-
-- (instancetype)init {
-  self = [super init];
-
-  if (self) {
-    _flutterWarmEngineTaps = 0;
-  }
-
-  return self;
-}
-
-- (void)expectSemanticsNotification:(FlutterViewController*)viewController {
-  [self expectationForNotification:FlutterSemanticsUpdateNotification object:viewController handler:nil];
-  [viewController.engine ensureSemanticsEnabled];
-  [self waitForExpectationsWithTimeout:30.0 handler:nil];
-}
-
-- (void)testFullScreenCanPop {
-  [[EarlGrey selectElementWithMatcher:grey_keyWindow()]
-      assertWithMatcher:grey_sufficientlyVisible()];
-
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Full Screen (Cold)")]
-      performAction:grey_tap()];
-
-  __weak FlutterViewController *weakViewController;
-  @autoreleasepool {
-    UINavigationController *navController =
-        (UINavigationController *)((AppDelegate *)
-                                       [[UIApplication sharedApplication]
-                                           delegate])
-            .window.rootViewController;
-    weakViewController =
-        (FullScreenViewController *)navController.visibleViewController;
-    [self expectSemanticsNotification:weakViewController];
-    GREYAssertNotNil(weakViewController,
-                     @"Expected non-nil FullScreenViewController.");
-  }
-
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"POP")]
-      performAction:grey_tap()];
-  // EarlGrey v1 isn't good at detecting this yet - 2.0 will be able to do it
-  int tries = 10;
-  double delay = 1.0;
-  while (weakViewController != nil && tries != 0) {
-    CFRunLoopRunInMode(kCFRunLoopDefaultMode, delay, false);
-    tries--;
-  }
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")]
-      assertWithMatcher:grey_sufficientlyVisible()];
-  GREYAssertNil(weakViewController,
-                @"Expected FullScreenViewController to be deallocated.");
-}
-
-- (void)testDualFlutterView {
-  [[EarlGrey selectElementWithMatcher:grey_keyWindow()]
-      assertWithMatcher:grey_sufficientlyVisible()];
-
-  [[EarlGrey
-      selectElementWithMatcher:grey_buttonTitle(@"Dual Flutter View (Cold)")]
-      performAction:grey_tap()];
-
-  @autoreleasepool {
-    UINavigationController *navController =
-        (UINavigationController *)((AppDelegate *)
-                                       [[UIApplication sharedApplication]
-                                           delegate])
-            .window.rootViewController;
-    DualFlutterViewController *viewController =
-        (DualFlutterViewController *)navController.visibleViewController;
-    GREYAssertNotNil(viewController,
-                     @"Expected non-nil DualFlutterViewController.");
-    [self expectSemanticsNotification:viewController.topFlutterViewController];
-    [self expectSemanticsNotification:viewController.bottomFlutterViewController];
-  }
-
-  // Verify that there are two Flutter views with the expected marquee text.
-  [[[EarlGrey
-      selectElementWithMatcher:grey_accessibilityLabel(@"This is Marquee")]
-      atIndex:0] assertWithMatcher:grey_notNil()];
-  [[[EarlGrey
-      selectElementWithMatcher:grey_accessibilityLabel(@"This is Marquee")]
-      atIndex:1] assertWithMatcher:grey_notNil()];
-
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Back")]
-      performAction:grey_tap()];
-
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")]
-      assertWithMatcher:grey_sufficientlyVisible()];
-}
-
-- (void)testHybridView {
-  [[EarlGrey selectElementWithMatcher:grey_keyWindow()]
-      assertWithMatcher:grey_sufficientlyVisible()];
-
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Hybrid View (Warm)")]
-      performAction:grey_tap()];
-
-  @autoreleasepool {
-    UINavigationController *navController =
-        (UINavigationController *)((AppDelegate *)
-                                       [[UIApplication sharedApplication]
-                                           delegate])
-            .window.rootViewController;
-    HybridViewController *viewController =
-        (HybridViewController *)navController.visibleViewController;
-    GREYAssertNotNil(viewController.flutterViewController,
-                     @"Expected non-nil FlutterViewController.");
-    [self expectSemanticsNotification:viewController.flutterViewController];
-  }
-
-  [self validateCountsFlutter:@"Platform" count:0];
-  [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps];
-
-  static const int platformTapCount = 4;
-  static const int flutterTapCount = 6;
-
-  for (int i = _flutterWarmEngineTaps; i < flutterTapCount;
-       i++, _flutterWarmEngineTaps++) {
-    [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
-                                            @"Increment via Flutter")]
-        performAction:grey_tap()];
-  }
-
-  [self validateCountsFlutter:@"Platform" count:0];
-  [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps];
-
-  for (int i = 0; i < platformTapCount; i++) {
-    [[EarlGrey
-        selectElementWithMatcher:grey_accessibilityLabel(@"Increment via iOS")]
-        performAction:grey_tap()];
-  }
-
-  [self validateCountsFlutter:@"Platform" count:platformTapCount];
-  [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps];
-
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Back")]
-      performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")]
-      assertWithMatcher:grey_sufficientlyVisible()];
-}
-
-/** Validates that the text labels showing the number of button taps match the
- * expected counts. */
-- (void)validateCountsFlutter:(NSString *)labelPrefix count:(int)flutterCount {
-  NSString *flutterCountStr =
-      [NSString stringWithFormat:@"%@ button tapped %d times.", labelPrefix,
-                                 flutterCount];
-
-  // TODO(https://github.com/flutter/flutter/issues/17988): Flutter doesn't
-  // expose accessibility IDs, so the best we can do is to search for an element
-  // with the text we expect.
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(flutterCountStr)]
-      assertWithMatcher:grey_sufficientlyVisible()];
-}
-
-- (void)validateCountsPlatform:(NSString *)labelPrefix
-                         count:(int)platformCount {
-  NSString *platformCountStr =
-      [NSString stringWithFormat:@"%@ button tapped %d times.", labelPrefix,
-                                 platformCount];
-
-  [[[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"counter_on_iOS")]
-      assertWithMatcher:grey_text(platformCountStr)]
-      assertWithMatcher:grey_sufficientlyVisible()];
-}
-
-@end

dev/integration_tests/ios_host_app/FlutterUITests/FlutterUITests.m

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@import XCTest;
+
+@interface FlutterUITests : XCTestCase
+@end
+
+@implementation FlutterUITests
+
+- (void)setUp {
+    self.continueAfterFailure = NO;
+}
+
+- (void)testFullScreenColdPop {
+    XCUIApplication *app = [[XCUIApplication alloc] init];
+    [app launch];
+
+    [app.buttons[@"Full Screen (Cold)"] tap];
+
+    XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]);
+    [app.otherElements[@"Increment via Flutter"] tap];
+    XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]);
+
+    // Back navigation.
+    [app.buttons[@"POP"] tap];
+    XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]);
+}
+
+- (void)testFullScreenWarm {
+    XCUIApplication *app = [[XCUIApplication alloc] init];
+    [app launch];
+
+    [app.buttons[@"Full Screen (Warm)"] tap];
+
+    XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]);
+    [app.otherElements[@"Increment via Flutter"] tap];
+    XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]);
+
+    // Back navigation.
+    [app.buttons[@"POP"] tap];
+    XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]);
+}
+
+- (void)testFlutterViewWarm {
+    XCUIApplication *app = [[XCUIApplication alloc] init];
+    [app launch];
+
+    [app.buttons[@"Flutter View (Warm)"] tap];
+
+    XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]);
+    [app.otherElements[@"Increment via Flutter"] tap];
+    XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]);
+
+    // Back navigation.
+    [app.buttons[@"POP"] tap];
+    XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]);
+}
+
+- (void)testHybridViewWarm {
+    XCUIApplication *app = [[XCUIApplication alloc] init];
+    [app launch];
+
+    [app.buttons[@"Hybrid View (Warm)"] tap];
+
+    XCTAssertTrue([app.staticTexts[@"Flutter button tapped 0 times."] waitForExistenceWithTimeout:1.0]);
+    XCTAssertTrue(app.otherElements[@"Platform button tapped 0 times."].exists);
+
+    [app.otherElements[@"Increment via Flutter"] tap];
+    XCTAssertTrue([app.staticTexts[@"Flutter button tapped 1 time."] waitForExistenceWithTimeout:1.0]);
+    XCTAssertTrue(app.otherElements[@"Platform button tapped 0 times."].exists);
+
+    [app.buttons[@"Increment via iOS"] tap];
+    XCTAssertTrue([app.staticTexts[@"Flutter button tapped 1 time."] waitForExistenceWithTimeout:1.0]);
+    XCTAssertTrue(app.otherElements[@"Platform button tapped 1 time."].exists);
+
+    // Back navigation.
+    [app.navigationBars[@"Hybrid Flutter/Native"].buttons[@"Flutter iOS Demos Home"] tap];
+    XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]);
+}
+
+- (void)testDualCold {
+    XCUIApplication *app = [[XCUIApplication alloc] init];
+    [app launch];
+
+    [app.buttons[@"Dual Flutter View (Cold)"] tap];
+
+    // There are two marquees.
+    XCTAssertTrue([app.otherElements[@"This is Marquee"] waitForExistenceWithTimeout:1.0]);
+    XCTAssertEqual([app.otherElements matchingType:XCUIElementTypeOther identifier:@"This is Marquee"].count, 2);
+
+    // Back navigation.
+    [app.navigationBars[@"Dual Flutter Views"].buttons[@"Flutter iOS Demos Home"] tap];
+    XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]);
+}
+
+@end

dev/integration_tests/ios_add2app/ios_add2appTests/Info.plist → dev/integration_tests/ios_host_app/FlutterUITests/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>

dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme → dev/integration_tests/ios_host_app/Host.xcodeproj/xcshareddata/xcschemes/Host.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-               BuildableName = "ios_add2app.app"
-               BlueprintName = "ios_add2app"
-               ReferencedContainer = "container:ios_add2app.xcodeproj">
+               BlueprintIdentifier = "74F97860215AB9E8005A0F04"
+               BuildableName = "Host.app"
+               BlueprintName = "Host"
+               ReferencedContainer = "container:Host.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F7C2664224AC1E3A0085742D"
+               BuildableName = "FlutterUITests.xctest"
+               BlueprintName = "FlutterUITests"
+               ReferencedContainer = "container:Host.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -44,10 +54,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-            BuildableName = "ios_add2app.app"
-            BlueprintName = "ios_add2app"
-            ReferencedContainer = "container:ios_add2app.xcodeproj">
+            BlueprintIdentifier = "74F97860215AB9E8005A0F04"
+            BuildableName = "Host.app"
+            BlueprintName = "Host"
+            ReferencedContainer = "container:Host.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -61,10 +71,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-            BuildableName = "ios_add2app.app"
-            BlueprintName = "ios_add2app"
-            ReferencedContainer = "container:ios_add2app.xcodeproj">
+            BlueprintIdentifier = "74F97860215AB9E8005A0F04"
+            BuildableName = "Host.app"
+            BlueprintName = "Host"
+            ReferencedContainer = "container:Host.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

dev/integration_tests/ios_host_app/Host/AppDelegate.h

@@ -6,4 +6,8 @@
 #import <Flutter/Flutter.h>
 
 @interface AppDelegate : FlutterAppDelegate
+
+@property(nonatomic, strong) FlutterEngine* engine;
+@property(nonatomic, strong) FlutterBasicMessageChannel* reloadMessageChannel;
+
 @end

dev/integration_tests/ios_host_app/Host/AppDelegate.m

@@ -3,6 +3,51 @@
 // found in the LICENSE file.
 
 #import "AppDelegate.h"
+#import "MainViewController.h"
+
+@interface AppDelegate ()
+
+@end
+
+static NSString *_kReloadChannelName = @"reload";
+
+@implementation AppDelegate {
+  MainViewController *_mainViewController;
+  UINavigationController *_navigationController;
+  FlutterEngine *_engine;
+  FlutterBasicMessageChannel *_reloadMessageChannel;
+}
+
+- (FlutterEngine *)engine {
+  return _engine;
+}
+
+- (FlutterBasicMessageChannel *)reloadMessabeChannel {
+  return _reloadMessageChannel;
+}
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+
+  _mainViewController = [[MainViewController alloc] init];
+  _navigationController = [[UINavigationController alloc]
+      initWithRootViewController:_mainViewController];
+
+  _navigationController.navigationBar.translucent = NO;
+
+  _engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [_engine runWithEntrypoint:nil];
+
+  _reloadMessageChannel = [[FlutterBasicMessageChannel alloc]
+         initWithName:_kReloadChannelName
+      binaryMessenger:_engine.binaryMessenger
+                codec:[FlutterStringCodec sharedInstance]];
+
+  self.window.rootViewController = _navigationController;
+  [self.window makeKeyAndVisible];
+
+  return YES;
+}
 
-@implementation AppDelegate
 @end

dev/integration_tests/ios_host_app/Host/Base.lproj/LaunchScreen.storyboard

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,8 +16,30 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2018 The Flutter Authors. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="626" width="375" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ios_add2app" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <constraints>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard

-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>

dev/integration_tests/ios_host_app/Host/Info.plist

@@ -22,8 +22,6 @@
 	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

dev/integration_tests/ios_add2app/ios_add2app/MainViewController.m → dev/integration_tests/ios_host_app/Host/MainViewController.m

@@ -23,7 +23,7 @@
   [super viewDidLoad];
 
   [self.view setFrame:self.view.window.bounds];
-  self.title = @"Flutter iOS Demos";
+  self.title = @"Flutter iOS Demos Home";
   self.view.backgroundColor = UIColor.whiteColor;
 
   _stackView = [[UIStackView alloc] initWithFrame:self.view.frame];

dev/integration_tests/ios_host_app/Host/ViewController.h

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-
-@interface ViewController : UIViewController
-@end

dev/integration_tests/ios_host_app/Host/ViewController.m

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "ViewController.h"
-#import <Flutter/Flutter.h>
-#import <FlutterPluginRegistrant/GeneratedPluginRegistrant.h>
-
-@implementation ViewController
-
-// Boiler-plate add-to-app demo. Not integration tested anywhere.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-    [button addTarget:self
-               action:@selector(handleButtonAction)
-     forControlEvents:UIControlEventTouchUpInside];
-    [button setTitle:@"Press me" forState:UIControlStateNormal];
-    [button setBackgroundColor:[UIColor blueColor]];
-    button.frame = CGRectMake(80.0, 210.0, 160.0, 40.0);
-    [self.view addSubview:button];
-}
-
-- (void)handleButtonAction {
-    FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
-    [GeneratedPluginRegistrant registerWithRegistry:flutterViewController];
-    [self presentViewController:flutterViewController animated:false completion:nil];
-}
-
-@end

dev/integration_tests/ios_host_app/Host/main.m

@@ -6,7 +6,7 @@
 #import "AppDelegate.h"
 
 int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
+  @autoreleasepool {
+      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+  }
 }

dev/integration_tests/ios_host_app/Podfile

@@ -5,4 +5,9 @@ load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
 
 target 'Host' do
   install_all_flutter_pods flutter_application_path
+
+  target 'FlutterUITests' do
+    inherit! :search_paths
+    install_all_flutter_pods flutter_application_path
+  end
 end

dev/integration_tests/ios_host_app/README.md

 # iOS host app
 
+Used by the `module_test_ios.dart` device lab test.
+
 iOS host app for a Flutter module created using
 ```
 $ flutter create -t module hello
 ```
 and placed in a sibling folder to (a clone of) the host app.
-Used by the `module_test_ios.dart` device lab test.
+`flutterapp/lib/marquee.dart` and `flutterapp/lib/main.dart`
+must be copied into the new module `lib` for platform unit tests
+to pass.
+
+This application demonstrates some basic functionality for Add2App,
+along with a native iOS ViewController as a baseline and to demonstrate
+interaction.
+
+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 interact with each other (HybridViewController.m).
+1. A demo of showing two FlutterViewControllers simultaneously
+   (DualViewController.m).
+
+A few key things are tested here (FlutterUITests.m):
+
+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. The ability to simultaneously run two instances of the engine.