moar

Author: mykola-mokhnach

WebDriverAgentLib/Categories/FBXCElementSnapshotWrapper+Helpers.h

@@ -58,13 +58,10 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param attribute attribute's accessibility identifier. Can be one of
  `XC_kAXXCAttribute`-prefixed attribute names.
- @param timeout The maximum time is flota seconds to wait until XCTest/Accessbility framework
- returns the value of the requested attribute
  @param error Error instance in case of a failure
  @return value for given accessibility property identifier or nil in case of failure
  */
 - (nullable id)fb_attributeValue:(NSString *)attribute
-                         timeout:(NSTimeInterval)timeout
                            error:(NSError **)error;
 
 /**

WebDriverAgentLib/Categories/FBXCElementSnapshotWrapper+Helpers.m

@@ -22,6 +22,8 @@
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "XCUIHitPointResult.h"
 
+#define ATTRIBUTE_FETCH_WARN_TIME_LIMIT 0.05
+
 inline static BOOL isSnapshotTypeAmongstGivenTypes(id<FBXCElementSnapshot> snapshot,
                                                    NSArray<NSNumber *> *types);
 
@@ -67,38 +69,17 @@ - (NSString *)fb_description
 }
 
 - (id)fb_attributeValue:(NSString *)attribute
-                timeout:(NSTimeInterval)timeout
                   error:(NSError **)error
 {
-  id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
-  dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-  __block NSDictionary *result = nil;
-  __block NSError *blockError;
-  [proxy _XCT_fetchAttributes:@[attribute]
-                   forElement:[self accessibilityElement]
-                        reply:^(NSDictionary *innerResult, NSError *innerError) {
-    if (nil == innerError) {
-      result = innerResult;
-    } else {
-      blockError = innerError;
-    }
-    dispatch_semaphore_signal(sem);
-  }];
-  if (0 != dispatch_semaphore_wait(sem, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC)))) {
-    NSString *timeoutMsg = [NSString stringWithFormat:@"Cannot fetch %@ attribute of '%@' within %@s timeout",
-                            attribute, self.fb_description, @(timeout)];
-    [[[FBErrorBuilder builder]
-      withDescription:timeoutMsg]
-     buildError:error];
-    return nil;
-  }
-  if (nil != result) {
-    return [result objectForKey:attribute];
-  }
-  if (error) {
-    *error = blockError;
+  NSDate *start = [NSDate date];
+  NSDictionary *result = [FBXCAXClientProxy.sharedClient attributesForElement:[self accessibilityElement]
+                                                                   attributes:@[attribute]
+                                                                        error:error];
+  NSTimeInterval elapsed = ABS([start timeIntervalSinceNow]);
+  if (elapsed > ATTRIBUTE_FETCH_WARN_TIME_LIMIT) {
+    NSLog(@"! Fetching of %@ value for %@ took %@s", attribute, self.fb_description, @(elapsed));
   }
-  return nil;
+  return [result objectForKey:attribute];
 }
 
 inline static BOOL areValuesEqual(id value1, id value2);

WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.m

@@ -14,8 +14,6 @@
 #import "XCUIElement+FBUtilities.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 
-#define AX_FETCH_TIMEOUT 0.3
-
 @implementation XCUIElement (FBAccessibility)
 
 - (BOOL)fb_isAccessibilityElement
@@ -37,7 +35,6 @@ - (BOOL)fb_isAccessibilityElement
 
   NSError *error;
   NSNumber *attributeValue = [self fb_attributeValue:FB_XCAXAIsElementAttributeName
-                                             timeout:AX_FETCH_TIMEOUT
                                                error:&error];
   if (nil != attributeValue) {
     NSMutableDictionary *updatedValue = [NSMutableDictionary dictionaryWithDictionary:self.additionalAttributes ?: @{}];

WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -16,8 +16,6 @@
 #import "XCUIElement+FBVisibleFrame.h"
 #import "XCTestPrivateSymbols.h"
 
-#define AX_FETCH_TIMEOUT 0.3
-
 NSNumber* _Nullable fetchSnapshotVisibility(id<FBXCElementSnapshot> snapshot)
 {
   return nil == snapshot.additionalAttributes ? nil : snapshot.additionalAttributes[FB_XCAXAIsVisibleAttribute];
@@ -61,7 +59,6 @@ - (BOOL)fb_isVisible
 
   NSError *error;
   NSNumber *attributeValue = [self fb_attributeValue:FB_XCAXAIsVisibleAttributeName
-                                             timeout:AX_FETCH_TIMEOUT
                                                error:&error];
   if (nil != attributeValue) {
     NSMutableDictionary *updatedValue = [NSMutableDictionary dictionaryWithDictionary:self.additionalAttributes ?: @{}];
@@ -70,12 +67,9 @@ - (BOOL)fb_isVisible
     return [attributeValue boolValue];
   }
 
-  // If we fail to fetch the "true" visibility from AX then fallback to
-  // the lousy `visibleFrame`-based detection method
-  BOOL fallbackResult = !CGRectIsEmpty(self.fb_visibleFrame);
-  NSLog(@"Cannot determine visibility of '%@' natively: %@. Defaulting to: %@",
-        self.fb_description, error.description, @(fallbackResult));
-  return fallbackResult;
+  NSLog(@"Cannot determine visiblity of %@ natively: %@. Defaulting to: %@",
+        self.fb_description, error.description, @(NO));
+  return NO;
 }
 
 @end

WebDriverAgentLib/Categories/XCUIElement+FBVisibleFrame.m

@@ -14,8 +14,6 @@
 #import "XCUIElement+FBUtilities.h"
 #import "XCTestPrivateSymbols.h"
 
-#define VisibleFrameFetchTimeout 0.3
-
 @implementation XCUIElement (FBVisibleFrame)
 
 - (CGRect)fb_visibleFrame
@@ -36,7 +34,6 @@ - (CGRect)fb_visibleFrame
   }
 
   NSDictionary *visibleFrameDict = [self fb_attributeValue:FB_XCAXAVisibleFrameAttributeName
-                                                   timeout:VisibleFrameFetchTimeout
                                                      error:nil];
   if (nil == visibleFrameDict) {
     return thisVisibleFrame;