mParticle · BrandonStalnaker · Jan 23, 2025 · Jan 21, 2025 · Jan 22, 2025 · Jan 22, 2025
diff --git a/UnitTests/MPAppNotificationHandlerTests.m b/UnitTests/MPAppNotificationHandlerTests.m
@@ -11,7 +11,7 @@ @interface MParticle ()
 + (dispatch_queue_t)messageQueue;
 @property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 @property (nonatomic, strong, readonly) MPAppNotificationHandler *appNotificationHandler;
-@property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
+@property (nonatomic, strong, readonly) MPPersistenceController_PRIVATE *persistenceController;
 
 @end
 

diff --git a/UnitTests/MPBackendControllerTests.m b/UnitTests/MPBackendControllerTests.m
diff --git a/UnitTests/MPBaseTestCase.m b/UnitTests/MPBaseTestCase.m
@@ -13,7 +13,7 @@
 #import "MPIConstants.h"
 
 @interface MParticle (Tests)
-@property (nonatomic, strong) MPPersistenceController *persistenceController;
+@property (nonatomic, strong) MPPersistenceController_PRIVATE *persistenceController;
 @end
 
 @interface MPTestConnectorFactory : NSObject <MPConnectorFactoryProtocol>
@@ -39,7 +39,7 @@ - (void)setUpWithCompletionHandler:(void (^)(NSError * _Nullable))completion {
     MParticle *instance = [MParticle sharedInstance];
     if (!instance.persistenceController) {
         // Ensure we have a persistence controller to reset the db etc
-        instance.persistenceController = [[MPPersistenceController alloc] init];
+        instance.persistenceController = [[MPPersistenceController_PRIVATE alloc] init];
     }
 
     [instance reset:^{

diff --git a/UnitTests/MPCustomModuleTests.m b/UnitTests/MPCustomModuleTests.m
@@ -92,7 +92,7 @@ - (NSDictionary *)customModuleConfiguration {
 
 - (void)setUp {
     [super setUp];
-    [MPPersistenceController setMpid:@1];
+    [MPPersistenceController_PRIVATE setMpid:@1];
 }
 
 - (void)testConfiguration {

diff --git a/UnitTests/MPDataModelTests.m b/UnitTests/MPDataModelTests.m
@@ -8,6 +8,7 @@
 #import "MPPersistenceController.h"
 #import "MPBaseTestCase.h"
 #import "mParticle.h"
+#import "MParticleSwift.h"
 
 @interface MParticle ()
 
@@ -29,7 +30,7 @@ - (void)setUp {
 }
 
 - (void)testSessionInstance {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
     XCTAssertNotNil(session, @"Should not have been nil");
 
     MPSession *sessionCopy = [session copy];
@@ -63,7 +64,7 @@ - (void)testSessionInstance {
 }
 
 - (void)testMessageInstance {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     MPMessageBuilder *messageBuilder = [[MPMessageBuilder alloc] initWithMessageType:MPMessageTypeEvent
                                                                              session:session
@@ -149,7 +150,7 @@ - (void)testFixInvalidKeysInDictionary {
 }
 
 - (void)testMessageInstanceWithInfinite {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     double four = 4.0;
     double zed = 0.0;
@@ -185,7 +186,7 @@ - (void)testMessageInstanceWithInfinite {
 }
 
 - (void)testUploadInstance {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     MPMessageBuilder *messageBuilder = [[MPMessageBuilder alloc] initWithMessageType:MPMessageTypeEvent
                                                                              session:session
@@ -199,7 +200,7 @@ - (void)testUploadInstance {
                                        kMPMessagesKey:@[[message dictionaryRepresentation]],
                                        kMPMessageIdKey:[[NSUUID UUID] UUIDString]};
 
-    MPUpload *upload = [[MPUpload alloc] initWithSessionId:[NSNumber numberWithLongLong:session.sessionId] uploadDictionary:uploadDictionary dataPlanId:@"test" dataPlanVersion:@(1) uploadSettings:[MPUploadSettings currentUploadSettings]];
+    MPUpload *upload = [[MPUpload alloc] initWithSessionId:[NSNumber numberWithLongLong:session.sessionId] uploadDictionary:uploadDictionary dataPlanId:@"test" dataPlanVersion:@(1) uploadSettings:[MPUploadSettings currentUploadSettingsWithStateMachine:[MParticle sharedInstance].stateMachine networkOptions:[MParticle sharedInstance].networkOptions]];
     XCTAssertNotNil(upload, @"Should not have been nil.");
 
     NSString *description = [upload description];
@@ -227,7 +228,7 @@ - (void)testUploadInstance {
 }
 
 - (void)testBreadcrumbInstance {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     MPMessageBuilder *messageBuilder = [[MPMessageBuilder alloc] initWithMessageType:MPMessageTypeEvent
                                                                              session:session
@@ -275,7 +276,7 @@ - (void)testBreadcrumbInstance {
 }
 
 - (void)testMessageEncoding {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     MPMessageBuilder *messageBuilder = [[MPMessageBuilder alloc] initWithMessageType:MPMessageTypeEvent
                                                                              session:session
@@ -290,7 +291,7 @@ - (void)testMessageEncoding {
 }
 
 - (void)testBreadcrumbEncoding {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
 
     MPMessageBuilder *messageBuilder = [[MPMessageBuilder alloc] initWithMessageType:MPMessageTypeEvent
                                                                              session:session

diff --git a/UnitTests/MPDeviceTests.m b/UnitTests/MPDeviceTests.m
@@ -1,8 +1,16 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
 #import "MPDevice.h"
-#import "MPIUserDefaults.h"
+#import "mParticle.h"
 #import "MPIConstants.h"
+#import "MParticleSwift.h"
+
+@interface MParticle ()
+
+@property (nonatomic, strong, readonly) MPStateMachine_PRIVATE *stateMachine;
+@property (nonatomic, strong, nonnull) MPBackendController_PRIVATE *backendController;
+
+@end
 
 @interface MPDeviceTests : XCTestCase
 
@@ -23,7 +31,7 @@ - (void)testTelephonyRadioAccessTechnology {
 
 - (void)testDictionaryDescription {
 #if TARGET_OS_IOS == 1
-    MPIUserDefaults *userDefaults = [MPIUserDefaults standardUserDefaults];
+    MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
     NSData *testDeviceToken = [@"<000000000000000000000000000000>" dataUsingEncoding:NSUTF8StringEncoding];
     userDefaults[kMPDeviceTokenKey] = testDeviceToken;
 

diff --git a/UnitTests/MPEventTests.m b/UnitTests/MPEventTests.m
@@ -145,7 +145,7 @@ - (void)testInvalidTypes {
 }
 
 - (void)testDictionaryRepresentation {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
     MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
@@ -179,7 +179,7 @@ - (void)testDictionaryRepresentation {
 }
 
 - (void)testDictionaryRepresentationWithDictionaryValues {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
     MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
@@ -214,7 +214,7 @@ - (void)testDictionaryRepresentationWithDictionaryValues {
 }
 
 - (void)testDictionaryRepresentationWithDictionaryValuesContainingDictionary {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
     MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
@@ -249,7 +249,7 @@ - (void)testDictionaryRepresentationWithDictionaryValuesContainingDictionary {
 }
 
 - (void)testDictionaryRepresentationWithNullValues {
-    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
+    MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController_PRIVATE mpId]];
     MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 

diff --git a/UnitTests/MPIdentityTests.m b/UnitTests/MPIdentityTests.m
@@ -13,7 +13,6 @@
 #import "MPKitContainer.h"
 #import "MPPersistenceController.h"
 #import "MPStateMachine.h"
-#import "MPIUserDefaults.h"
 
 typedef NS_ENUM(NSUInteger, MPIdentityRequestType) {
     MPIdentityRequestIdentify = 0,
@@ -59,7 +58,7 @@ - (instancetype)initWithIdentities:(NSDictionary *)identities;
 @interface MParticle ()
 
 @property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
-@property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
+@property (nonatomic, strong, readonly) MPPersistenceController_PRIVATE *persistenceController;
 
 @end
 
@@ -610,7 +609,7 @@ - (void)testIdentityRequestComplete {
 }
 
 - (void)testIdentifyIdentityRequestCompleteWithKits {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -642,7 +641,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKits {
 }
 
 - (void)testLoginIdentityRequestCompleteWithKits {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -674,7 +673,7 @@ - (void)testLoginIdentityRequestCompleteWithKits {
 }
 
 - (void)testLogoutIdentityRequestCompleteWithKits {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -702,7 +701,7 @@ - (void)testLogoutIdentityRequestCompleteWithKits {
 }
 
 - (void)testIdentifyIdentityRequestCompleteWithKitsAndNoUserChange {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -734,7 +733,7 @@ - (void)testIdentifyIdentityRequestCompleteWithKitsAndNoUserChange {
 }
 
 - (void)testLoginIdentityRequestCompleteWithKitsAndNoUserChange {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -766,7 +765,7 @@ - (void)testLoginIdentityRequestCompleteWithKitsAndNoUserChange {
 }
 
 - (void)testLogoutIdentityRequestCompleteWithKitsAndNoUserChange {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
@@ -794,7 +793,7 @@ - (void)testLogoutIdentityRequestCompleteWithKitsAndNoUserChange {
 }
 
 - (void)testMPIdZeroToMPId {
-    id mockPersistenceController = OCMClassMock([MPPersistenceController class]);
+    id mockPersistenceController = OCMClassMock([MPPersistenceController_PRIVATE class]);
     [[[mockPersistenceController stub] andReturn:@"0"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);

diff --git a/UnitTests/MPKitAPITests.m b/UnitTests/MPKitAPITests.m
@@ -10,7 +10,6 @@
 #import "MPPersistenceController.h"
 #import "MPKitContainer.h"
 #import "MPKitConfiguration.h"
-#import "MPIUserDefaults.h"
 #import "MPIConstants.h"
 
 @interface MPKitContainer_PRIVATE ()
@@ -22,8 +21,9 @@ @interface MPKitContainer_PRIVATE ()
 @interface MParticle ()
 
 + (dispatch_queue_t)messageQueue;
+@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 @property (nonatomic, strong) MPBackendController_PRIVATE *backendController;
-@property (nonatomic, strong) MPPersistenceController *persistenceController;
+@property (nonatomic, strong) MPPersistenceController_PRIVATE *persistenceController;
 @property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
 
 @end
@@ -58,7 +58,7 @@ - (void)setUp {
     [MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
     _kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
 
-    [MParticle sharedInstance].persistenceController = [[MPPersistenceController alloc] init];
+    [MParticle sharedInstance].persistenceController = [[MPPersistenceController_PRIVATE alloc] init];
 
     NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer_PRIVATE registeredKits];
     if (!registeredKits) {
@@ -119,7 +119,7 @@ - (void)testUserIdentities {
                                     @"f":@NO
                                     }
                                 ];
-    MPIUserDefaults *userDefaults = [MPIUserDefaults standardUserDefaults];
+    MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
     [userDefaults setMPObject:userIdentities forKey:kMPUserIdentityArrayKey userId:currentUser.userId];
     [userDefaults removeMPObjectForKey:@"ua"];
 
@@ -162,7 +162,7 @@ - (void)testUserAttributeFromCache {
                                 @"better data":@"ABC",
                                 @"bad data":@"12345"
                                 };
-    MPIUserDefaults *userDefaults = [MPIUserDefaults standardUserDefaults];
+    MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
     [userDefaults setMPObject:userAttributes forKey:kMPUserAttributeKey userId:currentUser.userId];
 
     NSString *goodHashedKey = [MPIHasher hashString:@"good data"];