iosapp UI tests

platform/ios/DEVELOPING.md

@@ -91,7 +91,7 @@ To instead run the tests in Xcode:
 
 1. Run `make iproj` to set up the workspace.
 1. Change the scheme to “test (platform project)” and press Command-R to run core unit tests.
-1. Change the scheme to “CI” and press Command-U to run SDK integration tests.
+1. Change the scheme to “iosapp” and press Command-U to run SDK unit and UI tests.
 
 ## Access tokens
 

platform/ios/app/MBXAppDelegate.m

@@ -22,6 +22,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         }
         [MGLAccountManager setAccessToken:accessToken];
     }
+
+    // Speed things up if we’re being run by a UI test bundle.
+    if ([[[NSProcessInfo processInfo] environment][@"MAPBOX_DISABLE_ANIMATIONS"] boolValue]) {
+        [UIView setAnimationsEnabled:NO];
+    }
 
     return YES;
 }

platform/ios/app/MBXViewController.m

@@ -10,11 +10,26 @@
 #import <OpenGLES/ES2/gl.h>
 #import <objc/runtime.h>
 
-static const CLLocationCoordinate2D WorldTourDestinations[] = {
-    { .latitude = 38.9131982, .longitude = -77.0325453144239 },
-    { .latitude = 37.7757368, .longitude = -122.4135302 },
-    { .latitude = 12.9810816, .longitude = 77.6368034 },
-    { .latitude = -13.15589555, .longitude = -74.2178961777998 },
+static const struct {
+    const char *name;
+    CLLocationCoordinate2D coordinate;
+} WorldTourDestinations[] = {
+    {
+        .name = "Washington, D.C.",
+        .coordinate = { .latitude = 38.9131982, .longitude = -77.0325453144239 },
+    },
+    {
+        .name = "San Francisco",
+        .coordinate = { .latitude = 37.7757368, .longitude = -122.4135302 },
+    },
+    {
+        .name = "Bangalore",
+        .coordinate = { .latitude = 12.9810816, .longitude = 77.6368034 },
+    },
+    {
+        .name = "Ayacucho",
+        .coordinate = { .latitude = -13.15589555, .longitude = -74.2178961777998 },
+    },
 };
 
 @interface MBXDroppedPinAnnotation : MGLPointAnnotation
@@ -121,6 +136,10 @@ - (void)saveState:(__unused NSNotification *)notification
 
 - (void)restoreState:(__unused NSNotification *)notification
 {
+    if ([[[NSProcessInfo processInfo] environment][@"MAPBOX_CLEAN_START"] boolValue]) {
+        return;
+    }
+
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSData *archivedCamera = [defaults objectForKey:@"MBXCamera"];
     MGLMapCamera *camera = archivedCamera ? [NSKeyedUnarchiver unarchiveObjectWithData:archivedCamera] : nil;
@@ -554,7 +573,8 @@ - (IBAction)startWorldTour:(__unused id)sender
     for (NSUInteger i = 0; i < numberOfAnnotations; i++)
     {
         MBXDroppedPinAnnotation *annotation = [[MBXDroppedPinAnnotation alloc] init];
-        annotation.coordinate = WorldTourDestinations[i];
+        annotation.title = @(WorldTourDestinations[i].name);
+        annotation.coordinate = WorldTourDestinations[i].coordinate;
         [annotations addObject:annotation];
     }
     [self.mapView addAnnotations:annotations];

platform/ios/app/Main.storyboard

@@ -41,6 +41,7 @@
                         <barButtonItem key="leftBarButtonItem" image="settings.png" id="Jw8-JP-CaZ" userLabel="Map Settings">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="accessibilityLabel" value="Map settings"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="MBXSettingsButton"/>
                             </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="showSettings:" destination="WaX-pd-UZQ" id="X2C-Ee-Qvt"/>
@@ -59,6 +60,8 @@
                             <barButtonItem image="TrackingLocationOffMask.png" id="CQ1-GP-M6x" userLabel="User Tracking Mode">
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="accessibilityLabel" value="User tracking mode"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="MBXUserTrackingModeButton"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accessibilityValue" value="Off"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="locateUser:" destination="WaX-pd-UZQ" id="XgF-DB-z3f"/>
@@ -67,6 +70,7 @@
                             <barButtonItem systemItem="organize" id="5IK-vz-jKQ" userLabel="Offline Packs">
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="accessibilityLabel" value="Offline packs"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="MBXOfflinePacksButton"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <segue destination="7q0-lI-zqb" kind="show" identifier="ShowOfflinePacks" id="xjx-0t-0LD"/>
@@ -174,6 +178,9 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="ONr-CS-J5X">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="MBXNavigationBar"/>
+                        </userDefinedRuntimeAttributes>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>

platform/ios/ios.xcodeproj/project.pbxproj

@@ -49,6 +49,10 @@
 		DA35A2CA1CCAAAD200E826B2 /* NSValue+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DA35A2C71CCAAAD200E826B2 /* NSValue+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA35A2CB1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */; };
 		DA35A2CC1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */; };
+		DA4A0DF01CCE82500045352A /* MGLAnnotationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4A0DEF1CCE82500045352A /* MGLAnnotationTests.m */; };
+		DA6A65971CCF429800F21F6B /* MGLGestureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6A65961CCF429800F21F6B /* MGLGestureTests.m */; };
+		DA6A65B71CCF583C00F21F6B /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; };
+		DA6A65B91CCF5DB900F21F6B /* MGLTelemetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6A65B81CCF5DB900F21F6B /* MGLTelemetryTests.m */; };
 		DA821D061CCC6D59007508D4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */; };
 		DA821D071CCC6D59007508D4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA821D051CCC6D59007508D4 /* Main.storyboard */; };
 		DA8847D91CBAF91600AB86E3 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; };
@@ -222,6 +226,8 @@
 		DABFB8731CBE9A9900D62B32 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DA88485E1CBAFC2E00AB86E3 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAC49C5C1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = DAC49C5F1CD02BC9009E1AA3 /* Localizable.stringsdict */; };
 		DAC49C5D1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = DAC49C5F1CD02BC9009E1AA3 /* Localizable.stringsdict */; };
+		DAC49C611CD03A96009E1AA3 /* MGLUITestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC49C601CD03A96009E1AA3 /* MGLUITestCase.m */; };
+		DAC49C641CD1678F009E1AA3 /* MGLUserLocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC49C631CD1678F009E1AA3 /* MGLUserLocationTests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -253,6 +259,13 @@
 			remoteGlobalIDString = DA8847D11CBAF91600AB86E3;
 			remoteInfo = dynamic;
 		};
+		DA4A0DF21CCE82500045352A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DA1DC9421CB6C1C2006E619F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = DA1DC9491CB6C1C2006E619F;
+			remoteInfo = iosapp;
+		};
 		DA8847D71CBAF91600AB86E3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = DA1DC9421CB6C1C2006E619F /* Project object */;
@@ -344,7 +357,13 @@
 		DA35A2C71CCAAAD200E826B2 /* NSValue+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSValue+MGLAdditions.h"; sourceTree = "<group>"; };
 		DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSValue+MGLAdditions.m"; sourceTree = "<group>"; };
 		DA35A2D11CCAB25200E826B2 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = jazzy.yml; sourceTree = "<group>"; };
+		DA4A0DED1CCE82500045352A /* uitest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = uitest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		DA4A0DEF1CCE82500045352A /* MGLAnnotationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLAnnotationTests.m; sourceTree = "<group>"; };
+		DA4A0DF11CCE82500045352A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DA4A26961CB6E795000B7809 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DA6A65961CCF429800F21F6B /* MGLGestureTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLGestureTests.m; sourceTree = "<group>"; };
+		DA6A65981CCF42FE00F21F6B /* MGLUITestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLUITestCase.h; sourceTree = "<group>"; };
+		DA6A65B81CCF5DB900F21F6B /* MGLTelemetryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTelemetryTests.m; sourceTree = "<group>"; };
 		DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		DA821D051CCC6D59007508D4 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		DA8847D21CBAF91600AB86E3 /* Mapbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -461,7 +480,9 @@
 		DABCABBF1CB80717000A7C39 /* locations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locations.cpp; sourceTree = "<group>"; };
 		DABCABC01CB80717000A7C39 /* locations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locations.hpp; sourceTree = "<group>"; };
 		DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = ../../build/ios/mbgl.xcconfig; sourceTree = "<group>"; };
+		DAC49C601CD03A96009E1AA3 /* MGLUITestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLUITestCase.m; sourceTree = "<group>"; };
 		DAC49C621CD07D74009E1AA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		DAC49C631CD1678F009E1AA3 /* MGLUserLocationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLUserLocationTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -481,6 +502,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		DA4A0DEA1CCE82500045352A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DA6A65B71CCF583C00F21F6B /* Mapbox.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DA8847CE1CBAF91600AB86E3 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -518,6 +547,7 @@
 				DABCABA91CB80692000A7C39 /* Benchmarking App */,
 				DA8847D31CBAF91600AB86E3 /* SDK */,
 				DA2E88521CC036F400F24E7B /* SDK Tests */,
+				DA4A0DEE1CCE82500045352A /* UI Tests */,
 				DA1DC9921CB6DF24006E619F /* Frameworks */,
 				DAC07C951CBB2CAD000CB309 /* Configuration */,
 				DA1DC94B1CB6C1C2006E619F /* Products */,
@@ -534,6 +564,7 @@
 				DA2E88511CC036F400F24E7B /* test.xctest */,
 				DA8933D51CCD306400E68420 /* Mapbox.bundle */,
 				DA25D5B91CCD9EDE00607828 /* Settings.bundle */,
+				DA4A0DED1CCE82500045352A /* uitest.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -612,6 +643,21 @@
 			path = test;
 			sourceTree = "<group>";
 		};
+		DA4A0DEE1CCE82500045352A /* UI Tests */ = {
+			isa = PBXGroup;
+			children = (
+				DA6A65981CCF42FE00F21F6B /* MGLUITestCase.h */,
+				DAC49C601CD03A96009E1AA3 /* MGLUITestCase.m */,
+				DA4A0DEF1CCE82500045352A /* MGLAnnotationTests.m */,
+				DA6A65961CCF429800F21F6B /* MGLGestureTests.m */,
+				DA6A65B81CCF5DB900F21F6B /* MGLTelemetryTests.m */,
+				DAC49C631CD1678F009E1AA3 /* MGLUserLocationTests.m */,
+				DA4A0DF11CCE82500045352A /* Info.plist */,
+			);
+			name = "UI Tests";
+			path = uitest;
+			sourceTree = "<group>";
+		};
 		DA8847D31CBAF91600AB86E3 /* SDK */ = {
 			isa = PBXGroup;
 			children = (
@@ -983,6 +1029,24 @@
 			productReference = DA2E88511CC036F400F24E7B /* test.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		DA4A0DEC1CCE82500045352A /* uitest */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DA4A0DF61CCE82500045352A /* Build configuration list for PBXNativeTarget "uitest" */;
+			buildPhases = (
+				DA4A0DE91CCE82500045352A /* Sources */,
+				DA4A0DEA1CCE82500045352A /* Frameworks */,
+				DA4A0DEB1CCE82500045352A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				DA4A0DF31CCE82500045352A /* PBXTargetDependency */,
+			);
+			name = uitest;
+			productName = uitest;
+			productReference = DA4A0DED1CCE82500045352A /* uitest.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
 		DA8847D11CBAF91600AB86E3 /* dynamic */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA8847DD1CBAF91600AB86E3 /* Build configuration list for PBXNativeTarget "dynamic" */;
@@ -1075,6 +1139,10 @@
 					DA2E88501CC036F400F24E7B = {
 						CreatedOnToolsVersion = 7.3;
 					};
+					DA4A0DEC1CCE82500045352A = {
+						CreatedOnToolsVersion = 7.3;
+						TestTargetID = DA1DC9491CB6C1C2006E619F;
+					};
 					DA8847D11CBAF91600AB86E3 = {
 						CreatedOnToolsVersion = 7.3;
 					};
@@ -1109,6 +1177,7 @@
 				DA8933D41CCD306400E68420 /* bundle */,
 				DA25D5B81CCD9EDE00607828 /* settings */,
 				DA2E88501CC036F400F24E7B /* test */,
+				DA4A0DEC1CCE82500045352A /* uitest */,
 			);
 		};
 /* End PBXProject section */
@@ -1145,6 +1214,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		DA4A0DEB1CCE82500045352A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DA8847D01CBAF91600AB86E3 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1235,6 +1311,18 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		DA4A0DE91CCE82500045352A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DAC49C641CD1678F009E1AA3 /* MGLUserLocationTests.m in Sources */,
+				DAC49C611CD03A96009E1AA3 /* MGLUITestCase.m in Sources */,
+				DA6A65971CCF429800F21F6B /* MGLGestureTests.m in Sources */,
+				DA6A65B91CCF5DB900F21F6B /* MGLTelemetryTests.m in Sources */,
+				DA4A0DF01CCE82500045352A /* MGLAnnotationTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DA8847CD1CBAF91600AB86E3 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1343,6 +1431,11 @@
 			target = DA8847D11CBAF91600AB86E3 /* dynamic */;
 			targetProxy = DA2E88571CC036F400F24E7B /* PBXContainerItemProxy */;
 		};
+		DA4A0DF31CCE82500045352A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = DA1DC9491CB6C1C2006E619F /* iosapp */;
+			targetProxy = DA4A0DF21CCE82500045352A /* PBXContainerItemProxy */;
+		};
 		DA8847D81CBAF91600AB86E3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = DA8847D11CBAF91600AB86E3 /* dynamic */;
@@ -1567,6 +1660,32 @@
 			};
 			name = Release;
 		};
+		DA4A0DF41CCE82500045352A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				INFOPLIST_FILE = uitest/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.uitest;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_TARGET_NAME = iosapp;
+			};
+			name = Debug;
+		};
+		DA4A0DF51CCE82500045352A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				INFOPLIST_FILE = uitest/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.uitest;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_TARGET_NAME = iosapp;
+			};
+			name = Release;
+		};
 		DA8847DB1CBAF91600AB86E3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */;
@@ -1792,6 +1911,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		DA4A0DF61CCE82500045352A /* Build configuration list for PBXNativeTarget "uitest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DA4A0DF41CCE82500045352A /* Debug */,
+				DA4A0DF51CCE82500045352A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		DA8847DD1CBAF91600AB86E3 /* Build configuration list for PBXNativeTarget "dynamic" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme

@@ -66,6 +66,16 @@
                ReferencedContainer = "container:ios.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DA4A0DEC1CCE82500045352A"
+               BuildableName = "uitest.xctest"
+               BlueprintName = "uitest"
+               ReferencedContainer = "container:ios.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme

@@ -40,7 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">