Fixes self references in blocks in tests (#1267)

Author: flovilmart

Parse/Tests/Other/Cache/TestCache.m

@@ -31,27 +31,27 @@ - (instancetype)init {
 - (id)objectForKey:(id)key {
     __block id results = nil;
     dispatch_sync(_queue, ^{
-        results = _cache[key];
+        results = self->_cache[key];
     });
 
     return results;
 }
 
 - (void)setObject:(id)object forKey:(id)aKey {
     dispatch_sync(_queue, ^{
-        _cache[aKey] = object;
+        self->_cache[aKey] = object;
     });
 }
 
 - (void)removeObjectForKey:(id)aKey {
     dispatch_sync(_queue, ^{
-        [_cache removeObjectForKey:aKey];
+        [self->_cache removeObjectForKey:aKey];
     });
 }
 
 - (void)removeAllObjects {
     dispatch_sync(_queue, ^{
-        [_cache removeAllObjects];
+        [self->_cache removeAllObjects];
     });
 }
 

Parse/Tests/Other/FileManager/TestFileManager.m

@@ -49,7 +49,7 @@ - (instancetype)init {
 - (NSData *)contentsAtPath:(NSString *)path {
     __block NSData *results = nil;
     dispatch_sync(_queue, ^{
-        results = _fileContents[path];
+        results = self->_fileContents[path];
     });
 
     return results;
@@ -58,22 +58,22 @@ - (NSData *)contentsAtPath:(NSString *)path {
 - (BOOL)createFileAtPath:(NSString *)path contents:(NSData *)data attributes:(NSDictionary *)attributes {
     dispatch_sync(_queue, ^{
         NSMutableDictionary *newAttributes = [NSMutableDictionary dictionaryWithDictionary:attributes];
-        NSDate *date = [NSDate dateWithTimeIntervalSince1970:_lastReturnedTime++];
+        NSDate *date = [NSDate dateWithTimeIntervalSince1970:self->_lastReturnedTime++];
 
         newAttributes[NSFileModificationDate] = newAttributes[NSURLContentModificationDateKey] = date;
         newAttributes[NSFileSize] = @([data length]);
 
-        _fileContents[path] = data;
-        [_fileAttributes setObject:newAttributes forKey:path];
+        self->_fileContents[path] = data;
+        [self->_fileAttributes setObject:newAttributes forKey:path];
 
     });
     return YES;
 }
 
 - (BOOL)removeItemAtURL:(NSURL *)URL error:(NSError **)error {
     dispatch_sync(_queue, ^{
-        [_fileContents removeObjectForKey:URL.path];
-        [_fileAttributes removeObjectForKey:URL.path];
+        [self->_fileContents removeObjectForKey:URL.path];
+        [self->_fileAttributes removeObjectForKey:URL.path];
     });
 
     return YES;
@@ -94,7 +94,7 @@ - (NSDirectoryEnumerator *)enumeratorAtPath:(NSString *)path {
 - (NSDictionary *)attributesOfItemAtPath:(NSString *)path error:(NSError **)error {
     __block NSDictionary *results = nil;
     dispatch_sync(_queue, ^{
-        results = [_fileAttributes[path] copy];
+        results = [self->_fileAttributes[path] copy];
     });
 
     return results;
@@ -103,11 +103,11 @@ - (NSDictionary *)attributesOfItemAtPath:(NSString *)path error:(NSError **)erro
 - (BOOL)setAttributes:(NSDictionary *)attributes ofItemAtPath:(NSString *)path error:(NSError **)error {
     dispatch_sync(_queue, ^{
         NSMutableDictionary *newAttributes = [NSMutableDictionary dictionaryWithDictionary:attributes];
-        NSDate *date = [NSDate dateWithTimeIntervalSince1970:_lastReturnedTime++];
+        NSDate *date = [NSDate dateWithTimeIntervalSince1970:self->_lastReturnedTime++];
 
         newAttributes[NSFileModificationDate] = newAttributes[NSURLContentModificationDateKey] = date;
 
-        [_fileAttributes[path] addEntriesFromDictionary:newAttributes];
+        [self->_fileAttributes[path] addEntriesFromDictionary:newAttributes];
     });
 
     return YES;
@@ -131,7 +131,7 @@ - (instancetype)initWithFileManager:(TestFileManager *)manager path:(NSString *)
     _path = [path copy];
 
     dispatch_sync(_manager->_queue, ^{
-        _enumerator = [manager->_fileContents keyEnumerator];
+        self->_enumerator = [manager->_fileContents keyEnumerator];
     });
 
     return self;
@@ -140,24 +140,24 @@ - (instancetype)initWithFileManager:(TestFileManager *)manager path:(NSString *)
 - (NSDictionary *)fileAttributes {
     __block NSDictionary *results = nil;
     dispatch_sync(_manager->_queue, ^{
-        results = [_manager->_fileAttributes[_currentPath] copy];
+        results = [self->_manager->_fileAttributes[self->_currentPath] copy];
     });
 
     return results;
 }
 
 - (id)nextObject {
     dispatch_sync(_manager->_queue, ^{
-        _currentPath = nil;
+        self->_currentPath = nil;
         while (true) {
-            if ([_currentPath hasPrefix:_path]) break;
-            _currentPath = [_enumerator nextObject];
+            if ([self->_currentPath hasPrefix:self->_path]) break;
+            self->_currentPath = [self->_enumerator nextObject];
 
-            if (!_currentPath) break;
+            if (!self->_currentPath) break;
         }
     });
 
-    return [_currentPath lastPathComponent];
+    return [self->_currentPath lastPathComponent];
 }
 
 - (void)skipDescendants {

Parse/Tests/Other/StoreKitMocking/PFTestSKPaymentQueue.m

@@ -58,7 +58,7 @@ - (void)addPayment:(SKPayment *)payment {
                                                                                           withError:nil
                                                                                             inState:SKPaymentTransactionStatePurchased];
         dispatch_async(dispatch_get_main_queue(), ^{
-            for (NSValue *value in _observers) {
+            for (NSValue *value in self->_observers) {
                 id observer = [value nonretainedObjectValue];
                 if (observer) {
                     [observer paymentQueue:self updatedTransactions:@[ transaction ]];

Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m

@@ -46,11 +46,11 @@ - (void)start {
     dispatch_async(dispatch_get_main_queue(), ^{
         NSPredicate *filterPredicate = [NSPredicate predicateWithBlock:^BOOL(SKProduct *evaluatedObject,
                                                                              NSDictionary *bindings) {
-            return [_productIdentifiers containsObject:evaluatedObject.productIdentifier];
+            return [self->_productIdentifiers containsObject:evaluatedObject.productIdentifier];
         }];
         NSSet *validProducts = [_validProducts filteredSetUsingPredicate:filterPredicate];
 
-        NSMutableSet *invalidProductIdentifiers = [_productIdentifiers mutableCopy];
+        NSMutableSet *invalidProductIdentifiers = [self->_productIdentifiers mutableCopy];
         [invalidProductIdentifiers minusSet:[_validProducts valueForKey:@"productIdentifier"]];
 
         PFTestSKProductsResponse *response = [[PFTestSKProductsResponse alloc] initWithProducts:[validProducts allObjects]

Parse/Tests/Other/TestCases/TestCase/PFTestCase.m

@@ -89,7 +89,7 @@ - (void)setUp {
 
 - (void)tearDown {
     dispatch_sync(_mockQueue, ^{
-        [_mocks makeObjectsPerformSelector:@selector(stopMocking)];
+        [self->_mocks makeObjectsPerformSelector:@selector(stopMocking)];
     });
 
     _mocks = nil;
@@ -177,7 +177,7 @@ - (void)assertDirectory:(NSString *)directoryPath hasContents:(NSDictionary *)ex
 
 - (void)registerMockObject:(id)mockObject {
     dispatch_sync(_mockQueue, ^{
-        [_mocks addObject:mockObject];
+        [self->_mocks addObject:mockObject];
     });
 }
 

Parse/Tests/Unit/SQLiteDatabaseTest.m

@@ -46,7 +46,7 @@ - (void)tearDown {
             BOOL isOpen = [task.result boolValue];
 
             if (isOpen) {
-                return [database closeAsync];
+                return [self->database closeAsync];
             }
             return task;
         }] waitUntilFinished];
@@ -63,6 +63,7 @@ - (void)tearDown {
 
 // Should return BFTask to not waste `waitUntilFinished`
 - (BFTask *)createDatabaseAsync {
+    PFSQLiteDatabase *database = self->database;
     // Drop existing database first if any.
     return [[[[database openAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"DROP TABLE test" withArgumentsInArray:nil];
@@ -79,6 +80,7 @@ - (BFTask *)createDatabaseAsync {
 ///--------------------------------------
 
 - (void)testOpen {
+    PFSQLiteDatabase *database = self->database;
     [[[[[[[[[database openAsync] continueWithBlock:^id(BFTask *task) {
         return [database isOpenAsync];
     }] continueWithBlock:^id(BFTask *task) {
@@ -104,6 +106,7 @@ - (void)testOpen {
 }
 
 - (void)testCRUD {
+    PFSQLiteDatabase *database = self->database;
     [[[[[[[[[[[[database openAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"CREATE TABLE test (a text, b text, c integer, d double)"
                     withArgumentsInArray:nil];
@@ -185,6 +188,7 @@ - (void)testCRUD {
 
 // TODO (hallucinogen): this test consists of three units which can be separated.
 - (void)testTransaction {
+    PFSQLiteDatabase *database = self->database;
     [[[[[[[[[[[[[[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database beginTransactionAsync];
     }] continueWithBlock:^id(BFTask *task) {
@@ -281,7 +285,8 @@ - (void)testTransaction {
         return [BFTask taskWithResult:nil];
     }] waitUntilFinished];
 
-    database = [PFSQLiteDatabase databaseWithPath:[self databasePath]];
+    self->database = [PFSQLiteDatabase databaseWithPath:[self databasePath]];
+    database = self->database;
     [[[[[[[database openAsync] continueWithBlock:^id(BFTask *task) {
         XCTAssertNil(task.error);
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?, ?)"
@@ -322,6 +327,7 @@ - (void)testTransaction {
 }
 
 - (void)testOperationOnNonExistentTable {
+    PFSQLiteDatabase *database = self->database;
     [[[[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO testFake (a, b, c, d) VALUES (?, ?, ?, ?)"
                     withArgumentsInArray:@[ @"one", @"two", @3, @4.4 ]];
@@ -351,6 +357,7 @@ - (void)testOperationOnNonExistentTable {
 }
 
 - (void)testQuery {
+    PFSQLiteDatabase *database = self->database;
     [[[[[[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?, ?)"
                     withArgumentsInArray:@[ @"one", @"two", @3, @4.4 ]];
@@ -413,6 +420,7 @@ - (void)testQuery {
 }
 
 - (void)testCursorAndOperationOnDifferentThread {
+    PFSQLiteDatabase *database = self->database;
     BFTask *taskWithCursor = [[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?, ?)"
                     withArgumentsInArray:@[ @"one", @"two", @3, @4.4 ]];
@@ -468,6 +476,7 @@ - (void)testCursorAndOperationOnDifferentThread {
 }
 
 - (void)testInvalidArgumentCount {
+    PFSQLiteDatabase *database = self->database;
     [[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?)"
                     withArgumentsInArray:@[ @"one", @"two", @3, @4.4 ]];
@@ -479,6 +488,7 @@ - (void)testInvalidArgumentCount {
 }
 
 - (void)testInvalidSQL {
+    PFSQLiteDatabase *database = self->database;
     [[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?, ?)"
                     withArgumentsInArray:@[ @"one", @"two", @3, @4.4 ]];
@@ -492,6 +502,7 @@ - (void)testInvalidSQL {
 }
 
 - (void)testColumnTypes {
+    PFSQLiteDatabase *database = self->database;
     [[[[[self createDatabaseAsync] continueWithBlock:^id(BFTask *task) {
         return [database executeSQLAsync:@"INSERT INTO test (a, b, c, d) VALUES (?, ?, ?, ?)"
                     withArgumentsInArray:@[ @1, [NSNull null], @"string", @13.37 ]];