GULUserDefaults clear for all archs (#3544)

Author: paulb777

GoogleUtilities/Example/Tests/UserDefaults/GULUserDefaultsTests.m

@@ -23,11 +23,6 @@
 /// The maximum time to wait for an expectation before failing.
 static const NSTimeInterval kGULTestCaseTimeoutInterval = 10;
 
-@interface GULUserDefaults ()
-// Expose for testing.
-- (void)clearAllData;
-@end
-
 @interface GULUserDefaultsThreadArgs : NSObject
 
 /// The new user defaults to be tested on threads.
@@ -152,26 +147,6 @@ - (void)testNewUserDefaultsWithStandardUserDefaults {
   XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary2);
   XCTAssertEqualObjects([userDefaults objectForKey:key4], dictionary2);
 
-  // Remove all of the objects from the new user defaults. The values from the NSUserDefaults must
-  // also be cleared.
-  [newUserDefaults clearAllData];
-  XCTAssertNil([userDefaults objectForKey:key1]);
-  XCTAssertNil([newUserDefaults objectForKey:key1]);
-  XCTAssertNil([userDefaults objectForKey:key2]);
-  XCTAssertNil([newUserDefaults objectForKey:key2]);
-  XCTAssertNil([userDefaults objectForKey:key3]);
-  XCTAssertNil([newUserDefaults objectForKey:key3]);
-  XCTAssertNil([userDefaults objectForKey:key4]);
-  XCTAssertNil([newUserDefaults objectForKey:key4]);
-  XCTAssertNil([userDefaults objectForKey:key5]);
-  XCTAssertNil([newUserDefaults objectForKey:key5]);
-  XCTAssertNil([userDefaults objectForKey:key6]);
-  XCTAssertNil([newUserDefaults objectForKey:key6]);
-  XCTAssertNil([userDefaults objectForKey:key7]);
-  XCTAssertNil([newUserDefaults objectForKey:key7]);
-  XCTAssertNil([userDefaults objectForKey:key8]);
-  XCTAssertNil([newUserDefaults objectForKey:key8]);
-
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -385,24 +360,6 @@ - (void)testNewSharedUserDefaultsWithStandardUserDefaults {
   XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary2);
   XCTAssertEqualObjects([userDefaults objectForKey:key4], dictionary2);
 
-  // Remove all of the objects from the new user defaults. The values from the NSUserDefaults must
-  // also be cleared.
-  [newUserDefaults clearAllData];
-  XCTAssertNil([userDefaults objectForKey:key1]);
-  XCTAssertNil([newUserDefaults objectForKey:key1]);
-  XCTAssertNil([userDefaults objectForKey:key2]);
-  XCTAssertNil([newUserDefaults objectForKey:key2]);
-  XCTAssertNil([userDefaults objectForKey:key3]);
-  XCTAssertNil([newUserDefaults objectForKey:key3]);
-  XCTAssertNil([userDefaults objectForKey:key4]);
-  XCTAssertNil([newUserDefaults objectForKey:key4]);
-  XCTAssertNil([userDefaults objectForKey:key5]);
-  XCTAssertNil([newUserDefaults objectForKey:key5]);
-  XCTAssertNil([userDefaults objectForKey:key6]);
-  XCTAssertNil([newUserDefaults objectForKey:key6]);
-  XCTAssertNil([userDefaults objectForKey:key7]);
-  XCTAssertNil([newUserDefaults objectForKey:key7]);
-
   [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
 }
 
@@ -424,15 +381,14 @@ - (void)testUserDefaultNotifications {
   [newUserDefaults setObject:nil forKey:@"test-another"];
   XCTAssertNil([newUserDefaults objectForKey:@"test-another"]);
   [newUserDefaults synchronize];
-  [newUserDefaults clearAllData];
   [[NSNotificationCenter defaultCenter] removeObserver:observer];
 
   // Remove the underlying reference file.
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
 - (void)testSynchronizeToDisk {
-#if TARGET_OS_OSX
+#if TARGET_OS_OSX || TARGET_OS_MACCATALYST
   // `NSFileManager` has trouble reading the files in `~/Library` even though the
   // `removeItemAtPath:` call works. Watching Finder while stepping through this test shows that the
   // file does get created and removed properly. When using LLDB to call `fileExistsAtPath:` the
@@ -458,7 +414,6 @@ - (void)testSynchronizeToDisk {
 
   // Now get the file directly from disk.
   XCTAssertTrue([fileManager fileExistsAtPath:filePath]);
-  [newUserDefaults clearAllData];
   [newUserDefaults synchronize];
 
   [self removePreferenceFileWithSuiteName:suiteName];
@@ -500,7 +455,6 @@ - (void)testSetNilObject {
 
   [newUserDefaults setObject:nil forKey:@"fine"];
   XCTAssertNil([newUserDefaults objectForKey:@"fine"]);
-  [newUserDefaults clearAllData];
 
   [self removePreferenceFileWithSuiteName:suiteName];
 }
@@ -513,7 +467,6 @@ - (void)testRemoveObject {
 
   [newUserDefaults removeObjectForKey:@"fine"];
   XCTAssertNil([newUserDefaults objectForKey:@"fine"]);
-  [newUserDefaults clearAllData];
 
   [self removePreferenceFileWithSuiteName:suiteName];
 }
@@ -535,7 +488,6 @@ - (void)testNewUserDefaultsWithNSUserDefaultsFile {
   GULUserDefaults *newUserDefaults = [[GULUserDefaults alloc] initWithSuiteName:suiteName];
   XCTAssertEqualObjects([newUserDefaults objectForKey:@"key1"], @"value1");
   XCTAssertEqualObjects([newUserDefaults objectForKey:@"key2"], @"value2");
-  [newUserDefaults clearAllData];
 
   // Clean up.
   [self removePreferenceFileWithSuiteName:suiteName];
@@ -572,7 +524,6 @@ - (void)testNewUserDefaultsThreadSafeAddingObjects {
     XCTAssertEqualObjects([userDefaults objectForKey:key], @(i));
   }
 
-  [userDefaults clearAllData];
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -616,7 +567,6 @@ - (void)testNewUserDefaultsRemovingObjects {
     XCTAssertNil([userDefaults objectForKey:key]);
   }
 
-  [userDefaults clearAllData];
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -661,8 +611,6 @@ - (void)testNewUserDefaultsRemovingSomeObjects {
       XCTAssertEqualObjects([userDefaults objectForKey:key], @(i));
     }
   }
-  [userDefaults clearAllData];
-
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -702,8 +650,6 @@ - (void)testBothUserDefaultsThreadSafeAddingObjects {
       XCTAssertEqualObjects([userDefaults objectForKey:key], @(i));
     }
   }
-
-  [newUserDefaults clearAllData];
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -760,8 +706,6 @@ - (void)testBothUserDefaultsRemovingSomeObjects {
       }
     }
   }
-  [userDefaults clearAllData];
-
   [self removePreferenceFileWithSuiteName:suiteName];
 }
 
@@ -835,6 +779,9 @@ - (NSString *)filePathForPreferencesName:(NSString *)preferencesName {
 }
 
 - (void)removePreferenceFileWithSuiteName:(NSString *)suiteName {
+  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:suiteName];
+  [userDefaults removePersistentDomainForName:suiteName];
+
   NSString *path = [self filePathForPreferencesName:suiteName];
   NSFileManager *fileManager = [NSFileManager defaultManager];
   if ([fileManager fileExistsAtPath:path]) {

GoogleUtilities/UserDefaults/GULUserDefaults.m

@@ -195,28 +195,6 @@ - (void)synchronize {
 
 #pragma mark - Private methods
 
-/// Removes all values from the search list entry specified by 'domainName', the current user, and
-/// any host. The change is persistent. Equivalent to -removePersistentDomainForName: of
-/// NSUserDefaults.
-- (void)clearAllData {
-  // On macOS, using `kCFPreferencesCurrentHost` will not set all the keys necessary to match
-  // `NSUserDefaults`.
-#if TARGET_OS_OSX
-  CFStringRef host = kCFPreferencesAnyHost;
-#else
-  CFStringRef host = kCFPreferencesCurrentHost;
-#endif  // TARGET_OS_OSX
-
-  CFArrayRef keyList = CFPreferencesCopyKeyList(_appNameRef, kCFPreferencesCurrentUser, host);
-  if (!keyList) {
-    return;
-  }
-
-  CFPreferencesSetMultiple(NULL, keyList, _appNameRef, kCFPreferencesCurrentUser, host);
-  CFRelease(keyList);
-  [self scheduleSynchronize];
-}
-
 - (void)scheduleSynchronize {
   // Synchronize data using a timer so that multiple set... calls can be coalesced under one
   // synchronize.