Skip to content

Fix non-faulted task when loading installationId from persistence group fails. #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2016
Merged

Fix non-faulted task when loading installationId from persistence group fails. #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Parse/Internal/Installation/InstallationIdentifierStore/PFInstallationIdentifierStore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ - (BFTask *)clearInstallationIdentifierAsync {
self.installationIdentifier = nil;
return [[self _getPersistenceGroupAsync] continueWithSuccessBlock:^id(BFTask<id<PFPersistenceGroup>> *task) {
id<PFPersistenceGroup> group = task.result;
return [[[group beginLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName] continueWithSuccessBlock:^id(BFTask *_) {
return [[[group beginLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName] continueWithSuccessBlock:^id(BFTask *t) {
return [group removeDataAsyncForKey:PFInstallationIdentifierFileName];
}] continueWithBlock:^id(BFTask *task) {
}] continueWithBlock:^id(BFTask *t) {
return [group endLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName];
}];
}];
Expand All @@ -88,10 +88,10 @@ - (BFTask *)_clearCachedInstallationIdentifierAsync {
- (BFTask<NSString *> *)_loadInstallationIdentifierAsync {
return (BFTask<NSString *> *)[[self _getPersistenceGroupAsync] continueWithSuccessBlock:^id(BFTask<id<PFPersistenceGroup>> *task) {
id<PFPersistenceGroup> group = task.result;
return [[[[group beginLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName] continueWithSuccessBlock:^id(BFTask *_) {
return [[[[[group beginLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName] continueWithSuccessBlock:^id(BFTask *_) {
return [group getDataAsyncForKey:PFInstallationIdentifierFileName];
}] continueWithSuccessBlock:^id(BFTask *task) {
NSData *data = task.result;
}] continueWithSuccessBlock:^id(BFTask *t) {
NSData *data = t.result;
NSString *installationId = nil;
if (data) {
installationId = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
Expand All @@ -103,9 +103,11 @@ - (BFTask *)_clearCachedInstallationIdentifierAsync {
installationId = [NSUUID UUID].UUIDString.lowercaseString;
return [[group setDataAsync:[installationId dataUsingEncoding:NSUTF8StringEncoding]
forKey:PFInstallationIdentifierFileName] continueWithSuccessResult:installationId];
}] continueWithBlock:^id(BFTask <NSString *>*task) {
}] continueWithBlock:^id(BFTask<NSString *> *t) {
[group endLockedContentAccessAsyncToDataForKey:PFInstallationIdentifierFileName];
self.installationIdentifier = task.result;
return t;
}] continueWithSuccessBlock:^id _Nullable(BFTask<NSString *> * _Nonnull t) {
self.installationIdentifier = t.result;
return self.installationIdentifier;
}];
}];
Expand Down
27 changes: 27 additions & 0 deletions Tests/Unit/InstallationIdentifierUnitTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#import <OCMock/OCMock.h>

#import "PFInstallationIdentifierStore_Private.h"
#import "PFUnitTestCase.h"
#import "Parse_Private.h"
#import "BFTask+Private.h"
#import "PFPersistenceController.h"

@interface InstallationIdentifierUnitTests : PFUnitTestCase

Expand Down Expand Up @@ -68,4 +71,28 @@ - (void)testInstallationIdentifierThreadSafe {
});
}

- (void)testInstallationIdentifierPropagatesErrorOnPersistenceFailure {
id<PFPersistenceGroup> group = PFStrictProtocolMock(@protocol(PFPersistenceGroup));
OCMStub([group beginLockedContentAccessAsyncToDataForKey:[OCMArg isNotNil]]).andReturn([BFTask taskWithResult:nil]);
OCMStub([group endLockedContentAccessAsyncToDataForKey:[OCMArg isNotNil]]).andReturn([BFTask taskWithResult:nil]);
OCMStub([group getDataAsyncForKey:[OCMArg isNotNil]]).andReturn([BFTask taskWithResult:nil]);
OCMStub([group setDataAsync:[OCMArg isNotNil] forKey:[OCMArg isNotNil]]).andReturn([BFTask taskWithError:[[NSError alloc] init]]);

PFPersistenceController *persistenceController = PFStrictClassMock([PFPersistenceController class]);
OCMStub([persistenceController getPersistenceGroupAsync]).andReturn([BFTask taskWithResult:group]);

id<PFPersistenceControllerProvider> dataSource = PFStrictProtocolMock(@protocol(PFPersistenceControllerProvider));
OCMStub([dataSource persistenceController]).andReturn(persistenceController);

PFInstallationIdentifierStore *store = [[PFInstallationIdentifierStore alloc] initWithDataSource:dataSource];

XCTestExpectation *expectation = [self currentSelectorTestExpectation];
[[store getInstallationIdentifierAsync] continueWithBlock:^id _Nullable(BFTask<NSString *> * _Nonnull t) {
XCTAssertTrue(t.faulted);
[expectation fulfill];
return nil;
}];
[self waitForTestExpectations];
}

@end