Skip to content

Commit fa22648

Browse files
jmoodyjmoody
authored
Merge pull request #377 from sergey-plevako-badoo/xcode_11_4_beta_3_support_1
Add support for Xcode 11.4 beta 3
2 parents 8d0bd68 + e3c0c12 commit fa22648

File tree

99 files changed

+753
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+753
-835
lines changed

‎DeviceAgent.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
4107F8FE231D7298003961AF /* Resources.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4107F8FC231D7262003961AF /* Resources.xcassets */; };
5151
41188FEA22E9958D0012886A /* XCWebViews.m in Sources */ = {isa = PBXBuildFile; fileRef = 4166C9AE22E7009800C8BEBF /* XCWebViews.m */; };
5252
419BE54B231E46D800DF0ABD /* Resources.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4107F8FC231D7262003961AF /* Resources.xcassets */; };
53+
7DEAAE74241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */; };
54+
7DEAAE75241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */; };
55+
7DEAAE77241FA8B5009894BA /* XCTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DEAAE76241FA8B4009894BA /* XCTestCase.h */; };
56+
7DEAAE79241FEEF8009894BA /* _XCTestCaseImplementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DEAAE78241FEEF7009894BA /* _XCTestCaseImplementation.h */; };
5357
89331CCE1CC00E82003C2E59 /* RotatePinchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89331CCD1CC00E82003C2E59 /* RotatePinchViewController.m */; };
5458
89331D301CC50447003C2E59 /* ThreadUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 89331D2E1CC50447003C2E59 /* ThreadUtils.h */; };
5559
89331D321CC50447003C2E59 /* ThreadUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 89331D2F1CC50447003C2E59 /* ThreadUtils.m */; };
@@ -755,6 +759,10 @@
755759
634244EC948D56732C2565E5 /* SpringBoardAlerts.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = SpringBoardAlerts.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
756760
6342494C7C23506565D2B802 /* SpringBoardAlerts.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SpringBoardAlerts.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
757761
63424E46759C6B27C2BEC337 /* SpringBoardAlertsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SpringBoardAlertsTest.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
762+
7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBXCTestCaseImplementationFailureHoldingProxy.m; sourceTree = "<group>"; };
763+
7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBXCTestCaseImplementationFailureHoldingProxy.h; sourceTree = "<group>"; };
764+
7DEAAE76241FA8B4009894BA /* XCTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XCTestCase.h; path = ../../../../WebDriverAgent/PrivateHeaders/XCTest/XCTestCase.h; sourceTree = "<group>"; };
765+
7DEAAE78241FEEF7009894BA /* _XCTestCaseImplementation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _XCTestCaseImplementation.h; sourceTree = "<group>"; };
758766
89331CCC1CC00E82003C2E59 /* RotatePinchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotatePinchViewController.h; sourceTree = "<group>"; };
759767
89331CCD1CC00E82003C2E59 /* RotatePinchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RotatePinchViewController.m; sourceTree = "<group>"; };
760768
89331D2E1CC50447003C2E59 /* ThreadUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadUtils.h; sourceTree = "<group>"; };
@@ -1636,6 +1644,7 @@
16361644
isa = PBXGroup;
16371645
children = (
16381646
F54C01C32043F0EF00FD8DDE /* _XCInternalTestRun.h */,
1647+
7DEAAE78241FEEF7009894BA /* _XCTestCaseImplementation.h */,
16391648
F54C01802043F0EF00FD8DDE /* _XCKVOExpectationImplementation.h */,
16401649
F54C019D2043F0EF00FD8DDE /* _XCTAttachmentImplementation.h */,
16411650
F5449D1C21216FD400E11642 /* _XCTCompoundExpectationImplementation.h */,
@@ -1711,6 +1720,7 @@
17111720
F54C01C52043F0EF00FD8DDE /* XCTestProbe.h */,
17121721
F54C01BE2043F0EF00FD8DDE /* XCTestRun.h */,
17131722
F54C01972043F0EF00FD8DDE /* XCTestSuite.h */,
1723+
7DEAAE76241FA8B4009894BA /* XCTestCase.h */,
17141724
F54C01942043F0EF00FD8DDE /* XCTestSuiteRun.h */,
17151725
F54C01D42043F0EF00FD8DDE /* XCTestWaiter.h */,
17161726
F54C014D2043F0EF00FD8DDE /* XCTFailure.h */,
@@ -1969,6 +1979,8 @@
19691979
F55F83541C6DD99900A945C8 /* DeviceAgent */ = {
19701980
isa = PBXGroup;
19711981
children = (
1982+
7DEAAE73241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h */,
1983+
7DEAAE72241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m */,
19721984
F58935F91E93F16D00BDF39D /* DeviceAgent-device.xctestrun */,
19731985
F58935FA1E93F16D00BDF39D /* DeviceAgent-simulator-template.xctestrun */,
19741986
F58935F71E93F09A00BDF39D /* CBX.xctestconfiguration */,
@@ -2513,6 +2525,7 @@
25132525
F54C029F2043F0EF00FD8DDE /* NSError-XCTAutomationSupportErrors.h in Headers */,
25142526
F54C02092043F0EF00FD8DDE /* XCUITestContextScope.h in Headers */,
25152527
F54C026F2043F0EF00FD8DDE /* XCTRunnerAutomationSession.h in Headers */,
2528+
7DEAAE75241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.h in Headers */,
25162529
F54C026E2043F0EF00FD8DDE /* XCUIApplicationMonitor.h in Headers */,
25172530
F54C021D2043F0EF00FD8DDE /* XCUIElement.h in Headers */,
25182531
F55F819D1C6DD07500A945C8 /* HTTPDataResponse.h in Headers */,
@@ -2558,6 +2571,7 @@
25582571
F54C02BC2043F0EF00FD8DDE /* XCTContainingTransformerIterator.h in Headers */,
25592572
F54C02A42043F0EF00FD8DDE /* XCTAccessibilityFramework-Protocol.h in Headers */,
25602573
F54C020B2043F0EF00FD8DDE /* XCUIAXNotificationHandling-Protocol.h in Headers */,
2574+
7DEAAE77241FA8B5009894BA /* XCTestCase.h in Headers */,
25612575
F55F81801C6DD07500A945C8 /* GCDAsyncSocket.h in Headers */,
25622576
F54C02332043F0EF00FD8DDE /* XCUICoordinate.h in Headers */,
25632577
F54C02322043F0EF00FD8DDE /* _XCTNSPredicateExpectationImplementation.h in Headers */,
@@ -2717,6 +2731,7 @@
27172731
F54C02462043F0EF00FD8DDE /* XCTASDebugLogDelegate-Protocol.h in Headers */,
27182732
F54C029C2043F0EF00FD8DDE /* XCTElementSortingTransformer.h in Headers */,
27192733
F54C025E2043F0EF00FD8DDE /* XCTAutomationTarget-Protocol.h in Headers */,
2734+
7DEAAE79241FEEF8009894BA /* _XCTestCaseImplementation.h in Headers */,
27202735
89C5F3501C9A60E70093A018 /* Testmanagerd.h in Headers */,
27212736
F54C02992043F0EF00FD8DDE /* NSArray-XCTElementQueryAdditions.h in Headers */,
27222737
F55F819B1C6DD07500A945C8 /* HTTPAsyncFileResponse.h in Headers */,
@@ -3331,6 +3346,7 @@
33313346
899696C51CB3360900BB42E2 /* Pinch.m in Sources */,
33323347
F55F82531C6DD07500A945C8 /* RouteRequest.m in Sources */,
33333348
F55F84101C6E437A00A945C8 /* JSONUtils.m in Sources */,
3349+
7DEAAE74241FA80D009894BA /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */,
33343350
F5E663211D74958200068CE9 /* SpringBoard.m in Sources */,
33353351
F5870B431CF0BEFF00B3376C /* TouchPath.m in Sources */,
33363352
89512BDC1C9EEC3C0027D61E /* Drag.m in Sources */,

‎DeviceAgent/FBFailureProofTestCase.h‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// Licensed under the MIT license.
2020

2121
#import <Foundation/Foundation.h>
22-
#import <XCTest/XCTestCase.h>
22+
#import "XCTest/XCTestCase.h"
2323

2424
@class _XCTestCaseImplementation;
2525

@@ -29,7 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
2929

3030
- (_XCTestCaseImplementation *)internalImplementation;
3131
- (void)setInternalImplementation:(_XCTestCaseImplementation *)implementation;
32-
32+
@property(nonatomic) BOOL shouldHaltWhenReceivesControl;
33+
@property(nonatomic) BOOL shouldSetShouldHaltWhenReceivesControl;
3334
@end
3435

3536
/**
@@ -38,17 +39,4 @@ NS_ASSUME_NONNULL_BEGIN
3839
@interface FBFailureProofTestCase : XCTestCase
3940
@end
4041

41-
/**
42-
Class that can be used to proxy existing _XCTestCaseImplementation and
43-
prevent currently running test from being terminated on any XCTest failure
44-
*/
45-
@interface FBXCTestCaseImplementationFailureHoldingProxy : NSProxy
46-
47-
/**
48-
Constructor for given existing _XCTestCaseImplementation instance
49-
*/
50-
+ (instancetype)proxyWithXCTestCaseImplementation:(_XCTestCaseImplementation *)internalImplementation;
51-
52-
@end
53-
5442
NS_ASSUME_NONNULL_END

‎DeviceAgent/FBFailureProofTestCase.m‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
* source tree under Licenses/.
1616
*/
1717

18+
// Copyright (c) Microsoft Corporation. All rights reserved.
19+
// Licensed under the MIT license.
20+
1821
#import "FBFailureProofTestCase.h"
19-
#import "_XCTestCaseImplementation.h"
22+
#import "FBXCTestCaseImplementationFailureHoldingProxy.h"
2023

2124
@interface FBFailureProofTestCase ()
2225
@property (nonatomic, assign) BOOL didRegisterAXTestFailure;
@@ -27,10 +30,17 @@ @implementation FBFailureProofTestCase
2730
- (void)setUp {
2831
[super setUp];
2932
self.continueAfterFailure = YES;
30-
self.internalImplementation = (_XCTestCaseImplementation *)[FBXCTestCaseImplementationFailureHoldingProxy
31-
proxyWithXCTestCaseImplementation:self.internalImplementation];
33+
if ([self respondsToSelector:@selector(internalImplementation)]) {
34+
// The `internalImplementation` API has been removed since Xcode 11.4
35+
self.internalImplementation =
36+
(_XCTestCaseImplementation *)[FBXCTestCaseImplementationFailureHoldingProxy
37+
proxyWithXCTestCaseImplementation:self.internalImplementation];
38+
} else {
39+
self.shouldSetShouldHaltWhenReceivesControl = NO;
40+
self.shouldHaltWhenReceivesControl = NO;
41+
}
3242
}
33-
43+
3444
/**
3545
Private XCTestCase method used to block and tunnel failure messages
3646
*/
@@ -53,29 +63,3 @@ - (void)_enqueueFailureWithDescription:(NSString *)description
5363
}
5464

5565
@end
56-
57-
@interface FBXCTestCaseImplementationFailureHoldingProxy ()
58-
@property (nonatomic, strong) _XCTestCaseImplementation *internalImplementation;
59-
@end
60-
61-
@implementation FBXCTestCaseImplementationFailureHoldingProxy
62-
63-
+ (instancetype)proxyWithXCTestCaseImplementation:(_XCTestCaseImplementation *)internalImplementation
64-
{
65-
FBXCTestCaseImplementationFailureHoldingProxy *proxy = [super alloc];
66-
proxy.internalImplementation = internalImplementation;
67-
return proxy;
68-
}
69-
70-
- (id)forwardingTargetForSelector:(SEL)aSelector
71-
{
72-
return self.internalImplementation;
73-
}
74-
75-
// This will prevent test from quiting on app crash or any other test failure
76-
- (BOOL)shouldHaltWhenReceivesControl
77-
{
78-
return NO;
79-
}
80-
81-
@end

‎DeviceAgent/FBXCTestCaseImplementationFailureHoldingProxy.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/**
2+
* Copyright (c) 2015-present, Facebook, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*/
9+
10+
// Copyright (c) Microsoft Corporation. All rights reserved.
11+
// Licensed under the MIT license.
12+
13+
#import <Foundation/Foundation.h>
14+
15+
@class _XCTestCaseImplementation;
16+
17+
NS_ASSUME_NONNULL_BEGIN
18+
19+
/**
20+
Class that can be used to proxy existing _XCTestCaseImplementation and
21+
prevent currently running test from being terminated on any XCTest failure
22+
*/
23+
@interface FBXCTestCaseImplementationFailureHoldingProxy : NSProxy
24+
25+
/**
26+
Constructor for given existing _XCTestCaseImplementation instance
27+
*/
28+
+ (instancetype)proxyWithXCTestCaseImplementation:(_XCTestCaseImplementation *)internalImplementation;
29+
30+
@end
31+
32+
NS_ASSUME_NONNULL_END

‎DeviceAgent/FBXCTestCaseImplementationFailureHoldingProxy.m‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**
2+
* Copyright (c) 2015-present, Facebook, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*/
9+
10+
// Copyright (c) Microsoft Corporation. All rights reserved.
11+
// Licensed under the MIT license.
12+
13+
#import "FBXCTestCaseImplementationFailureHoldingProxy.h"
14+
15+
#import "_XCTestCaseImplementation.h"
16+
17+
@interface FBXCTestCaseImplementationFailureHoldingProxy ()
18+
@property (nonatomic, strong) _XCTestCaseImplementation *internalImplementation;
19+
@end
20+
21+
@implementation FBXCTestCaseImplementationFailureHoldingProxy
22+
23+
+ (instancetype)proxyWithXCTestCaseImplementation:(_XCTestCaseImplementation *)internalImplementation
24+
{
25+
FBXCTestCaseImplementationFailureHoldingProxy *proxy = [super alloc];
26+
proxy.internalImplementation = internalImplementation;
27+
return proxy;
28+
}
29+
30+
- (id)forwardingTargetForSelector:(SEL)aSelector
31+
{
32+
return self.internalImplementation;
33+
}
34+
35+
// This will prevent test from quiting on app crash or any other test failure
36+
- (BOOL)shouldHaltWhenReceivesControl
37+
{
38+
return NO;
39+
}
40+
41+
@end

‎Server/PrivateHeaders/CBX-XCTest-Umbrella.h‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#import "XCTest/NSMutableArray-XCTestAdditions.h"
1212
#import "XCTest/NSSet-XCTestAdditions.h"
1313
#import "XCTest/NSString-XCTAdditions.h"
14+
#import "XCTest/NSThread-XCTContext.h"
1415
#import "XCTest/NSValue-XCTestAdditions.h"
1516
#import "XCTest/UIGestureRecognizer-RecordingAdditions.h"
1617
#import "XCTest/UILongPressGestureRecognizer-RecordingAdditions.h"
@@ -53,6 +54,7 @@
5354
#import "XCTest/XCTFuture.h"
5455
#import "XCTest/XCTImage.h"
5556
#import "XCTest/XCTKVOExpectation.h"
57+
#import "XCTest/XCTMacCatalystStatusProviding-Protocol.h"
5658
#import "XCTest/XCTMeasureOptions.h"
5759
#import "XCTest/XCTMeasurement.h"
5860
#import "XCTest/XCTMemoryChecker.h"
@@ -78,7 +80,9 @@
7880
#import "XCTest/XCTRunnerIDESession.h"
7981
#import "XCTest/XCTRunnerIDESessionDelegate-Protocol.h"
8082
#import "XCTest/XCTSerializedTransportWrapper.h"
83+
#import "XCTest/XCTSkippedTestContext.h"
8184
#import "XCTest/XCTStorageMetric.h"
85+
#import "XCTest/XCTSwiftErrorObservation.h"
8286
#import "XCTest/XCTTestIdentifier.h"
8387
#import "XCTest/XCTTestRunSession.h"
8488
#import "XCTest/XCTTestRunSessionDelegate-Protocol.h"
@@ -103,6 +107,7 @@
103107
#import "XCTest/XCTestLog.h"
104108
#import "XCTest/XCTestManager_IDEInterface-Protocol.h"
105109
#import "XCTest/XCTestManager_ManagerInterface-Protocol.h"
110+
#import "XCTest/XCTestManager_ProtectedResources-Protocol.h"
106111
#import "XCTest/XCTestManager_TestsInterface-Protocol.h"
107112
#import "XCTest/XCTestMisuseObserver.h"
108113
#import "XCTest/XCTestObservation-Protocol.h"
@@ -135,7 +140,6 @@
135140
#import "XCTest/XCUIDevice.h"
136141
#import "XCTest/XCUIDeviceEventAndStateInterface-Protocol.h"
137142
#import "XCTest/XCUIElement.h"
138-
#import "XCTest/XCUIElementAsynchronousHandlerWrapper.h"
139143
#import "XCTest/XCUIElementAttributes-Protocol.h"
140144
#import "XCTest/XCUIElementAttributesPrivate-Protocol.h"
141145
#import "XCTest/XCUIElementHitPointCoordinate.h"
@@ -146,6 +150,9 @@
146150
#import "XCTest/XCUIEventSynthesisRequest-Protocol.h"
147151
#import "XCTest/XCUIEventSynthesizing-Protocol.h"
148152
#import "XCTest/XCUIHitPointResult.h"
153+
#import "XCTest/XCUIInterruptionHandler.h"
154+
#import "XCTest/XCUIInterruptionMonitor.h"
155+
#import "XCTest/XCUIInterruptionMonitoring-Protocol.h"
149156
#import "XCTest/XCUILocalDeviceScreenDataSource.h"
150157
#import "XCTest/XCUIPlatformApplicationManager.h"
151158
#import "XCTest/XCUIPlatformApplicationServicesProviding-Protocol.h"
@@ -159,31 +166,17 @@
159166
#import "XCTest/XCUIRectTransformationRequest.h"
160167
#import "XCTest/XCUIRemoteAccessibilityInterface-Protocol.h"
161168
#import "XCTest/XCUIRemoteSiriInterface-Protocol.h"
169+
#import "XCTest/XCUIResetAuthorizationStatusOfProtectedResourcesInterface-Protocol.h"
162170
#import "XCTest/XCUIScreen.h"
163171
#import "XCTest/XCUIScreenDataSource-Protocol.h"
164172
#import "XCTest/XCUIScreenshot.h"
165173
#import "XCTest/XCUIScreenshotProviding-Protocol.h"
166174
#import "XCTest/XCUISiriService.h"
167175
#import "XCTest/XCUISnapshotGenerationTracker.h"
168-
#import "XCTest/XCUITestContext.h"
169-
#import "XCTest/XCUITestContextScope.h"
170176
#import "XCTest/XCUITransformParameters.h"
171177
#import "XCTest/XCUIXcodeApplicationManaging-Protocol.h"
172-
#import "XCTest/_XCInternalTestRun.h"
173-
#import "XCTest/_XCKVOExpectationImplementation.h"
174-
#import "XCTest/_XCTAttachmentImplementation.h"
175-
#import "XCTest/_XCTCompoundExpectationImplementation.h"
176-
#import "XCTest/_XCTContextImplementation.h"
177-
#import "XCTest/_XCTDarwinNotificationExpectationImplementation.h"
178-
#import "XCTest/_XCTImageImplementation.h"
179-
#import "XCTest/_XCTNSNotificationExpectationImplementation.h"
180-
#import "XCTest/_XCTNSPredicateExpectationImplementation.h"
181-
#import "XCTest/_XCTWaiterImpl.h"
182-
#import "XCTest/_XCTestCaseImplementation.h"
178+
#import "XCTest/_XCTRunnerDaemonSessionDummyExportedObject.h"
179+
#import "XCTest/_XCTSkipFailureException.h"
183180
#import "XCTest/_XCTestCaseInterruptionException.h"
184-
#import "XCTest/_XCTestExpectationImplementation.h"
185-
#import "XCTest/_XCTestImplementation.h"
186-
#import "XCTest/_XCTestObservationCenterImplementation.h"
187181
#import "XCTest/_XCTestObservationPrivate-Protocol.h"
188-
#import "XCTest/_XCTestSuiteImplementation.h"
189182
#endif

‎Server/PrivateHeaders/XCTAutomationSupport/XCDeviceEvent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
NSUInteger _eventPage;
2121
NSUInteger _usage;
2222
double _duration;
23-
NSUInteger _type;
2423
double _rotation;
24+
NSUInteger _type;
2525
}
2626

2727
@property double duration;

‎Server/PrivateHeaders/XCTAutomationSupport/XCElementSnapshot.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
@interface XCElementSnapshot : NSObject <NSSecureCoding, NSCopying>
2525
{
26-
NSUInteger _faultedInProperties;
2726
BOOL _isMainWindow;
2827
BOOL _enabled;
2928
BOOL _selected;
3029
BOOL _hasFocus;
3130
BOOL _hasKeyboardFocus;
3231
BOOL _isTruncatedValue;
32+
NSUInteger _faultedInProperties;
3333
id <XCUIElementSnapshotApplication> _application;
3434
NSUInteger _generation;
3535
id <XCTElementSnapshotAttributeDataSource> _dataSource;
@@ -68,6 +68,7 @@
6868
@property(copy) NSSet *disclosedChildRowAXElements;
6969
@property(readonly) NSArray *disclosedChildRows;
7070
@property NSUInteger elementType;
71+
@property NSUInteger faultedInProperties;
7172
@property CGRect frame;
7273
@property(nonatomic) NSUInteger generation;
7374
@property BOOL hasFocus;
@@ -114,7 +115,7 @@
114115
+ (id)axAttributesForFaultingPropertiesOnMacOS:(BOOL)arg1;
115116
+ (id)axAttributesForSnapshotAttributes:(id)arg1 isMacOS:(BOOL)arg2;
116117
+ (NSUInteger)elementTypeForAccessibilityElement:(id)arg1 usingAXAttributes_iOS:(id)arg2 useLegacyElementType:(BOOL)arg3;
117-
+ (NSUInteger)elementTypeForAccessibilityElement:(id)arg1 usingAXAttributes_macOS:(id)arg2 useLegacyElementType:(BOOL)arg3;
118+
+ (NSUInteger)elementTypeForAccessibilityElement:(id)arg1 usingAXAttributes_macOS:(id)arg2 macCatalystStatusProvider:(id)arg3 useLegacyElementType:(BOOL)arg4;
118119
+ (id)elementWithAccessibilityElement:(id)arg1;
119120
+ (id)requiredAXAttributesForElementSnapshotHierarchyOnMacOS:(BOOL)arg1;
120121
+ (id)sanitizedElementSnapshotHierarchyAttributesForAttributes:(id)arg1 isMacOS:(BOOL)arg2;
@@ -126,6 +127,7 @@
126127
- (BOOL)_fetchBoolForKey:(id)arg1;
127128
- (id)_fetchSimpleValueForKey:(id)arg1;
128129
- (BOOL)_frameFuzzyMatchesElement:(id)arg1;
130+
- (BOOL)_frameFuzzyMatchesElement:(id)arg1 tolerance:(double)arg2;
129131
- (BOOL)_fuzzyMatchesElement:(id)arg1;
130132
- (BOOL)_isAncestorOfElement:(id)arg1;
131133
- (BOOL)_isDescendantOfElement:(id)arg1;

0 commit comments

Comments
 (0)