appium-webdriveragent 3.9.2 → 3.12.0

package/WebDriverAgentLib/Utilities/FBSettings.h

@@ -13,30 +13,30 @@ NS_ASSUME_NONNULL_BEGIN
 
 // See FBConfiguration.h for more details on the meaning of each setting
 
-extern NSString* const USE_COMPACT_RESPONSES;
-extern NSString* const ELEMENT_RESPONSE_ATTRIBUTES;
-extern NSString* const MJPEG_SERVER_SCREENSHOT_QUALITY;
-extern NSString* const MJPEG_SERVER_FRAMERATE;
-extern NSString* const MJPEG_SCALING_FACTOR;
-extern NSString* const SCREENSHOT_QUALITY;
-extern NSString* const KEYBOARD_AUTOCORRECTION;
-extern NSString* const KEYBOARD_PREDICTION;
+extern NSString* const FB_SETTING_USE_COMPACT_RESPONSES;
+extern NSString* const FB_SETTING_ELEMENT_RESPONSE_ATTRIBUTES;
+extern NSString* const FB_SETTING_MJPEG_SERVER_SCREENSHOT_QUALITY;
+extern NSString* const FB_SETTING_MJPEG_SERVER_FRAMERATE;
+extern NSString* const FB_SETTING_MJPEG_SCALING_FACTOR;
+extern NSString* const FB_SETTING_SCREENSHOT_QUALITY;
+extern NSString* const FB_SETTING_KEYBOARD_AUTOCORRECTION;
+extern NSString* const FB_SETTING_KEYBOARD_PREDICTION;
 // This setting is deprecated. Please use CUSTOM_SNAPSHOT_TIMEOUT instead
-extern NSString* const SNAPSHOT_TIMEOUT;
-extern NSString* const CUSTOM_SNAPSHOT_TIMEOUT;
-extern NSString* const SNAPSHOT_MAX_DEPTH;
-extern NSString* const USE_FIRST_MATCH;
-extern NSString* const BOUND_ELEMENTS_BY_INDEX;
-extern NSString* const REDUCE_MOTION;
-extern NSString* const DEFAULT_ACTIVE_APPLICATION;
-extern NSString* const ACTIVE_APP_DETECTION_POINT;
-extern NSString* const INCLUDE_NON_MODAL_ELEMENTS;
-extern NSString* const DEFAULT_ALERT_ACTION;
-extern NSString* const ACCEPT_ALERT_BUTTON_SELECTOR;
-extern NSString* const DISMISS_ALERT_BUTTON_SELECTOR;
-extern NSString* const SCREENSHOT_ORIENTATION;
-extern NSString* const WAIT_FOR_IDLE_TIMEOUT;
-extern NSString* const ANIMATION_COOL_OFF_TIMEOUT;
+extern NSString* const FB_SETTING_SNAPSHOT_TIMEOUT;
+extern NSString* const FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT;
+extern NSString* const FB_SETTING_SNAPSHOT_MAX_DEPTH;
+extern NSString* const FB_SETTING_USE_FIRST_MATCH;
+extern NSString* const FB_SETTING_BOUND_ELEMENTS_BY_INDEX;
+extern NSString* const FB_SETTING_REDUCE_MOTION;
+extern NSString* const FB_SETTING_DEFAULT_ACTIVE_APPLICATION;
+extern NSString* const FB_SETTING_ACTIVE_APP_DETECTION_POINT;
+extern NSString* const FB_SETTING_INCLUDE_NON_MODAL_ELEMENTS;
+extern NSString* const FB_SETTING_DEFAULT_ALERT_ACTION;
+extern NSString* const FB_SETTING_ACCEPT_ALERT_BUTTON_SELECTOR;
+extern NSString* const FB_SETTING_DISMISS_ALERT_BUTTON_SELECTOR;
+extern NSString* const FB_SETTING_SCREENSHOT_ORIENTATION;
+extern NSString* const FB_SETTING_WAIT_FOR_IDLE_TIMEOUT;
+extern NSString* const FB_SETTING_ANIMATION_COOL_OFF_TIMEOUT;
 
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBSettings.m

@@ -9,26 +9,26 @@
 
 #import "FBSettings.h"
 
-NSString* const USE_COMPACT_RESPONSES = @"shouldUseCompactResponses";
-NSString* const ELEMENT_RESPONSE_ATTRIBUTES = @"elementResponseAttributes";
-NSString* const MJPEG_SERVER_SCREENSHOT_QUALITY = @"mjpegServerScreenshotQuality";
-NSString* const MJPEG_SERVER_FRAMERATE = @"mjpegServerFramerate";
-NSString* const MJPEG_SCALING_FACTOR = @"mjpegScalingFactor";
-NSString* const SCREENSHOT_QUALITY = @"screenshotQuality";
-NSString* const KEYBOARD_AUTOCORRECTION = @"keyboardAutocorrection";
-NSString* const KEYBOARD_PREDICTION = @"keyboardPrediction";
-NSString* const SNAPSHOT_TIMEOUT = @"snapshotTimeout";
-NSString* const CUSTOM_SNAPSHOT_TIMEOUT = @"customSnapshotTimeout";
-NSString* const SNAPSHOT_MAX_DEPTH = @"snapshotMaxDepth";
-NSString* const USE_FIRST_MATCH = @"useFirstMatch";
-NSString* const BOUND_ELEMENTS_BY_INDEX = @"boundElementsByIndex";
-NSString* const REDUCE_MOTION = @"reduceMotion";
-NSString* const DEFAULT_ACTIVE_APPLICATION = @"defaultActiveApplication";
-NSString* const ACTIVE_APP_DETECTION_POINT = @"activeAppDetectionPoint";
-NSString* const INCLUDE_NON_MODAL_ELEMENTS = @"includeNonModalElements";
-NSString* const DEFAULT_ALERT_ACTION = @"defaultAlertAction";
-NSString* const ACCEPT_ALERT_BUTTON_SELECTOR = @"acceptAlertButtonSelector";
-NSString* const DISMISS_ALERT_BUTTON_SELECTOR = @"dismissAlertButtonSelector";
-NSString* const SCREENSHOT_ORIENTATION = @"screenshotOrientation";
-NSString* const WAIT_FOR_IDLE_TIMEOUT = @"waitForIdleTimeout";
-NSString* const ANIMATION_COOL_OFF_TIMEOUT = @"animationCoolOffTimeout";
+NSString* const FB_SETTING_USE_COMPACT_RESPONSES = @"shouldUseCompactResponses";
+NSString* const FB_SETTING_ELEMENT_RESPONSE_ATTRIBUTES = @"elementResponseAttributes";
+NSString* const FB_SETTING_MJPEG_SERVER_SCREENSHOT_QUALITY = @"mjpegServerScreenshotQuality";
+NSString* const FB_SETTING_MJPEG_SERVER_FRAMERATE = @"mjpegServerFramerate";
+NSString* const FB_SETTING_MJPEG_SCALING_FACTOR = @"mjpegScalingFactor";
+NSString* const FB_SETTING_SCREENSHOT_QUALITY = @"screenshotQuality";
+NSString* const FB_SETTING_KEYBOARD_AUTOCORRECTION = @"keyboardAutocorrection";
+NSString* const FB_SETTING_KEYBOARD_PREDICTION = @"keyboardPrediction";
+NSString* const FB_SETTING_SNAPSHOT_TIMEOUT = @"snapshotTimeout";
+NSString* const FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT = @"customSnapshotTimeout";
+NSString* const FB_SETTING_SNAPSHOT_MAX_DEPTH = @"snapshotMaxDepth";
+NSString* const FB_SETTING_USE_FIRST_MATCH = @"useFirstMatch";
+NSString* const FB_SETTING_BOUND_ELEMENTS_BY_INDEX = @"boundElementsByIndex";
+NSString* const FB_SETTING_REDUCE_MOTION = @"reduceMotion";
+NSString* const FB_SETTING_DEFAULT_ACTIVE_APPLICATION = @"defaultActiveApplication";
+NSString* const FB_SETTING_ACTIVE_APP_DETECTION_POINT = @"activeAppDetectionPoint";
+NSString* const FB_SETTING_INCLUDE_NON_MODAL_ELEMENTS = @"includeNonModalElements";
+NSString* const FB_SETTING_DEFAULT_ALERT_ACTION = @"defaultAlertAction";
+NSString* const FB_SETTING_ACCEPT_ALERT_BUTTON_SELECTOR = @"acceptAlertButtonSelector";
+NSString* const FB_SETTING_DISMISS_ALERT_BUTTON_SELECTOR = @"dismissAlertButtonSelector";
+NSString* const FB_SETTING_SCREENSHOT_ORIENTATION = @"screenshotOrientation";
+NSString* const FB_SETTING_WAIT_FOR_IDLE_TIMEOUT = @"waitForIdleTimeout";
+NSString* const FB_SETTING_ANIMATION_COOL_OFF_TIMEOUT = @"animationCoolOffTimeout";

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h

@@ -10,6 +10,22 @@
 #import <WebDriverAgentLib/WebDriverAgentLib.h>
 #import "XCPointerEvent.h"
 
+/**
+ The version of testmanagerd process which is running on the device.
+
+ Potentially, we can handle processes based on this version instead of iOS versions,
+ iOS 10.1 -> 6
+ iOS 11.0.1 -> 18
+ iOS 11.4 -> 22
+ iOS 12.1, 12.4 -> 26
+ iOS 13.0, 13.4.1 -> 28
+
+ tvOS 13.3 -> 28
+
+ @return The version of testmanagerd
+ */
+NSInteger FBTestmanagerdVersion(void);
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -193,3 +193,19 @@ static dispatch_once_t onceAppWithPIDToken;
 }
 
 @end
+
+NSInteger FBTestmanagerdVersion(void)
+{
+  static dispatch_once_t getTestmanagerdVersion;
+  static NSInteger testmanagerdVersion;
+  dispatch_once(&getTestmanagerdVersion, ^{
+    id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
+    dispatch_semaphore_t sem = dispatch_semaphore_create(0);
+    [proxy _XCT_exchangeProtocolVersion:testmanagerdVersion reply:^(unsigned long long code) {
+      testmanagerdVersion = (NSInteger) code;
+      dispatch_semaphore_signal(sem);
+    }];
+    dispatch_semaphore_wait(sem, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)));
+  });
+  return testmanagerdVersion;
+}

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -136,7 +136,9 @@ static NSString *const topNodeIndexPath = @"top";
   xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1);
   xmlFreeTextWriter(writer);
   xmlFreeDoc(doc);
-  return [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
+  NSString *result = [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
+  xmlFree(xmlbuff);
+  return result;
 }
 
 + (NSArray<XCElementSnapshot *> *)matchesWithRootElement:(id<FBElement>)root forQuery:(NSString *)xpathQuery
@@ -183,7 +185,7 @@ static NSString *const topNodeIndexPath = @"top";
     return @[];
   }
   NSMutableArray *matchingSnapshots = [NSMutableArray array];
-  const xmlChar *indexPathKeyName = [self xmlCharPtrForInput:[kXMLIndexPathKey cStringUsingEncoding:NSUTF8StringEncoding]];
+  const xmlChar *indexPathKeyName = (xmlChar *)[kXMLIndexPathKey UTF8String];
   for (NSInteger i = 0; i < nodeSet->nodeNr; i++) {
     xmlNodePtr currentNode = nodeSet->nodeTab[i];
     xmlChar *attrValue = xmlGetProp(currentNode, indexPathKeyName);
@@ -195,6 +197,7 @@ static NSString *const topNodeIndexPath = @"top";
     if (element) {
       [matchingSnapshots addObject:element];
     }
+    xmlFree(attrValue);
   }
   return matchingSnapshots.copy;
 }
@@ -263,37 +266,6 @@ static NSString *const topNodeIndexPath = @"top";
   return 0;
 }
 
-+ (xmlChar *)xmlCharPtrForInput:(const char *)input
-{
-  if (0 == input) {
-    return NULL;
-  }
-
-  xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler(_UTF8Encoding);
-  if (!handler) {
-    [FBLogger log:@"Failed to invoke libxml2>xmlFindCharEncodingHandler"];
-    return NULL;
-  }
-
-  int size = (int) strlen(input) + 1;
-  int outputSize = size * 2 - 1;
-  xmlChar *output = (unsigned char *) xmlMalloc((size_t) outputSize);
-
-  if (0 != output) {
-    int temp = size - 1;
-    int ret = handler->input(output, &outputSize, (const xmlChar *) input, &temp);
-    if ((ret < 0) || (temp - size + 1)) {
-      xmlFree(output);
-      output = 0;
-    } else {
-      output = (unsigned char *) xmlRealloc(output, outputSize + 1);
-      output[outputSize] = 0;
-    }
-  }
-
-  return output;
-}
-
 + (xmlXPathObjectPtr)evaluate:(NSString *)xpathQuery document:(xmlDocPtr)doc
 {
   xmlXPathContextPtr xpathCtx = xmlXPathNewContext(doc);
@@ -303,7 +275,7 @@ static NSString *const topNodeIndexPath = @"top";
   }
   xpathCtx->node = doc->children;
 
-  xmlXPathObjectPtr xpathObj = xmlXPathEvalExpression([self xmlCharPtrForInput:[xpathQuery cStringUsingEncoding:NSUTF8StringEncoding]], xpathCtx);
+  xmlXPathObjectPtr xpathObj = xmlXPathEvalExpression((const xmlChar *)[xpathQuery UTF8String], xpathCtx);
   if (NULL == xpathObj) {
     xmlXPathFreeContext(xpathCtx);
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlXPathEvalExpression for XPath query \"%@\"", xpathQuery];
@@ -313,14 +285,9 @@ static NSString *const topNodeIndexPath = @"top";
   return xpathObj;
 }
 
-+ (xmlChar *)safeXmlStringWithString:(NSString *)str
++ (nullable NSString *)safeXmlStringWithString:(NSString *)str
 {
-  if (nil == str) {
-    return NULL;
-  }
-
-  NSString *safeString = [str fb_xmlSafeStringWithReplacement:@""];
-  return [self.class xmlCharPtrForInput:[safeString cStringUsingEncoding:NSUTF8StringEncoding]];
+  return [str fb_xmlSafeStringWithReplacement:@""];
 }
 
 + (int)recordElementAttributes:(xmlTextWriterPtr)writer forElement:(XCElementSnapshot *)element indexPath:(nullable NSString *)indexPath includedAttributes:(nullable NSSet<Class> *)includedAttributes
@@ -374,7 +341,7 @@ static NSString *const topNodeIndexPath = @"top";
     [elementStore setObject:currentSnapshot forKey:topNodeIndexPath];
   }
 
-  int rc = xmlTextWriterStartElement(writer, [self xmlCharPtrForInput:[currentSnapshot.wdType cStringUsingEncoding:NSUTF8StringEncoding]]);
+  int rc = xmlTextWriterStartElement(writer, (xmlChar *)[currentSnapshot.wdType UTF8String]);
   if (rc < 0) {
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartElement for the tag value '%@'. Error code: %d", currentSnapshot.wdType, rc];
     return rc;
@@ -447,7 +414,9 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
     // Skip the attribute if the value equals to nil
     return 0;
   }
-  int rc = xmlTextWriterWriteAttribute(writer, [FBXPath safeXmlStringWithString:[self name]], [FBXPath safeXmlStringWithString:value]);
+  int rc = xmlTextWriterWriteAttribute(writer,
+                                       (xmlChar *)[[FBXPath safeXmlStringWithString:[self name]] UTF8String],
+                                       (xmlChar *)[[FBXPath safeXmlStringWithString:value] UTF8String]);
   if (rc < 0) {
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterWriteAttribute(%@='%@'). Error code: %d", [self name], value, rc];
   }
@@ -672,7 +641,9 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
     // Skip the attribute if the value equals to nil
     return 0;
   }
-  int rc = xmlTextWriterWriteAttribute(writer, [FBXPath safeXmlStringWithString:[self name]], [FBXPath safeXmlStringWithString:value]);
+  int rc = xmlTextWriterWriteAttribute(writer,
+                                       (xmlChar *)[[FBXPath safeXmlStringWithString:[self name]] UTF8String],
+                                       (xmlChar *)[[FBXPath safeXmlStringWithString:value] UTF8String]);
   if (rc < 0) {
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterWriteAttribute(%@='%@'). Error code: %d", [self name], value, rc];
   }

package/WebDriverAgentLib/Utilities/LRUCache/LRUCache.h

@@ -0,0 +1,59 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface LRUCache : NSObject
+
+/*! Maximum cache capacity. Could only be set in the constructor */
+@property (nonatomic, readonly) NSUInteger capacity;
+
+/**
+ Constructs a new LRU cache instance with the given capacity
+
+ @param capacity Maximum cache capacity
+ */
+- (instancetype)initWithCapacity:(NSUInteger)capacity;
+
+/**
+ Puts a new object into the cache. nil cannot be stored in the cache.
+
+ @param object Object to put
+ @param key Object's key
+ */
+- (void)setObject:(id)object forKey:(id<NSCopying>)key;
+
+/**
+ Retrieves an object from the cache. Every time this method is called the matched
+ object is bumped in the cache (if exists)
+
+ @param key Object's key
+ @returns Either the stored instance or nil if the object does not exist or has expired
+ */
+- (nullable id)objectForKey:(id<NSCopying>)key;
+
+/**
+ Retrieves all values from the cache. No bump is performed
+
+ @return Array of all cache values
+ */
+- (NSArray *)allObjects;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/LRUCache/LRUCache.m

@@ -0,0 +1,104 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "LRUCache.h"
+#import "LRUCacheNode.h"
+
+@interface LRUCache ()
+@property (nonatomic) NSMutableDictionary *store;
+@property (nonatomic, nullable) LRUCacheNode *headNode;
+@property (nonatomic, nullable) LRUCacheNode *tailNode;
+@property (nonatomic) NSUInteger size;
+@end
+
+@implementation LRUCache
+
+- (instancetype)initWithCapacity:(NSUInteger)capacity
+{
+  if ((self = [super init])) {
+    _store = [NSMutableDictionary dictionary];
+    _capacity = capacity;
+  }
+  return self;
+}
+
+- (void)setObject:(id)object forKey:(id<NSCopying>)key
+{
+  NSAssert(nil != object, @"LRUCache cannot store nil objects");
+
+  LRUCacheNode *previousNode = self.store[key];
+  LRUCacheNode *newNode = [LRUCacheNode nodeWithValue:object key:key];
+  self.store[key] = newNode;
+  if (nil == previousNode) {
+    ++self.size;
+  }
+  if (previousNode == self.tailNode) {
+    self.tailNode = newNode;
+  }
+  if (previousNode == self.headNode) {
+    self.headNode = newNode;
+  }
+
+  [self bumpNode:newNode];
+  [self alignSize];
+}
+
+- (id)objectForKey:(id<NSCopying>)key
+{
+  LRUCacheNode *node = self.store[key];
+  if (nil != node) {
+    [self bumpNode:node];
+  }
+
+  return node.value;
+}
+
+- (NSArray *)allObjects
+{
+  return (NSArray *)[self.store.allValues valueForKeyPath:@"value"];
+}
+
+- (void)bumpNode:(LRUCacheNode *)node
+{
+  if (node == self.headNode) {
+    return;
+  }
+
+  if (node == self.tailNode) {
+    self.tailNode = self.tailNode.prev;
+  }
+
+  self.headNode.prev.next = node.next;
+
+  LRUCacheNode *prevHead = self.headNode;
+  self.headNode = node;
+  self.headNode.next = prevHead;
+}
+
+- (void)alignSize
+{
+  if (self.size <= self.capacity) {
+    return;
+  }
+
+  LRUCacheNode *nextTail = self.tailNode.prev;
+  [self.store removeObjectForKey:(id)self.tailNode.key];
+  self.tailNode = nextTail;
+  self.tailNode.next = nil;
+  --self.size;
+}
+
+@end

package/WebDriverAgentLib/Utilities/LRUCache/LRUCacheNode.h

@@ -0,0 +1,43 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface LRUCacheNode : NSObject
+
+/*! Node value */
+@property (nonatomic, readonly) id value;
+/*! Node key */
+@property (nonatomic, readonly) id<NSCopying> key;
+/*! Pointer to the next node */
+@property (nonatomic, nullable) LRUCacheNode *next;
+/*! Pointer to the previous node */
+@property (nonatomic, nullable) LRUCacheNode *prev;
+
+/**
+ Factory method to create a new cache node with the given value and key
+
+ @param value Node value
+ @param key Node key
+ @returns Cache node instance
+ */
++ (instancetype)nodeWithValue:(id)value key:(id<NSCopying>)key;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/LRUCache/LRUCacheNode.m

@@ -0,0 +1,59 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "LRUCacheNode.h"
+
+@interface LRUCacheNode ()
+@property (nonatomic, readwrite) id value;
+@property (nonatomic, readwrite) id<NSCopying> key;
+
+- (instancetype)initWithValue:(id)value key:(id<NSCopying>)key;
+@end
+
+@implementation LRUCacheNode
+
+- (instancetype)initWithValue:(id)value key:(id<NSCopying>)key
+{
+  if (nil == value) {
+    return nil;
+  }
+
+  if ((self = [super init])) {
+    _value = value;
+    _key = key;
+  }
+  return self;
+}
+
++ (instancetype)nodeWithValue:(id)value key:(id<NSCopying>)key
+{
+  return [[LRUCacheNode alloc] initWithValue:value key:key];
+}
+
+- (NSString *)description
+{
+  return [NSString stringWithFormat:@"%@ %@", self.value, self.next];
+}
+
+- (void)setNext:(LRUCacheNode *)next
+{
+  if (_next != next) {
+    _next = next;
+    next.prev = self;
+  }
+}
+
+@end

package/WebDriverAgentTests/IntegrationTests/FBSessionIntegrationTests.m

@@ -19,8 +19,6 @@
 
 @interface FBSession (Tests)
 
-@property (nonatomic) NSDictionary<NSString *, FBApplication *> *applications;
-
 @end
 
 @interface FBSessionIntegrationTests : FBIntegrationTestCase
@@ -36,7 +34,14 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 {
   [super setUp];
   [self launchApplication];
-  self.session = [FBSession initWithApplication:FBApplication.fb_activeApplication];
+  FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
+  self.session = [FBSession initWithApplication:app];
+}
+
+- (void)tearDown
+{
+  [self.session kill];
+  [super tearDown];
 }
 
 - (void)testSettingsAppCanBeOpenedInScopeOfTheCurrentSession
@@ -46,28 +51,28 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
                       shouldWaitForQuiescence:nil
                                     arguments:nil
                                   environment:nil];
-  XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:SETTINGS_BUNDLE_ID]);
   XCTAssertEqual([self.session applicationStateWithBundleId:SETTINGS_BUNDLE_ID], 4);
   [self.session activateApplicationWithBundleId:testedApp.bundleID];
-  XCTAssertEqualObjects(testedApp.bundleID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString: testedApp.bundleID]);
   XCTAssertEqual([self.session applicationStateWithBundleId:testedApp.bundleID], 4);
 }
 
 - (void)testSettingsAppCanBeReopenedInScopeOfTheCurrentSession
 {
-  FBApplication *systemApp = FBApplication.fb_systemApplication;
+  FBApplication *systemApp = self.springboard;
   [self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
                                   environment:nil];
-  FBAssertWaitTillBecomesTrue([SETTINGS_BUNDLE_ID isEqualToString:self.session.activeApplication.bundleID]);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:SETTINGS_BUNDLE_ID]);
   XCTAssertTrue([self.session terminateApplicationWithBundleId:SETTINGS_BUNDLE_ID]);
   FBAssertWaitTillBecomesTrue([systemApp.bundleID isEqualToString:self.session.activeApplication.bundleID]);
   [self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
                                   environment:nil];
-  XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:SETTINGS_BUNDLE_ID]);
 }
 
 - (void)testMainAppCanBeReactivatedInScopeOfTheCurrentSession
@@ -77,28 +82,27 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
                       shouldWaitForQuiescence:nil
                                     arguments:nil
                                   environment:nil];
-  XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:SETTINGS_BUNDLE_ID]);
   [self.session activateApplicationWithBundleId:testedApp.bundleID];
-  XCTAssertEqualObjects(testedApp.bundleID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:testedApp.bundleID]);
 }
 
 - (void)testMainAppCanBeRestartedInScopeOfTheCurrentSession
 {
-  FBApplication *systemApp = FBApplication.fb_systemApplication;
-  FBApplication *testedApp = FBApplication.fb_activeApplication;
-  XCTAssertTrue([self.session terminateApplicationWithBundleId:testedApp.bundleID]);
-  XCTAssertEqualObjects(systemApp.bundleID, self.session.activeApplication.bundleID);
+  FBApplication *systemApp = self.springboard;
+  FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
+  [self.session terminateApplicationWithBundleId:testedApp.bundleID];
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:systemApp.bundleID]);
   [self.session launchApplicationWithBundleId:testedApp.bundleID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
                                   environment:nil];
-  XCTAssertEqualObjects(testedApp.bundleID, self.session.activeApplication.bundleID);
+  FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:testedApp.bundleID]);
 }
 
 - (void)testLaunchUnattachedApp
 {
   [FBUnattachedAppLauncher launchAppWithBundleId:SETTINGS_BUNDLE_ID];
-  XCTAssertNil(self.session.applications[SETTINGS_BUNDLE_ID]);
   [self.session kill];
   XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, FBApplication.fb_activeApplication.bundleID);
 }

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -17,6 +17,7 @@
 #import "FBTestMacros.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "FBXCodeCompatibility.h"
 
 @interface XCUIApplicationHelperTests : FBIntegrationTestCase
 @end
@@ -90,7 +91,7 @@
 
 - (void)testTestmanagerdVersion
 {
-  XCTAssertGreaterThan([XCUIApplication fb_testmanagerdVersion], 0);
+  XCTAssertGreaterThan(FBTestmanagerdVersion(), 0);
 }
 
 @end