Restore FIRCLSSettingsTests.m

Author: paulb777

Crashlytics/UnitTests/FIRCLSSettingsTests.m

@@ -127,33 +127,27 @@ - (BOOL)writeSettings:(const NSString *)settings
 - (void)cacheSettingsWithGoogleAppID:(NSString *)googleAppID
                     currentTimestamp:(NSTimeInterval)currentTimestamp
                  expectedRemoveCount:(NSInteger)expectedRemoveCount {
+  self.fileManager.removeExpectation = [[XCTestExpectation alloc]
+      initWithDescription:@"FIRCLSMockFileManager.removeExpectation.cache"];
   self.fileManager.removeCount = 0;
-
-  XCTestExpectation *expectation =
-      [self expectationForNotification:FIRCLSMockFileManagerDidRemoveItemNotification
-                                object:nil
-                               handler:nil];
-  expectation.expectedFulfillmentCount = expectedRemoveCount;
+  self.fileManager.expectedRemoveCount = expectedRemoveCount;
 
   [self.settings cacheSettingsWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
-  [self waitForExpectations:@[ expectation ] timeout:16.0];
+  [self waitForExpectations:@[ self.fileManager.removeExpectation ] timeout:1];
 }
 
 - (void)reloadFromCacheWithGoogleAppID:(NSString *)googleAppID
                       currentTimestamp:(NSTimeInterval)currentTimestamp
                    expectedRemoveCount:(NSInteger)expectedRemoveCount {
+  self.fileManager.removeExpectation = [[XCTestExpectation alloc]
+      initWithDescription:@"FIRCLSMockFileManager.removeExpectation.reload"];
   self.fileManager.removeCount = 0;
-
-  XCTestExpectation *expectation =
-      [self expectationForNotification:FIRCLSMockFileManagerDidRemoveItemNotification
-                                object:nil
-                               handler:nil];
-  expectation.expectedFulfillmentCount = expectedRemoveCount;
+  self.fileManager.expectedRemoveCount = expectedRemoveCount;
 
   [self.settings reloadFromCacheWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
-  [self waitForExpectations:@[ expectation ] timeout:14.0];
+  [self waitForExpectations:@[ self.fileManager.removeExpectation ] timeout:5.0];
 }
 
 - (void)testActivatedSettingsCached {
@@ -211,6 +205,10 @@ - (void)testCacheExpiredFromTTL {
   [self writeSettings:FIRCLSTestSettingsActivated error:&error];
   XCTAssertNil(error, "%@", error);
 
+  // 1 delete for clearing the cache key, plus 2 for the deletes from reloading and clearing the
+  // cache and cache key
+  self.fileManager.expectedRemoveCount = 3;
+
   NSTimeInterval currentTimestamp = [NSDate timeIntervalSinceReferenceDate];
   [self.settings cacheSettingsWithGoogleAppID:TestGoogleAppID currentTimestamp:currentTimestamp];
 
@@ -240,6 +238,10 @@ - (void)testCacheExpiredFromBuildInstanceID {
   [self writeSettings:FIRCLSTestSettingsActivated error:&error];
   XCTAssertNil(error, "%@", error);
 
+  // 1 delete for clearing the cache key, plus 2 for the deletes from reloading and clearing the
+  // cache and cache key
+  self.fileManager.expectedRemoveCount = 3;
+
   NSTimeInterval currentTimestamp = [NSDate timeIntervalSinceReferenceDate];
   [self.settings cacheSettingsWithGoogleAppID:TestGoogleAppID currentTimestamp:currentTimestamp];
 
@@ -270,6 +272,10 @@ - (void)testCacheExpiredFromAppVersion {
   [self writeSettings:FIRCLSTestSettingsActivated error:&error];
   XCTAssertNil(error, "%@", error);
 
+  // 1 delete for clearing the cache key, plus 2 for the deletes from reloading and clearing the
+  // cache and cache key
+  self.fileManager.expectedRemoveCount = 3;
+
   NSTimeInterval currentTimestamp = [NSDate timeIntervalSinceReferenceDate];
   [self.settings cacheSettingsWithGoogleAppID:TestGoogleAppID currentTimestamp:currentTimestamp];
 
@@ -296,7 +302,6 @@ - (void)testCacheExpiredFromAppVersion {
   XCTAssertEqual(self.settings.errorLogBufferSize, 128000);
 }
 
-#ifdef FLAKY_TEST
 - (void)testGoogleAppIDChanged {
   NSError *error = nil;
   [self writeSettings:FIRCLSTestSettingsInverse error:&error];
@@ -382,7 +387,7 @@ - (void)testCorruptCache {
   // Cache them, and reload. Since it's corrupted we should delete it all
   [self cacheSettingsWithGoogleAppID:TestGoogleAppID
                     currentTimestamp:currentTimestamp
-                 expectedRemoveCount:3];
+                 expectedRemoveCount:2];
 
   // Should have default values because we deleted the cache and settingsDictionary
   XCTAssertEqual(self.settings.isCacheExpired, YES);
@@ -424,7 +429,6 @@ - (void)testCorruptCacheKey {
   XCTAssertEqual(self.settings.onDemandBackoffBase, 1.5);
   XCTAssertEqual(self.settings.onDemandBackoffStepDuration, 6);
 }
-#endif  // FLAKY_TEST
 
 - (void)testNewReportEndpointSettings {
   NSString *settingsJSON =

Crashlytics/UnitTests/Mocks/FIRCLSMockFileManager.h

@@ -24,4 +24,13 @@ extern NSNotificationName const FIRCLSMockFileManagerDidRemoveItemNotification;
 // Incremented when a remove happens with removeItemAtPath
 @property(nonatomic) NSInteger removeCount;
 
+// Number of calls to removeItemAtPath are expected for the unit test
+@property(nonatomic) NSInteger expectedRemoveCount;
+
+// Will be fulfilled when the expected number of removes have happened
+// using removeItemAtPath
+//
+// Users should initialize this in their test.
+@property(nonatomic, strong) XCTestExpectation *removeExpectation;
+
 @end

Crashlytics/UnitTests/Mocks/FIRCLSMockFileManager.m

@@ -40,6 +40,12 @@ - (BOOL)removeItemAtPath:(NSString *)path {
   @synchronized(self) {
     [self.fileSystemDict removeObjectForKey:path];
     self.removeCount += 1;
+
+    // If we set up the expectation, and we went over the expected count or removes, fulfill the
+    // expectation
+    if (self.removeExpectation && self.removeCount >= self.expectedRemoveCount) {
+      [self.removeExpectation fulfill];
+    }
   }
 
   [[NSNotificationCenter defaultCenter]