Move over MPApplication and KitContainer

mParticle · Dec 6, 2024 · b337ea9 · b337ea9
1 parent e2e4662
commit b337ea9
Show file tree

Hide file tree

Showing 33 changed files with 150 additions and 158 deletions.
diff --git a/UnitTests/MPBackendControllerTests.m b/UnitTests/MPBackendControllerTests.m
@@ -51,15 +51,15 @@ + (dispatch_queue_t)messageQueue;
 @property (nonatomic, strong, nonnull) MPBackendController_PRIVATE *backendController;
 @property (nonatomic, strong) MPPersistenceController *persistenceController;
 @property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
 @property (nonatomic, strong, nullable) NSString *dataPlanId;
 @property (nonatomic, strong, nullable) NSNumber *dataPlanVersion;
 @property (nonatomic, strong, nonnull) MParticleOptions *options;
 
 @end
 
 #pragma mark - MPKitContainer category for unit tests
-@interface MPKitContainer(Tests)
+@interface MPKitContainer_PRIVATE(Tests)
 
 - (id<MPKitProtocol>)startKit:(NSNumber *)integrationId configuration:(MPKitConfiguration *)kitConfiguration;
 
@@ -121,7 +121,7 @@ - (void)setUp {
     [MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
     [MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
+    [MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
 
     [MParticle sharedInstance].backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)[MParticle sharedInstance]];
     self.backendController = [MParticle sharedInstance].backendController;
@@ -1058,12 +1058,12 @@ - (void)testSetUserTagFromUser {
 }
 
 - (void)testSetUserAttributeKits {
-    if (![MPKitContainer registeredKits]) {
+    if (![MPKitContainer_PRIVATE registeredKits]) {
         MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-        [MPKitContainer registerKit:kitRegister];
+        [MPKitContainer_PRIVATE registerKit:kitRegister];
 
         kitRegister = [[MPKitRegister alloc] initWithName:@"KitSecondTest" className:@"MPKitSecondTestClass"];
-        [MPKitContainer registerKit:kitRegister];
+        [MPKitContainer_PRIVATE registerKit:kitRegister];
 
         NSDictionary *configuration1 = @{
                                          @"id":@42,

diff --git a/UnitTests/MPIUserDefaultsTests.m b/UnitTests/MPIUserDefaultsTests.m
@@ -11,12 +11,12 @@ @interface MParticle ()
 
 @property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
 @property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
 
 @end
 
 @interface MPIUserDefaultsTests : MPBaseTestCase {
-    MPKitContainer *kitContainer;
+    MPKitContainer_PRIVATE *kitContainer;
 }
 
 @end
@@ -29,12 +29,12 @@ - (void)setUp {
     [MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
     [MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
+    [MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
     kitContainer = [MParticle sharedInstance].kitContainer;
 }
 
 - (void)tearDown {
-    for (MPKitRegister *kitRegister in [MPKitContainer registeredKits]) {
+    for (MPKitRegister *kitRegister in [MPKitContainer_PRIVATE registeredKits]) {
         kitRegister.wrapperInstance = nil;
     }
     kitContainer = nil;
@@ -471,7 +471,7 @@ - (void)testConfigParameters {
     XCTAssertNotNil(firstParameters);
 
     MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-    [MPKitContainer registerKit:kitRegister];
+    [MPKitContainer_PRIVATE registerKit:kitRegister];
 
     XCTAssertEqualObjects(responseConfiguration, [[MPIUserDefaults standardUserDefaults] getConfiguration]);
     XCTAssertTrue([[MPIUserDefaults standardUserDefaults] isConfigurationParametersOutdated]);

diff --git a/UnitTests/MPIdentityTests.m b/UnitTests/MPIdentityTests.m
@@ -23,7 +23,7 @@ typedef NS_ENUM(NSUInteger, MPIdentityRequestType) {
 };
 
 @interface MPIdentityTests : MPBaseTestCase {
-    MPKitContainer *kitContainer;
+    MPKitContainer_PRIVATE *kitContainer;
 }
 
 @end
@@ -58,7 +58,7 @@ - (instancetype)initWithIdentities:(NSDictionary *)identities;
 
 @interface MParticle ()
 
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
 @property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
 
 @end
@@ -614,7 +614,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -646,7 +646,7 @@ - (void)testLoginIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -678,7 +678,7 @@ - (void)testLogoutIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -706,7 +706,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -738,7 +738,7 @@ - (void)testLoginIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -770,7 +770,7 @@ - (void)testLogoutIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -798,7 +798,7 @@ - (void)testMPIdZeroToMPId {
     [[[mockPersistenceController stub] andReturn:@"0"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockPersistenceController] persistenceController];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
@@ -855,7 +855,7 @@ - (void)testModifyRequestComplete {
 
 - (void)testModifyRequestCompleteWithKits {
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
     [[[mockInstance stub] andReturn:mockContainer] kitContainer];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 

diff --git a/UnitTests/MPKitAPITests.m b/UnitTests/MPKitAPITests.m
@@ -13,7 +13,7 @@
 #import "MPIUserDefaults.h"
 #import "MPIConstants.h"
 
-@interface MPKitContainer ()
+@interface MPKitContainer_PRIVATE ()
 
 - (id<MPKitProtocol>)startKit:(NSNumber *)integrationId configuration:(MPKitConfiguration *)kitConfiguration;
 
@@ -24,7 +24,7 @@ @interface MParticle ()
 + (dispatch_queue_t)messageQueue;
 @property (nonatomic, strong) MPBackendController_PRIVATE *backendController;
 @property (nonatomic, strong) MPPersistenceController *persistenceController;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
 
 @end
 
@@ -46,7 +46,7 @@ - (id)initWithKitCode:(NSNumber *)integrationId;
 @interface MPKitAPITests : MPBaseTestCase  <MPKitProtocol>
 
 @property (nonatomic) MPKitAPI *kitApi;
-@property (nonatomic) MPKitContainer *kitContainer;
+@property (nonatomic) MPKitContainer_PRIVATE *kitContainer;
 
 @end
 
@@ -55,15 +55,15 @@ @implementation MPKitAPITests
 - (void)setUp {
     [super setUp];
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
+    [MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
     _kitContainer = [MParticle sharedInstance].kitContainer;
 
     [MParticle sharedInstance].persistenceController = [[MPPersistenceController alloc] init];
 
-    NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer registeredKits];
+    NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer_PRIVATE registeredKits];
     if (!registeredKits) {
         MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-        [MPKitContainer registerKit:kitRegister];
+        [MPKitContainer_PRIVATE registerKit:kitRegister];
 
         NSDictionary *configuration = @{
                                         @"id":@42,

diff --git a/UnitTests/MPKitActivityTests.m b/UnitTests/MPKitActivityTests.m
@@ -8,17 +8,17 @@
 #import "MPStateMachine.h"
 #import <XCTest/XCTest.h>
 #import "MPBaseTestCase.h"
-#import "mParticle.h"
+#import "MParticle.h"
 
 @interface MParticle ()
 
 @property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer;
 
 @end
 
 #pragma mark - MPKitContainer category for unit tests
-@interface MPKitContainer(Tests)
+@interface MPKitContainer_PRIVATE(Tests)
 
 - (id<MPKitProtocol>)startKit:(NSNumber *)integrationId configuration:(MPKitConfiguration *)kitConfiguration;
 + (NSMutableSet <id<MPExtensionKitProtocol>> *)kitsRegistry;
@@ -44,10 +44,10 @@ - (void)setUp {
     [MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
     [MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
+    [MParticle sharedInstance].kitContainer = [[MPKitContainer_PRIVATE alloc] init];
 
     MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-    [MPKitContainer registerKit:kitRegister];
+    [MPKitContainer_PRIVATE registerKit:kitRegister];
     NSDictionary *configuration = @{@"id": @42, @"as": @{@"appId":@"MyAppId"}};
     MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:configuration];
     [[[MParticle sharedInstance].kitContainer startKit:@42 configuration:kitConfiguration] start];
@@ -57,7 +57,7 @@ - (void)tearDown {
     _kitActivity = nil;
 
     // Ensure registeredKits is empty
-    [MPKitContainer.kitsRegistry removeAllObjects];
+    [MPKitContainer_PRIVATE.kitsRegistry removeAllObjects];
 
     [super tearDown];
 }