appium-webdriveragent 9.0.4 → 9.0.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [9.0.6](https://github.com/appium/WebDriverAgent/compare/v9.0.5...v9.0.6) (2025-02-28)
+
+### Bug Fixes
+
+* optimize LRU cache ([#985](https://github.com/appium/WebDriverAgent/issues/985)) ([46dc417](https://github.com/appium/WebDriverAgent/commit/46dc417da9f4a843838b414c0b154d6f478dbc0b))
+
+## [9.0.5](https://github.com/appium/WebDriverAgent/compare/v9.0.4...v9.0.5) (2025-02-26)
+
+### Bug Fixes
+
+* add autorelease pool to drain temporary objects ([#983](https://github.com/appium/WebDriverAgent/issues/983)) ([f92f1cd](https://github.com/appium/WebDriverAgent/commit/f92f1cde0fe914086103a110844bbe3bc0e3c4a6))
+
 ## [9.0.4](https://github.com/appium/WebDriverAgent/compare/v9.0.3...v9.0.4) (2025-02-21)
 
 ### Bug Fixes

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -238,9 +238,11 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
   if ([childElements count]) {
     info[@"children"] = [[NSMutableArray alloc] init];
     for (id<FBXCElementSnapshot> childSnapshot in childElements) {
-      [info[@"children"] addObject:[self dictionaryForElement:childSnapshot 
-                                                    recursive:YES
-                                           excludedAttributes:excludedAttributes]];
+      @autoreleasepool {
+        [info[@"children"] addObject:[self dictionaryForElement:childSnapshot
+                                                      recursive:YES
+                                             excludedAttributes:excludedAttributes]];
+      }
     }
   }
   return info;
@@ -262,9 +264,11 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
   } else {
     NSMutableArray *children = [[NSMutableArray alloc] init];
     for (id<FBXCElementSnapshot> childSnapshot in snapshot.children) {
-      NSDictionary *childInfo = [self accessibilityInfoForElement:childSnapshot];
-      if ([childInfo count]) {
-        [children addObject: childInfo];
+      @autoreleasepool {
+        NSDictionary *childInfo = [self accessibilityInfoForElement:childSnapshot];
+        if ([childInfo count]) {
+          [children addObject: childInfo];
+        }
       }
     }
     if ([children count]) {
@@ -420,31 +424,33 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
   [invocation setSelector:selector];
   [invocation setArgument:&auditTypes atIndex:2];
   BOOL (^issueHandler)(id) = ^BOOL(id issue) {
-    NSString *auditType = @"";
-    NSDictionary *valuesToNamesMap = auditTypeValuesToNames();
-    NSNumber *auditTypeValue = [issue valueForKey:@"auditType"];
-    if (nil != auditTypeValue) {
-      auditType = valuesToNamesMap[auditTypeValue] ?: [auditTypeValue stringValue];
-    }
-    
-    id extractedElement = extractIssueProperty(issue, @"element");
-    
-    id<FBXCElementSnapshot> elementSnapshot = [extractedElement fb_cachedSnapshot] ?: [extractedElement fb_takeSnapshot:NO];
-    NSDictionary *elementAttributes = elementSnapshot
+    @autoreleasepool {
+      NSString *auditType = @"";
+      NSDictionary *valuesToNamesMap = auditTypeValuesToNames();
+      NSNumber *auditTypeValue = [issue valueForKey:@"auditType"];
+      if (nil != auditTypeValue) {
+        auditType = valuesToNamesMap[auditTypeValue] ?: [auditTypeValue stringValue];
+      }
+      
+      id extractedElement = extractIssueProperty(issue, @"element");
+      
+      id<FBXCElementSnapshot> elementSnapshot = [extractedElement fb_cachedSnapshot] ?: [extractedElement fb_takeSnapshot:NO];
+      NSDictionary *elementAttributes = elementSnapshot
       ? [self.class dictionaryForElement:elementSnapshot
                                recursive:NO
                       excludedAttributes:customAttributesToExclude]
       : @{};
-    
-    [resultArray addObject:@{
-      @"detailedDescription": extractIssueProperty(issue, @"detailedDescription") ?: @"",
-      @"compactDescription": extractIssueProperty(issue, @"compactDescription") ?: @"",
-      @"auditType": auditType,
-      @"element": [extractedElement description] ?: @"",
-      @"elementDescription": [extractedElement debugDescription] ?: @"",
-      @"elementAttributes": elementAttributes ?: @{},
-    }];
-    return YES;
+      
+      [resultArray addObject:@{
+        @"detailedDescription": extractIssueProperty(issue, @"detailedDescription") ?: @"",
+        @"compactDescription": extractIssueProperty(issue, @"compactDescription") ?: @"",
+        @"auditType": auditType,
+        @"element": [extractedElement description] ?: @"",
+        @"elementDescription": [extractedElement debugDescription] ?: @"",
+        @"elementAttributes": elementAttributes ?: @{},
+      }];
+      return YES;
+    }
   };
   [invocation setArgument:&issueHandler atIndex:3];
   [invocation setArgument:&error atIndex:4];

package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m

@@ -121,7 +121,9 @@
 {
   NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
                                                                  NSDictionary<NSString *,id> * _Nullable bindings) {
-    return [[FBXCElementSnapshotWrapper wdNameWithSnapshot:snapshot] isEqualToString:accessibilityId];
+    @autoreleasepool {
+      return [[FBXCElementSnapshotWrapper wdNameWithSnapshot:snapshot] isEqualToString:accessibilityId];
+    }
   }];
   return [self fb_descendantsMatchingPredicate:predicate
                    shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -25,8 +25,10 @@ NSNumber* _Nullable fetchSnapshotVisibility(id<FBXCElementSnapshot> snapshot)
 
 - (BOOL)fb_isVisible
 {
-  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO];
-  return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_isVisible;
+  @autoreleasepool {
+    id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO];
+    return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_isVisible;
+  }
 }
 
 @end
@@ -64,7 +66,9 @@ NSNumber* _Nullable fetchSnapshotVisibility(id<FBXCElementSnapshot> snapshot)
     NSMutableDictionary *updatedValue = [NSMutableDictionary dictionaryWithDictionary:self.additionalAttributes ?: @{}];
     [updatedValue setObject:attributeValue forKey:FB_XCAXAIsVisibleAttribute];
     self.snapshot.additionalAttributes = updatedValue.copy;
-    return [attributeValue boolValue];
+    @autoreleasepool {
+      return [attributeValue boolValue];
+    }
   }
 
   NSLog(@"Cannot determine visiblity of %@ natively: %@. Defaulting to: %@",

package/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m

@@ -38,11 +38,13 @@ static char XCUIELEMENT_IS_RESOLVED_NATIVELY_KEY;
     return self;
   }
   NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K = %@", FBStringify(FBXCElementSnapshotWrapper, fb_uid), uid];
-  XCUIElementQuery *query = [self.application.fb_query descendantsMatchingType:XCUIElementTypeAny];
-  XCUIElement *result = [query matchingPredicate:predicate].allElementsBoundByIndex.firstObject;
-  if (nil != result) {
-    result.fb_isResolvedNatively = @NO;
-    return result;
+  @autoreleasepool {
+    XCUIElementQuery *query = [self.application.fb_query descendantsMatchingType:XCUIElementTypeAny];
+    XCUIElement *result = [query matchingPredicate:predicate].allElementsBoundByIndex.firstObject;
+    if (nil != result) {
+      result.fb_isResolvedNatively = @NO;
+      return result;
+    }
   }
   return self;
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m

@@ -178,23 +178,25 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   FBXCElementSnapshotWrapper *scrollViewWrapped = [FBXCElementSnapshotWrapper ensureWrapped:scrollView];
   // Scrolling till cell is visible and get current value of frames
   while (![self fb_isEquivalentElementSnapshotVisible:prescrollSnapshot] && scrollCount < maxScrollCount) {
-    if (targetCellIndex < visibleCellIndex) {
-      scrollDirection == FBXCUIElementScrollDirectionVertical ?
-        [scrollViewWrapped fb_scrollUpByNormalizedDistance:normalizedScrollDistance
-                                             inApplication:self.application] :
-        [scrollViewWrapped fb_scrollLeftByNormalizedDistance:normalizedScrollDistance
-                                               inApplication:self.application];
-    }
-    else {
-      scrollDirection == FBXCUIElementScrollDirectionVertical ?
-        [scrollViewWrapped fb_scrollDownByNormalizedDistance:normalizedScrollDistance
+    @autoreleasepool {
+      if (targetCellIndex < visibleCellIndex) {
+        scrollDirection == FBXCUIElementScrollDirectionVertical ?
+          [scrollViewWrapped fb_scrollUpByNormalizedDistance:normalizedScrollDistance
                                                inApplication:self.application] :
-        [scrollViewWrapped fb_scrollRightByNormalizedDistance:normalizedScrollDistance
-                                                inApplication:self.application];
+          [scrollViewWrapped fb_scrollLeftByNormalizedDistance:normalizedScrollDistance
+                                                 inApplication:self.application];
+      }
+      else {
+        scrollDirection == FBXCUIElementScrollDirectionVertical ?
+          [scrollViewWrapped fb_scrollDownByNormalizedDistance:normalizedScrollDistance
+                                                 inApplication:self.application] :
+          [scrollViewWrapped fb_scrollRightByNormalizedDistance:normalizedScrollDistance
+                                                  inApplication:self.application];
+      }
+      scrollCount++;
+      // Wait for scroll animation
+      [self fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
     }
-    scrollCount++;
-    // Wait for scroll animation
-    [self fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
   }
 
   if (scrollCount >= maxScrollCount) {

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -46,22 +46,26 @@
 
 - (id<FBXCElementSnapshot>)fb_takeSnapshot:(BOOL)inDepth
 {
-  NSError *error = nil;
-  self.lastSnapshot = inDepth
-    ? [self.fb_query fb_uniqueSnapshotWithError:&error]
-    : (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
-  if (nil == self.lastSnapshot) {
-    NSString *hintText = @"Make sure the application UI has the expected state";
-    if (nil != error && [error.localizedDescription containsString:@"Identity Binding"]) {
-      hintText = [NSString stringWithFormat:@"%@. You could also try to switch the binding strategy using the 'boundElementsByIndex' setting for the element lookup", hintText];
+  __block id<FBXCElementSnapshot> snapshot = nil;
+  @autoreleasepool {
+    NSError *error = nil;
+    snapshot = inDepth
+      ? [self.fb_query fb_uniqueSnapshotWithError:&error]
+      : (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
+    if (nil == snapshot) {
+      NSString *hintText = @"Make sure the application UI has the expected state";
+      if (nil != error && [error.localizedDescription containsString:@"Identity Binding"]) {
+        hintText = [NSString stringWithFormat:@"%@. You could also try to switch the binding strategy using the 'boundElementsByIndex' setting for the element lookup", hintText];
+      }
+      NSString *reason = [NSString stringWithFormat:@"The previously found element \"%@\" is not present in the current view anymore. %@",
+                          self.description, hintText];
+      if (nil != error) {
+        reason = [NSString stringWithFormat:@"%@. Original error: %@", reason, error.localizedDescription];
+      }
+      @throw [NSException exceptionWithName:FBStaleElementException reason:reason userInfo:@{}];
     }
-    NSString *reason = [NSString stringWithFormat:@"The previously found element \"%@\" is not present in the current view anymore. %@",
-                        self.description, hintText];
-    if (nil != error) {
-      reason = [NSString stringWithFormat:@"%@. Original error: %@", reason, error.localizedDescription];
-    }
-    @throw [NSException exceptionWithName:FBStaleElementException reason:reason userInfo:@{}];
   }
+  self.lastSnapshot = snapshot;
   return self.lastSnapshot;
 }
 
@@ -78,9 +82,11 @@
   }
   NSMutableArray<NSString *> *matchedIds = [NSMutableArray new];
   for (id<FBXCElementSnapshot> snapshot in snapshots) {
-    NSString *uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
-    if (nil != uid) {
-      [matchedIds addObject:uid];
+    @autoreleasepool {
+      NSString *uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
+      if (nil != uid) {
+        [matchedIds addObject:uid];
+      }
     }
   }
   NSMutableArray<XCUIElement *> *matchedElements = [NSMutableArray array];

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>9.0.4</string>
+    <string>9.0.6</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>9.0.4</string>
+    <string>9.0.6</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Routing/FBElementCache.m

@@ -73,7 +73,17 @@ const int ELEMENT_CACHE_SIZE = 1024;
     @throw [NSException exceptionWithName:FBStaleElementException reason:reason userInfo:@{}];
   }
   if (checkStaleness) {
-    [element fb_takeSnapshot:NO];
+    @try {
+      [element fb_takeSnapshot:NO];
+    } @catch (NSException *exception) {
+      //  if the snapshot method threw FBStaleElementException (implying the element is stale) we need to explicitly remove it from the cache, PR: https://github.com/appium/WebDriverAgent/pull/985
+      if ([exception.name isEqualToString:FBStaleElementException]) {
+        @synchronized (self.elementCache) {
+          [self.elementCache removeObjectForKey:uuid];
+        }
+      }
+      @throw exception;
+    }
   }
   return element;
 }

package/WebDriverAgentLib/Routing/FBResponsePayload.m

@@ -103,35 +103,40 @@ id<FBResponsePayload> FBResponseWithStatus(FBCommandStatus *status)
 
 inline NSDictionary *FBDictionaryResponseWithElement(XCUIElement *element, BOOL compact)
 {
-  id<FBXCElementSnapshot> snapshot = element.lastSnapshot ?: element.fb_cachedSnapshot ?: [element fb_takeSnapshot:YES];
-  NSDictionary *compactResult = FBToElementDict((NSString *)[FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot]);
-  if (compact) {
-    return compactResult;
-  }
+  __block NSDictionary *elementResponse = nil;
+  @autoreleasepool {
+    id<FBXCElementSnapshot> snapshot = element.lastSnapshot ?: element.fb_cachedSnapshot ?: [element fb_takeSnapshot:YES];
+    NSDictionary *compactResult = FBToElementDict((NSString *)[FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot]);
+    if (compact) {
+      elementResponse = compactResult;
+      return elementResponse;
+    }
 
-  NSMutableDictionary *result = compactResult.mutableCopy;
-  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
-  NSArray *fields = [FBConfiguration.elementResponseAttributes componentsSeparatedByString:@","];
-  for (NSString *field in fields) {
-    // 'name' here is the w3c-approved identifier for what we mean by 'type'
-    if ([field isEqualToString:@"name"] || [field isEqualToString:@"type"]) {
-      result[field] = wrappedSnapshot.wdType;
-    } else if ([field isEqualToString:@"text"]) {
-      result[field] = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel) ?: [NSNull null];
-    } else if ([field isEqualToString:@"rect"]) {
-      result[field] = wrappedSnapshot.wdRect;
-    } else if ([field isEqualToString:@"enabled"]) {
-      result[field] = @(wrappedSnapshot.wdEnabled);
-    } else if ([field isEqualToString:@"displayed"]) {
-      result[field] = @(wrappedSnapshot.wdVisible);
-    } else if ([field isEqualToString:@"selected"]) {
-      result[field] = @(wrappedSnapshot.wdSelected);
-    } else if ([field isEqualToString:@"label"]) {
-      result[field] = wrappedSnapshot.wdLabel ?: [NSNull null];
-    } else if ([field hasPrefix:arbitraryAttrPrefix]) {
-      NSString *attributeName = [field substringFromIndex:[arbitraryAttrPrefix length]];
-      result[field] = [wrappedSnapshot fb_valueForWDAttributeName:attributeName] ?: [NSNull null];
+    NSMutableDictionary *result = compactResult.mutableCopy;
+    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+    NSArray *fields = [FBConfiguration.elementResponseAttributes componentsSeparatedByString:@","];
+    for (NSString *field in fields) {
+      // 'name' here is the w3c-approved identifier for what we mean by 'type'
+      if ([field isEqualToString:@"name"] || [field isEqualToString:@"type"]) {
+        result[field] = wrappedSnapshot.wdType;
+      } else if ([field isEqualToString:@"text"]) {
+        result[field] = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel) ?: [NSNull null];
+      } else if ([field isEqualToString:@"rect"]) {
+        result[field] = wrappedSnapshot.wdRect;
+      } else if ([field isEqualToString:@"enabled"]) {
+        result[field] = @(wrappedSnapshot.wdEnabled);
+      } else if ([field isEqualToString:@"displayed"]) {
+        result[field] = @(wrappedSnapshot.wdVisible);
+      } else if ([field isEqualToString:@"selected"]) {
+        result[field] = @(wrappedSnapshot.wdSelected);
+      } else if ([field isEqualToString:@"label"]) {
+        result[field] = wrappedSnapshot.wdLabel ?: [NSNull null];
+      } else if ([field hasPrefix:arbitraryAttrPrefix]) {
+        NSString *attributeName = [field substringFromIndex:[arbitraryAttrPrefix length]];
+        result[field] = [wrappedSnapshot fb_valueForWDAttributeName:attributeName] ?: [NSNull null];
+      }
     }
+    elementResponse = result.copy;
   }
-  return result.copy;
+  return elementResponse;
 }

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -364,7 +364,7 @@ static NSString *const topNodeIndexPath = @"top";
 {
   NSAssert((indexPath == nil && elementStore == nil) || (indexPath != nil && elementStore != nil), @"Either both or none of indexPath and elementStore arguments should be equal to nil", nil);
 
-  id<FBXCElementSnapshot> currentSnapshot;
+  __block id<FBXCElementSnapshot> currentSnapshot;
   NSArray<id<FBXCElementSnapshot>> *children;
   if ([root isKindOfClass:XCUIElement.class]) {
     XCUIElement *element = (XCUIElement *)root;
@@ -373,7 +373,9 @@ static NSString *const topNodeIndexPath = @"top";
       // then the snapshot retrieval operation might freeze and time out
       [element.application fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
     }
-    currentSnapshot = [element fb_takeSnapshot:YES];
+    @autoreleasepool {
+      currentSnapshot = [element fb_takeSnapshot:YES];
+    }
     children = currentSnapshot.children;
   } else {
     currentSnapshot = (id<FBXCElementSnapshot>)root;
@@ -400,18 +402,20 @@ static NSString *const topNodeIndexPath = @"top";
   }
 
   for (NSUInteger i = 0; i < [children count]; i++) {
-    id<FBXCElementSnapshot> childSnapshot = [children objectAtIndex:i];
-    NSString *newIndexPath = (indexPath != nil) ? [indexPath stringByAppendingFormat:@",%lu", (unsigned long)i] : nil;
-    if (elementStore != nil && newIndexPath != nil) {
-      [elementStore setObject:childSnapshot forKey:(id)newIndexPath];
-    }
-    rc = [self writeXmlWithRootElement:[FBXCElementSnapshotWrapper ensureWrapped:childSnapshot]
-                             indexPath:newIndexPath
-                          elementStore:elementStore
-                    includedAttributes:includedAttributes
-                                writer:writer];
-    if (rc < 0) {
-      return rc;
+    @autoreleasepool {
+      id<FBXCElementSnapshot> childSnapshot = [children objectAtIndex:i];
+      NSString *newIndexPath = (indexPath != nil) ? [indexPath stringByAppendingFormat:@",%lu", (unsigned long)i] : nil;
+      if (elementStore != nil && newIndexPath != nil) {
+        [elementStore setObject:childSnapshot forKey:(id)newIndexPath];
+      }
+      rc = [self writeXmlWithRootElement:[FBXCElementSnapshotWrapper ensureWrapped:childSnapshot]
+                               indexPath:newIndexPath
+                            elementStore:elementStore
+                      includedAttributes:includedAttributes
+                                  writer:writer];
+      if (rc < 0) {
+        return rc;
+      }
     }
   }
 

package/WebDriverAgentLib/Utilities/LRUCache/LRUCache.h

@@ -54,6 +54,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSArray *)allObjects;
 
+/**
+ Removes the object associated with the specified key from the cache.
+
+ @param key The key identifying the object to remove.
+ */
+- (void)removeObjectForKey:(id<NSCopying>)key;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/LRUCache/LRUCache.m

@@ -135,4 +135,12 @@
   }
 }
 
+- (void)removeObjectForKey:(id<NSCopying>)key
+{
+  LRUCacheNode *node = self.store[key];
+  if (node != nil) {
+    [self removeNode:node];
+  }
+}
+
 @end

package/WebDriverAgentLib/Utilities/NSPredicate+FBFormat.m

@@ -59,8 +59,10 @@
   NSPredicate *wdPredicate = [self.class fb_formatSearchPredicate:input];
   return [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject,
                                                NSDictionary<NSString *,id> * _Nullable bindings) {
-    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:evaluatedObject];
-    return [wdPredicate evaluateWithObject:wrappedSnapshot];
+    @autoreleasepool {
+      FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:evaluatedObject];
+      return [wdPredicate evaluateWithObject:wrappedSnapshot];
+    }
   }];
 }
 

package/WebDriverAgentTests/UnitTests/FBLRUCacheTests.m

@@ -96,4 +96,33 @@
   XCTAssertEqualObjects(@[@(count)], cache.allObjects);
 }
 
+- (void)testRemoveExistingObjectForKey {
+    LRUCache *cache = [[LRUCache alloc] initWithCapacity:3];
+    [cache setObject:@"foo" forKey:@"bar"];
+    [cache setObject:@"foo2" forKey:@"bar2"];
+    [cache setObject:@"foo3" forKey:@"bar3"];
+    [self assertArray:@[@"foo3", @"foo2", @"foo"] equalsTo:cache.allObjects];
+    [cache removeObjectForKey:@"bar2"];
+    XCTAssertNil([cache objectForKey:@"bar2"]);
+    [self assertArray:@[@"foo3", @"foo"] equalsTo:cache.allObjects];
+}
+
+- (void)testRemoveNonExistingObjectForKey {
+    LRUCache *cache = [[LRUCache alloc] initWithCapacity:2];
+    [cache setObject:@"foo" forKey:@"bar"];
+    [cache removeObjectForKey:@"nonExisting"];
+    XCTAssertNotNil([cache objectForKey:@"bar"]);
+    [self assertArray:@[@"foo"] equalsTo:cache.allObjects];
+}
+
+- (void)testRemoveAndInsertFlow {
+    LRUCache *cache = [[LRUCache alloc] initWithCapacity:2];
+    [cache setObject:@"foo" forKey:@"bar"];
+    [cache setObject:@"foo2" forKey:@"bar2"];
+    [cache removeObjectForKey:@"bar"];
+    XCTAssertNil([cache objectForKey:@"bar"]);
+    [cache setObject:@"foo3" forKey:@"bar3"];
+    [self assertArray:@[@"foo3", @"foo2"] equalsTo:cache.allObjects];
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "9.0.4",
+  "version": "9.0.6",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",