Remove PFEventuallyQueueTestHelper because (1) it was causing memory leaks in production code, and (2) it wasn't actually used in any tests. (#1188)

Author: charliewilliams

Parse/Internal/PFEventuallyQueue.h

@@ -16,7 +16,6 @@
 
 @class BFTask<__covariant BFGenericType>;
 @class PFEventuallyPin;
-@class PFEventuallyQueueTestHelper;
 @class PFObject;
 @protocol PFCommandRunnerProvider;
 
@@ -39,9 +38,6 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 @property (atomic, assign, readonly) BOOL monitorsReachability PF_WATCH_UNAVAILABLE;
 @property (nonatomic, assign, readonly, getter=isConnected) BOOL connected;
 
-// Gets notifications of various events happening in the command cache, so that tests can be synchronized.
-@property (nonatomic, strong, readonly) PFEventuallyQueueTestHelper *testHelper;
-
 ///--------------------------------------
 #pragma mark - Init
 ///--------------------------------------
@@ -71,26 +67,3 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 - (void)removeAllCommands NS_REQUIRES_SUPER;
 
 @end
-
-typedef enum {
-    PFEventuallyQueueEventCommandEnqueued, // A command was placed into the queue.
-    PFEventuallyQueueEventCommandNotEnqueued, // A command could not be placed into the queue.
-
-    PFEventuallyQueueEventCommandSucceded, // A command has successfully running on the server.
-    PFEventuallyQueueEventCommandFailed, // A command has failed on the server.
-
-    PFEventuallyQueueEventObjectUpdated, // An object's data was updated after a command completed.
-    PFEventuallyQueueEventObjectRemoved, // An object was removed because it was deleted before creation.
-
-    PFEventuallyQueueEventCount // The total number of items in this enum.
-} PFEventuallyQueueTestHelperEvent;
-
-@interface PFEventuallyQueueTestHelper : NSObject {
-    dispatch_semaphore_t events[PFEventuallyQueueEventCount];
-}
-
-- (void)clear;
-- (void)notify:(PFEventuallyQueueTestHelperEvent)event;
-- (BOOL)waitFor:(PFEventuallyQueueTestHelperEvent)event;
-
-@end

Parse/Internal/PFEventuallyQueue.m

@@ -73,7 +73,6 @@ - (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource
     _commandEnqueueTaskQueue = [[PFTaskQueue alloc] init];
 
     _taskCompletionSources = [NSMutableDictionary dictionary];
-    _testHelper = [[PFEventuallyQueueTestHelper alloc] init];
 
     [self _startMonitoringNetworkReachability];
 
@@ -103,14 +102,11 @@ - (BFTask *)enqueueCommandInBackground:(id<PFNetworkCommand>)command withObject:
                                                 object:object
                                             identifier:identifier] continueWithBlock:^id(BFTask *task) {
                 if (task.faulted || task.cancelled) {
-                    [self.testHelper notify:PFEventuallyQueueEventCommandNotEnqueued];
                     if (task.error) {
                         taskCompletionSource.error = task.error;
                     } else if (task.cancelled) {
                         [taskCompletionSource cancel];
                     }
-                } else {
-                    [self.testHelper notify:PFEventuallyQueueEventCommandEnqueued];
                 }
 
                 return task;
@@ -337,12 +333,6 @@ - (BFTask *)_didFinishRunningCommand:(id<PFNetworkCommand>)command
         [_taskCompletionSources removeObjectForKey:identifier];
     });
 
-    if (resultTask.faulted || resultTask.cancelled) {
-        [self.testHelper notify:PFEventuallyQueueEventCommandFailed];
-    } else {
-        [self.testHelper notify:PFEventuallyQueueEventCommandSucceded];
-    }
-
     return resultTask;
 }
 
@@ -437,11 +427,6 @@ - (int)_commandsInMemory {
     return (int)_taskCompletionSources.count;
 }
 
-/** Called by PFObject whenever an object has been updated after a saveEventually. */
-- (void)_notifyTestHelperObjectUpdated {
-    [self.testHelper notify:PFEventuallyQueueEventObjectUpdated];
-}
-
 - (void)_setMaxAttemptsCount:(NSUInteger)attemptsCount {
     _maxAttemptsCount = attemptsCount;
 }
@@ -465,33 +450,3 @@ - (void)reachability:(PFReachability *)reachability didChangeReachabilityState:(
 #endif
 
 @end
-
-// PFEventuallyQueueTestHelper gets notifications of various events happening in the command cache,
-// so that tests can be synchronized. See CommandTests.m for examples of how to use this.
-
-@implementation PFEventuallyQueueTestHelper
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self clear];
-    }
-    return self;
-}
-
-- (void)clear {
-    for (int i = 0; i < PFEventuallyQueueEventCount; ++i) {
-        events[i] = dispatch_semaphore_create(0);
-    }
-}
-
-- (void)notify:(PFEventuallyQueueTestHelperEvent)event {
-    dispatch_semaphore_signal(events[event]);
-}
-
-- (BOOL)waitFor:(PFEventuallyQueueTestHelperEvent)event {
-    // Wait 1 second for a permit from the semaphore.
-    return (dispatch_semaphore_wait(events[event], dispatch_time(DISPATCH_TIME_NOW, 10LL * NSEC_PER_SEC)) == 0);
-}
-
-@end

Parse/Internal/PFEventuallyQueue_Private.h

@@ -64,20 +64,7 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 - (void)_startMonitoringNetworkReachability;
 - (void)_stopMonitoringNetworkReachability;
 
-///--------------------------------------
-#pragma mark - Test Helper
-///--------------------------------------
-
-- (void)_setMaxAttemptsCount:(NSUInteger)attemptsCount;
-
-- (void)_setRetryInterval:(NSTimeInterval)retryInterval;
-
 - (void)_simulateReboot NS_REQUIRES_SUPER;
-
-- (int)_commandsInMemory;
-
-- (void)_notifyTestHelperObjectUpdated;
-
 @end
 
 @protocol PFEventuallyQueueSubclass <NSObject>

Parse/PFObject.m

@@ -1098,7 +1098,7 @@ - (BFTask *)_enqueueSaveEventuallyWithChildren:(BOOL)saveChildren {
                         }
                         return task;
                     } @finally {
-                        [[Parse _currentManager].eventuallyQueue _notifyTestHelperObjectUpdated];
+                       
                     }
                 }];
                 return [BFTask taskWithResult:saveTask];