Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Parse/Parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
The current client key that was used to configure Parse framework.
*/
+ (NSString *)getClientKey;
+ (nullable NSString *)getClientKey;

///--------------------------------------
#pragma mark - Enabling Local Datastore
Expand Down
5 changes: 3 additions & 2 deletions Parse/Parse.m
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ + (void)initializeWithConfiguration:(ParseClientConfiguration *)configuration {
configuration.applicationGroupIdentifier == nil ||
configuration.containingApplicationBundleIdentifier != nil,
@"'containingApplicationBundleIdentifier' must be non-nil in extension environment");
PFConsistencyAssert(![self currentConfiguration], @"Parse is already initialized.");

ParseManager *manager = [[ParseManager alloc] initWithConfiguration:configuration];
[manager startManaging];
Expand Down Expand Up @@ -104,7 +105,7 @@ + (void)initializeWithConfiguration:(ParseClientConfiguration *)configuration {
[[self parseModulesCollection] parseDidInitializeWithApplicationId:configuration.applicationId clientKey:configuration.clientKey];
}

+ (ParseClientConfiguration *)currentConfiguration {
+ (nullable ParseClientConfiguration *)currentConfiguration {
return currentParseManager_.configuration;
}

Expand All @@ -114,7 +115,7 @@ + (NSString *)getApplicationId {
return currentParseManager_.configuration.applicationId;
}

+ (NSString *)getClientKey {
+ (nullable NSString *)getClientKey {
PFConsistencyAssert(currentParseManager_,
@"You have to call setApplicationId:clientKey: on Parse to configure Parse.");
return currentParseManager_.configuration.clientKey;
Expand Down
18 changes: 2 additions & 16 deletions Tests/Unit/InstallationIdentifierUnitTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,21 @@
*/

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

@interface InstallationIdentifierUnitTests : PFTestCase
@interface InstallationIdentifierUnitTests : PFUnitTestCase

@end

@implementation InstallationIdentifierUnitTests

///--------------------------------------
#pragma mark - XCTestCase
///--------------------------------------

- (void)tearDown {
[[Parse _currentManager] clearEventuallyQueue];
[[[Parse _currentManager].installationIdentifierStore clearInstallationIdentifierAsync] waitForResult:nil];
[Parse _clearCurrentManager];

[super tearDown];
}

///--------------------------------------
#pragma mark - Tests
///--------------------------------------

- (void)testNewInstallationIdentifierIsLowercase {
[Parse setApplicationId:@"b" clientKey:@"c"];
PFInstallationIdentifierStore *store = [Parse _currentManager].installationIdentifierStore;

XCTestExpectation *expectation = [self currentSelectorTestExpectation];
Expand All @@ -51,7 +38,6 @@ - (void)testNewInstallationIdentifierIsLowercase {
}

- (void)testCachedInstallationId {
[Parse setApplicationId:@"b" clientKey:@"c"];
PFInstallationIdentifierStore *store = [Parse _currentManager].installationIdentifierStore;

[[store _clearCachedInstallationIdentifierAsync] waitForResult:nil];
Expand Down
10 changes: 2 additions & 8 deletions Tests/Unit/InstallationUnitTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,15 @@
*/

#import "PFInstallation.h"
#import "PFTestCase.h"
#import "PFUnitTestCase.h"
#import "Parse.h"

@interface InstallationUnitTests : PFTestCase
@interface InstallationUnitTests : PFUnitTestCase

@end

@implementation InstallationUnitTests

+ (void)setUp {
[super setUp];

[Parse setApplicationId:@"a" clientKey:@"a"];
}

- (void)testInstallationImmutableFieldsCannotBeChanged {
PFInstallation *installation = [PFInstallation currentInstallation];
installation.deviceToken = @"11433856eed2f1285fb3aa11136718c1198ed5647875096952c66bf8cb976306";
Expand Down
8 changes: 5 additions & 3 deletions Tests/Unit/SessionUnitTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#import "PFSession_Private.h"
#import "PFUnitTestCase.h"
#import "Parse_Private.h"
#import "PFObjectSubclassingController.h"

@interface SessionUnitTests : PFUnitTestCase

Expand Down Expand Up @@ -44,12 +45,13 @@ - (PFSessionController *)sessionControllerMockWithSessionResult:(PFSession *)ses
///--------------------------------------

- (void)testSessionClassIsRegistered {
[[Parse _currentManager] clearEventuallyQueue];
[Parse _clearCurrentManager];
[PFObjectSubclassingController clearDefaultController];

[PFObject unregisterSubclass:[PFSession class]];
[Parse setApplicationId:@"a" clientKey:@"b"];
XCTAssertNotNil([PFSession query]);

[[Parse _currentManager] clearEventuallyQueue];
[Parse _clearCurrentManager];
}

- (void)testConstructorsClassNameValidation {
Expand Down