Add updating the server port from the environment variables

AppStub/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CHANGELOG.md

@@ -1,6 +1,20 @@
+### 2.2.1
+
+The 2.2.0 release was cancelled.
+
+We discovered a problem with running tests against a DeviceAgent built with
+Xcode 11.4.  Xamarin.UITest, run-loop, and Test Cloud will use a DeviceAgent
+built with Xcode 11.3.1 until we sort out the problem.  Tracking here (private
+link):
+
+DeviceAgent built with Xcode 11.4 crashes after launching the AUT [ADO](https://msmobilecenter.visualstudio.com/Mobile-Center/_workitems/edit/79012)
+
+* Add support for Xcode 11.4 beta 3 #377 Thanks @sergey-plevako-badoo
+* Add alerts new in Xcode 11.4 #382 Thanks @humbled
+
 ### 2.1.0
 
-Fixes various problems in dismiss-SpringBoard-alert system.
+* Fixes various problems in dismiss-SpringBoard-alert system.
 
 ### 2.0.2
 

DeviceAgent.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -47,9 +47,17 @@
 /* Begin PBXBuildFile section */
 		0AA3924F23279A68000E799B /* SpringBoardAlertsCurrentLanguageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AA3924D23279A68000E799B /* SpringBoardAlertsCurrentLanguageTests.m */; };
 		1A020FC02338BEB600D79E57 /* XCTest+CBXAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = F547174D204939DA0024AA0B /* XCTest+CBXAdditions.h */; };
+		3B5444E52498241500532AE0 /* QuerySpecifierByDescendantType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B81F693240E937F00825603 /* QuerySpecifierByDescendantType.h */; };
+		3B5444EA249838AC00532AE0 /* QuerySpecifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B5444E02498216000532AE0 /* QuerySpecifierTests.m */; };
+		3B81F695240E952F00825603 /* QuerySpecifierByDescendantType.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B81F694240E952F00825603 /* QuerySpecifierByDescendantType.m */; };
+		3B81F696240E952F00825603 /* QuerySpecifierByDescendantType.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B81F694240E952F00825603 /* QuerySpecifierByDescendantType.m */; };
+		3BE3ED1E2498CF0700830B19 /* XCTest+CBXAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = F547174F20496A200024AA0B /* XCTest+CBXAdditions.m */; };
 		4107F8FE231D7298003961AF /* Resources.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4107F8FC231D7262003961AF /* Resources.xcassets */; };
 		41188FEA22E9958D0012886A /* XCWebViews.m in Sources */ = {isa = PBXBuildFile; fileRef = 4166C9AE22E7009800C8BEBF /* XCWebViews.m */; };
 		419BE54B231E46D800DF0ABD /* Resources.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4107F8FC231D7262003961AF /* Resources.xcassets */; };
+		7DEAAE74241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */; };
+		7DEAAE75241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */; };
+		7DEAAE77241FA8B5009894BA /* XCTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DEAAE76241FA8B4009894BA /* XCTestCase.h */; };
 		89331CCE1CC00E82003C2E59 /* RotatePinchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89331CCD1CC00E82003C2E59 /* RotatePinchViewController.m */; };
 		89331D301CC50447003C2E59 /* ThreadUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 89331D2E1CC50447003C2E59 /* ThreadUtils.h */; };
 		89331D321CC50447003C2E59 /* ThreadUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 89331D2F1CC50447003C2E59 /* ThreadUtils.m */; };
@@ -750,11 +758,18 @@
 
 /* Begin PBXFileReference section */
 		0AA3924D23279A68000E799B /* SpringBoardAlertsCurrentLanguageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SpringBoardAlertsCurrentLanguageTests.m; sourceTree = "<group>"; };
+		3B5444E02498216000532AE0 /* QuerySpecifierTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QuerySpecifierTests.m; sourceTree = "<group>"; };
+		3B81F693240E937F00825603 /* QuerySpecifierByDescendantType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QuerySpecifierByDescendantType.h; sourceTree = "<group>"; };
+		3B81F694240E952F00825603 /* QuerySpecifierByDescendantType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QuerySpecifierByDescendantType.m; sourceTree = "<group>"; };
 		4107F8FC231D7262003961AF /* Resources.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Resources.xcassets; sourceTree = "<group>"; };
 		4166C9AE22E7009800C8BEBF /* XCWebViews.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XCWebViews.m; sourceTree = "<group>"; };
 		634244EC948D56732C2565E5 /* SpringBoardAlerts.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = SpringBoardAlerts.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		6342494C7C23506565D2B802 /* SpringBoardAlerts.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SpringBoardAlerts.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		63424E46759C6B27C2BEC337 /* SpringBoardAlertsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SpringBoardAlertsTest.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+		7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBXCTestCaseImplementationFailureHoldingProxy.m; sourceTree = "<group>"; };
+		7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBXCTestCaseImplementationFailureHoldingProxy.h; sourceTree = "<group>"; };
+		7DEAAE76241FA8B4009894BA /* XCTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XCTestCase.h; path = ../../../../WebDriverAgent/PrivateHeaders/XCTest/XCTestCase.h; sourceTree = "<group>"; };
+		7DEAAE78241FEEF7009894BA /* _XCTestCaseImplementation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _XCTestCaseImplementation.h; sourceTree = "<group>"; };
 		89331CCC1CC00E82003C2E59 /* RotatePinchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotatePinchViewController.h; sourceTree = "<group>"; };
 		89331CCD1CC00E82003C2E59 /* RotatePinchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RotatePinchViewController.m; sourceTree = "<group>"; };
 		89331D2E1CC50447003C2E59 /* ThreadUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadUtils.h; sourceTree = "<group>"; };
@@ -1636,6 +1651,7 @@
 			isa = PBXGroup;
 			children = (
 				F54C01C32043F0EF00FD8DDE /* _XCInternalTestRun.h */,
+				7DEAAE78241FEEF7009894BA /* _XCTestCaseImplementation.h */,
 				F54C01802043F0EF00FD8DDE /* _XCKVOExpectationImplementation.h */,
 				F54C019D2043F0EF00FD8DDE /* _XCTAttachmentImplementation.h */,
 				F5449D1C21216FD400E11642 /* _XCTCompoundExpectationImplementation.h */,
@@ -1711,6 +1727,7 @@
 				F54C01C52043F0EF00FD8DDE /* XCTestProbe.h */,
 				F54C01BE2043F0EF00FD8DDE /* XCTestRun.h */,
 				F54C01972043F0EF00FD8DDE /* XCTestSuite.h */,
+				7DEAAE76241FA8B4009894BA /* XCTestCase.h */,
 				F54C01942043F0EF00FD8DDE /* XCTestSuiteRun.h */,
 				F54C01D42043F0EF00FD8DDE /* XCTestWaiter.h */,
 				F54C014D2043F0EF00FD8DDE /* XCTFailure.h */,
@@ -1969,6 +1986,8 @@
 		F55F83541C6DD99900A945C8 /* DeviceAgent */ = {
 			isa = PBXGroup;
 			children = (
+				7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */,
+				7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */,
 				F58935F91E93F16D00BDF39D /* DeviceAgent-device.xctestrun */,
 				F58935FA1E93F16D00BDF39D /* DeviceAgent-simulator-template.xctestrun */,
 				F58935F71E93F09A00BDF39D /* CBX.xctestconfiguration */,
@@ -2142,6 +2161,8 @@
 				89D5380F1CA34CBE00F62E09 /* QuerySpecifierByTextLike.m */,
 				899696FD1CB5C93400BB42E2 /* QuerySpecifierByCoordinate.h */,
 				899696FE1CB5C93400BB42E2 /* QuerySpecifierByCoordinate.m */,
+				3B81F693240E937F00825603 /* QuerySpecifierByDescendantType.h */,
+				3B81F694240E952F00825603 /* QuerySpecifierByDescendantType.m */,
 				89B9519F1CF5B297007FD0AB /* QuerySpecifierByType.h */,
 				89B951A01CF5B297007FD0AB /* QuerySpecifierByType.m */,
 				F536799F1D7C324E009956D0 /* QuerySpecifierByMark.h */,
@@ -2256,6 +2277,7 @@
 		F58D27E81D4F947F000FF6C0 /* Queries */ = {
 			isa = PBXGroup;
 			children = (
+				3B5444E02498216000532AE0 /* QuerySpecifierTests.m */,
 				F58D27EA1D4F947F000FF6C0 /* CoordinateQueryTests.m */,
 				F58D27EB1D4F947F000FF6C0 /* Factory */,
 				F58D27ED1D4F947F000FF6C0 /* QuerySelectors */,
@@ -2490,6 +2512,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3B5444E52498241500532AE0 /* QuerySpecifierByDescendantType.h in Headers */,
 				F54C02B02043F0EF00FD8DDE /* XCTElementFilteringTransformer.h in Headers */,
 				F54C027E2043F0EF00FD8DDE /* XCTKVOExpectation.h in Headers */,
 				F54C02502043F0EF00FD8DDE /* XCUIApplicationProcess.h in Headers */,
@@ -2513,6 +2536,7 @@
 				F54C029F2043F0EF00FD8DDE /* NSError-XCTAutomationSupportErrors.h in Headers */,
 				F54C02092043F0EF00FD8DDE /* XCUITestContextScope.h in Headers */,
 				F54C026F2043F0EF00FD8DDE /* XCTRunnerAutomationSession.h in Headers */,
+				7DEAAE75241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h in Headers */,
 				F54C026E2043F0EF00FD8DDE /* XCUIApplicationMonitor.h in Headers */,
 				F54C021D2043F0EF00FD8DDE /* XCUIElement.h in Headers */,
 				F55F819D1C6DD07500A945C8 /* HTTPDataResponse.h in Headers */,
@@ -2558,6 +2582,7 @@
 				F54C02BC2043F0EF00FD8DDE /* XCTContainingTransformerIterator.h in Headers */,
 				F54C02A42043F0EF00FD8DDE /* XCTAccessibilityFramework-Protocol.h in Headers */,
 				F54C020B2043F0EF00FD8DDE /* XCUIAXNotificationHandling-Protocol.h in Headers */,
+				7DEAAE77241FA8B5009894BA /* XCTestCase.h in Headers */,
 				F55F81801C6DD07500A945C8 /* GCDAsyncSocket.h in Headers */,
 				F54C02332043F0EF00FD8DDE /* XCUICoordinate.h in Headers */,
 				F54C02322043F0EF00FD8DDE /* _XCTNSPredicateExpectationImplementation.h in Headers */,
@@ -2956,7 +2981,7 @@
 		898743B41C5847B30084FD93 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = Calabash;
 				TargetAttributes = {
 					898743BB1C5847B30084FD93 = {
@@ -3043,7 +3068,7 @@
 				};
 			};
 			buildConfigurationList = 898743B71C5847B30084FD93 /* Build configuration list for PBXProject "DeviceAgent" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -3331,6 +3356,7 @@
 				899696C51CB3360900BB42E2 /* Pinch.m in Sources */,
 				F55F82531C6DD07500A945C8 /* RouteRequest.m in Sources */,
 				F55F84101C6E437A00A945C8 /* JSONUtils.m in Sources */,
+				7DEAAE74241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */,
 				F5E663211D74958200068CE9 /* SpringBoard.m in Sources */,
 				F5870B431CF0BEFF00B3376C /* TouchPath.m in Sources */,
 				89512BDC1C9EEC3C0027D61E /* Drag.m in Sources */,
@@ -3342,6 +3368,7 @@
 				F55F81A41C6DD07500A945C8 /* HTTPFileResponse.m in Sources */,
 				896586831CEB9B9800E8329C /* QueryFactory.m in Sources */,
 				F55F81941C6DD07500A945C8 /* HTTPServer.m in Sources */,
+				3B81F695240E952F00825603 /* QuerySpecifierByDescendantType.m in Sources */,
 				89D538161CA351F400F62E09 /* QuerySpecifierByIndex.m in Sources */,
 				89B951A21CF5B297007FD0AB /* QuerySpecifierByType.m in Sources */,
 				F5870B401CF0BEFF00B3376C /* CBXTouchEvent.m in Sources */,
@@ -3420,6 +3447,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F5061A8A2153B19900B85792 /* QueryConfigurationFactory.m in Sources */,
+				3BE3ED1E2498CF0700830B19 /* XCTest+CBXAdditions.m in Sources */,
 				F5061A742153B19900B85792 /* Testmanagerd.m in Sources */,
 				F5061A512153B0FF00B85792 /* SpringBoardAlertsTest.m in Sources */,
 				F5061A9C2153B4EF00B85792 /* HTTPAuthenticationRequest.m in Sources */,
@@ -3447,6 +3475,7 @@
 				F5061AAC2153B4EF00B85792 /* RouteRequest.m in Sources */,
 				F5061A682153B15E00B85792 /* ElementNotFoundException.m in Sources */,
 				F5061A4C2153B0FF00B85792 /* CBXDecimalRounderTest.m in Sources */,
+				3B81F696240E952F00825603 /* QuerySpecifierByDescendantType.m in Sources */,
 				F5061A642153B15E00B85792 /* SpringBoard.m in Sources */,
 				F5061A4E2153B0FF00B85792 /* CBXDeviceTest.m in Sources */,
 				F5061A522153B0FF00B85792 /* CBXOrientationTest.m in Sources */,
@@ -3489,6 +3518,7 @@
 				F5061A812153B19900B85792 /* QuerySpecifierByPropertyLike.m in Sources */,
 				F5061A592153B14400B85792 /* ThreadUtils.m in Sources */,
 				F5061A422153B0FF00B85792 /* QueryConfigurationFactoryTests.m in Sources */,
+				3B5444EA249838AC00532AE0 /* QuerySpecifierTests.m in Sources */,
 				F5061A502153B0FF00B85792 /* SpringBoardAlertTest.m in Sources */,
 				F5061A582153B14400B85792 /* GeometryUtils.m in Sources */,
 				F5061A782153B19900B85792 /* (null) in Sources */,

DeviceAgent.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -4,5 +4,7 @@
 <dict>
 	<key>BuildSystemType</key>
 	<string>Latest</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>

DeviceAgent.xcworkspace/xcshareddata/xcschemes/AppStub.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/AppStubBuildNumber.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/DeviceAgent.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/DeviceAgentUnitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/Dismiss.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/GemuseBouche.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/Permissions.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/StandAloneUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F5954E041CBD2E1200117745"
+            BuildableName = "TestApp.app"
+            BlueprintName = "TestApp"
+            ReferencedContainer = "container:DeviceAgent.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F5954E041CBD2E1200117745"
-            BuildableName = "TestApp.app"
-            BlueprintName = "TestApp"
-            ReferencedContainer = "container:DeviceAgent.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -98,8 +96,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/TestAppBuildNumber.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent.xcworkspace/xcshareddata/xcschemes/UITest.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DeviceAgent/DeviceAgent-simulator-template.xctestrun

@@ -12,13 +12,20 @@
 		<string>TEST_HOST_PATH</string>
 		<key>TestingEnvironmentVariables</key>
 		<dict>
+			<key>CbxServerPort</key>
+			<string>CBX_SERVER_PORT</string>
 			<key>DYLD_FRAMEWORK_PATH</key>
 			<string></string>
 			<key>DYLD_LIBRARY_PATH</key>
 			<string></string>
 			<key>XCODE_DBG_XPC_EXCLUSIONS</key>
 			<string>com.apple.dt.xctestSymbolicator</string>
 		</dict>
+		<key>EnvironmentVariables</key>
+		<dict>
+			<key>CbxServerPort</key>
+			<string>CBX_SERVER_PORT</string>
+		</dict>
 		<key>UITargetAppPath</key>
 		<string>/path/to/AUT.app</string>
 		<key>UseUITargetAppProvidedByTests</key>

DeviceAgent/FBFailureProofTestCase.h

@@ -19,7 +19,7 @@
 // Licensed under the MIT license.
 
 #import <Foundation/Foundation.h>
-#import <XCTest/XCTestCase.h>
+#import "XCTest/XCTestCase.h"
 
 @class _XCTestCaseImplementation;
 
@@ -29,7 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (_XCTestCaseImplementation *)internalImplementation;
 - (void)setInternalImplementation:(_XCTestCaseImplementation *)implementation;
-
+@property(nonatomic) BOOL shouldHaltWhenReceivesControl;
+@property(nonatomic) BOOL shouldSetShouldHaltWhenReceivesControl;
 @end
 
 /**
@@ -38,17 +39,4 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FBFailureProofTestCase : XCTestCase
 @end
 
-/**
- Class that can be used to proxy existing _XCTestCaseImplementation and
- prevent currently running test from being terminated on any XCTest failure
- */
-@interface FBXCTestCaseImplementationFailureHoldingProxy : NSProxy
-
-/**
- Constructor for given existing _XCTestCaseImplementation instance
- */
-+ (instancetype)proxyWithXCTestCaseImplementation:(_XCTestCaseImplementation *)internalImplementation;
-
-@end
-
 NS_ASSUME_NONNULL_END