Skip to content

Commit eb9dc77

Browse files
BrandonStalnakerBrandonStalnaker
committed
address CR
1 parent f77568f commit eb9dc77

21 files changed

+131
-134
lines changed

‎UnitTests/MPBackendControllerTests.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ + (dispatch_queue_t)messageQueue;
5151
@property (nonatomic, strong, nonnull) MPBackendController_PRIVATE *backendController;
5252
@property (nonatomic, strong) MPPersistenceController *persistenceController;
5353
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
54-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
54+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
5555
@property (nonatomic, strong, nullable) NSString *dataPlanId;
5656
@property (nonatomic, strong, nullable) NSNumber *dataPlanVersion;
5757
@property (nonatomic, strong, nonnull) MParticleOptions *options;
@@ -121,7 +121,7 @@ - (void)setUp {
121121
[MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
122122
[MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
123123

124-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
124+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
125125

126126
[MParticle sharedInstance].backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)[MParticle sharedInstance]];
127127
self.backendController = [MParticle sharedInstance].backendController;

‎UnitTests/MPIUserDefaultsTests.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ @interface MParticle ()
1111

1212
@property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
1313
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
14-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
14+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
1515

1616
@end
1717

@@ -29,8 +29,8 @@ - (void)setUp {
2929
[MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
3030
[MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
3131

32-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
33-
kitContainer = [MParticle sharedInstance].kitContainer;
32+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
33+
kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
3434
}
3535

3636
- (void)tearDown {

‎UnitTests/MPIdentityTests.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ - (instancetype)initWithIdentities:(NSDictionary *)identities;
5858

5959
@interface MParticle ()
6060

61-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
61+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
6262
@property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
6363

6464
@end
@@ -615,7 +615,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKits {
615615

616616
id mockInstance = OCMClassMock([MParticle class]);
617617
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
618-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
618+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
619619
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
620620

621621
id mockUser = OCMClassMock([MParticleUser class]);
@@ -647,7 +647,7 @@ - (void)testLoginIdentityRequestCompleteWithKits {
647647

648648
id mockInstance = OCMClassMock([MParticle class]);
649649
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
650-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
650+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
651651
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
652652

653653
id mockUser = OCMClassMock([MParticleUser class]);
@@ -679,7 +679,7 @@ - (void)testLogoutIdentityRequestCompleteWithKits {
679679

680680
id mockInstance = OCMClassMock([MParticle class]);
681681
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
682-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
682+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
683683
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
684684

685685
id mockUser = OCMClassMock([MParticleUser class]);
@@ -707,7 +707,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKitsAndNoUserChange {
707707

708708
id mockInstance = OCMClassMock([MParticle class]);
709709
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
710-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
710+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
711711
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
712712

713713
id mockUser = OCMClassMock([MParticleUser class]);
@@ -739,7 +739,7 @@ - (void)testLoginIdentityRequestCompleteWithKitsAndNoUserChange {
739739

740740
id mockInstance = OCMClassMock([MParticle class]);
741741
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
742-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
742+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
743743
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
744744

745745
id mockUser = OCMClassMock([MParticleUser class]);
@@ -771,7 +771,7 @@ - (void)testLogoutIdentityRequestCompleteWithKitsAndNoUserChange {
771771

772772
id mockInstance = OCMClassMock([MParticle class]);
773773
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
774-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
774+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
775775
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
776776

777777
id mockUser = OCMClassMock([MParticleUser class]);
@@ -799,7 +799,7 @@ - (void)testMPIdZeroToMPId {
799799

800800
id mockInstance = OCMClassMock([MParticle class]);
801801
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
802-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
802+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
803803
[[[mockInstance stub] andReturn:mockPersistenceController] persistenceController];
804804
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
805805

@@ -856,7 +856,7 @@ - (void)testModifyRequestComplete {
856856
- (void)testModifyRequestCompleteWithKits {
857857
id mockInstance = OCMClassMock([MParticle class]);
858858
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
859-
[[[mockInstance stub] andReturn:mockContainer] kitContainer];
859+
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
860860
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
861861

862862
id mockUser = OCMClassMock([MParticleUser class]);

‎UnitTests/MPKitAPITests.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ @interface MParticle ()
2424
+ (dispatch_queue_t)messageQueue;
2525
@property (nonatomic, strong) MPBackendController_PRIVATE *backendController;
2626
@property (nonatomic, strong) MPPersistenceController *persistenceController;
27-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
27+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
2828

2929
@end
3030

@@ -55,8 +55,8 @@ @implementation MPKitAPITests
5555
- (void)setUp {
5656
[super setUp];
5757

58-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
59-
_kitContainer = [MParticle sharedInstance].kitContainer;
58+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
59+
_kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
6060

6161
[MParticle sharedInstance].persistenceController = [[MPPersistenceController alloc] init];
6262

‎UnitTests/MPKitActivityTests.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@interface MParticle ()
1414

1515
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
16-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
16+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
1717

1818
@end
1919

@@ -44,13 +44,13 @@ - (void)setUp {
4444
[MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
4545
[MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
4646

47-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
47+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
4848

4949
MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
5050
[MPKitContainer_PRIVATE registerKit:kitRegister];
5151
NSDictionary *configuration = @{@"id": @42, @"as": @{@"appId":@"MyAppId"}};
5252
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:configuration];
53-
[[[MParticle sharedInstance].kitContainer startKit:@42 configuration:kitConfiguration] start];
53+
[[[MParticle sharedInstance].kitContainer_PRIVATE startKit:@42 configuration:kitConfiguration] start];
5454
}
5555

5656
- (void)tearDown {
@@ -91,11 +91,11 @@ - (void)testKitAlreadyStarted {
9191
};
9292

9393
NSArray *kitConfigs = @[configuration];
94-
[[MParticle sharedInstance].kitContainer configureKits:nil];
95-
[[MParticle sharedInstance].kitContainer configureKits:kitConfigs];
94+
[[MParticle sharedInstance].kitContainer_PRIVATE configureKits:nil];
95+
[[MParticle sharedInstance].kitContainer_PRIVATE configureKits:kitConfigs];
9696

9797
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:configuration];
98-
[[MParticle sharedInstance].kitContainer startKit:@42 configuration:kitConfiguration];
98+
[[MParticle sharedInstance].kitContainer_PRIVATE startKit:@42 configuration:kitConfiguration];
9999

100100
BOOL isKitActive = [self.kitActivity isKitActive:@42];
101101
XCTAssertTrue(isKitActive);

‎UnitTests/MPKitContainerTests.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @interface MParticle ()
3535

3636
+ (dispatch_queue_t)messageQueue;
3737
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
38-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
38+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
3939
@property (nonatomic, strong, readonly) MPBackendController_PRIVATE *backendController;
4040

4141
@end
@@ -90,8 +90,8 @@ - (void)setUp {
9090
[MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
9191
[MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
9292

93-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
94-
kitContainer = [MParticle sharedInstance].kitContainer;
93+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
94+
kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
9595

9696
NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer_PRIVATE registeredKits];
9797
if (!registeredKits) {
@@ -2211,11 +2211,11 @@ - (void)testIsDisabledByConsentKitFilterGPDR {
22112211

22122212
filter.filterItems = [filterItems copy];
22132213

2214-
BOOL isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2214+
BOOL isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22152215
XCTAssertTrue(isDisabled);
22162216

22172217
filter.shouldIncludeOnMatch = NO;
2218-
isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2218+
isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22192219
XCTAssertFalse(isDisabled);
22202220

22212221
filter.shouldIncludeOnMatch = YES;
@@ -2242,11 +2242,11 @@ - (void)testIsDisabledByConsentKitFilterGPDR {
22422242
[MPPersistenceController setConsentState:state forMpid:[MPPersistenceController mpId]];
22432243
MParticle.sharedInstance.identity.currentUser.consentState = state;
22442244

2245-
isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2245+
isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22462246
XCTAssertFalse(isDisabled);
22472247

22482248
filter.shouldIncludeOnMatch = NO;
2249-
isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2249+
isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22502250
XCTAssertTrue(isDisabled);
22512251
}
22522252

@@ -2282,11 +2282,11 @@ - (void)testIsDisabledByConsentKitFilterCCPA {
22822282
[MPPersistenceController setConsentState:state forMpid:[MPPersistenceController mpId]];
22832283
MParticle.sharedInstance.identity.currentUser.consentState = state;
22842284

2285-
BOOL isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2285+
BOOL isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22862286
XCTAssertFalse(isDisabled);
22872287

22882288
filter.shouldIncludeOnMatch = NO;
2289-
isDisabled = [[MParticle sharedInstance].kitContainer isDisabledByConsentKitFilter:filter];
2289+
isDisabled = [[MParticle sharedInstance].kitContainer_PRIVATE isDisabledByConsentKitFilter:filter];
22902290
XCTAssertTrue(isDisabled);
22912291
}
22922292

‎UnitTests/MPStateMachineTests.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (void)resetTriggers;
2525
@interface MParticle ()
2626

2727
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
28-
@property (nonatomic, strong) MPKitContainer_PRIVATE * kitContainer;
28+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
2929

3030
@end
3131

@@ -197,10 +197,10 @@ - (void)testSetLocation {
197197
#if TARGET_OS_IOS == 1
198198
#ifndef MPARTICLE_LOCATION_DISABLE
199199
id mockKitContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
200-
[MParticle sharedInstance].kitContainer = mockKitContainer;
200+
[MParticle sharedInstance].kitContainer_PRIVATE = mockKitContainer;
201201

202202
XCTestExpectation *expectation = [self expectationWithDescription:@"Set Location"];
203-
MPKitContainer_PRIVATE *kitContainer = [MParticle sharedInstance].kitContainer;
203+
MPKitContainer_PRIVATE *kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
204204

205205
[MParticle sharedInstance].location = [[CLLocation alloc] init];
206206

‎UnitTests/MPURLRequestBuilderTests.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ @interface MParticle ()
2424

2525
+ (dispatch_queue_t)messageQueue;
2626
@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
27-
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
27+
@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
2828
@property (nonatomic, strong) MParticleWebView *webView;
2929

3030
@end
@@ -65,8 +65,8 @@ - (void)setUp {
6565
[MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
6666
[MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
6767

68-
[MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
69-
kitContainer = [MParticle sharedInstance].kitContainer;
68+
[MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
69+
kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
7070

7171
NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer_PRIVATE registeredKits];
7272
if (!registeredKits) {
@@ -382,7 +382,7 @@ - (void)testEventRequest {
382382

383383
id mockMParticle = OCMPartialMock(sharedInstance);
384384
[[[mockMParticle stub] andReturn:mockWebView] webView];
385-
[[[mockMParticle stub] andReturn:mockKitContainer] kitContainer];
385+
[[[mockMParticle stub] andReturn:mockKitContainer] kitContainer_PRIVATE];
386386

387387
NSDictionary *configuration1 = @{
388388
@"id":@42,
@@ -392,8 +392,8 @@ - (void)testEventRequest {
392392
};
393393

394394
NSArray *kitConfigs = @[configuration1];
395-
[[MParticle sharedInstance].kitContainer configureKits:nil];
396-
[[MParticle sharedInstance].kitContainer configureKits:kitConfigs];
395+
[[MParticle sharedInstance].kitContainer_PRIVATE configureKits:nil];
396+
[[MParticle sharedInstance].kitContainer_PRIVATE configureKits:kitConfigs];
397397

398398
XCTAssertEqual([MPURLRequestBuilder requestTimeout], 10, @"Should have been equal.");
399399

‎UnitTests/MParticleTests.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ - (void)testSwitchWorkspaceKitsWithoutStop {
12141214

12151215
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, WORKSPACE_SWITCHING_DELAY), dispatch_get_main_queue(), ^{
12161216
registerNoStop.wrapperInstance = [[MPKitTestClassNoStartImmediately alloc] init];
1217-
[MParticle sharedInstance].kitContainer.kitConfigurations[@42] = [[MPKitConfiguration alloc] init];
1217+
[MParticle sharedInstance].kitContainer_PRIVATE.kitConfigurations[@42] = [[MPKitConfiguration alloc] init];
12181218

12191219
XCTAssertEqual(MPKitContainer_PRIVATE.registeredKits.count, 1);
12201220

@@ -1242,7 +1242,7 @@ - (void)testSwitchWorkspaceKitsWithStop {
12421242

12431243
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, WORKSPACE_SWITCHING_DELAY), dispatch_get_main_queue(), ^{
12441244
registerWithStop.wrapperInstance = [[MPKitTestClassNoStartImmediatelyWithStop alloc] init];
1245-
[MParticle sharedInstance].kitContainer.kitConfigurations[@43] = [[MPKitConfiguration alloc] init];
1245+
[MParticle sharedInstance].kitContainer_PRIVATE.kitConfigurations[@43] = [[MPKitConfiguration alloc] init];
12461246

12471247
XCTAssertEqual(MPKitContainer_PRIVATE.registeredKits.count, 1);
12481248

0 commit comments

Comments
 (0)