Skip to content

refactor: Port MPDevice to Swift #328

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
BrandonStalnaker merged 2 commits into from
Feb 11, 2025
Merged

refactor: Port MPDevice to Swift #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84b6014
refactor: Port MPDevice to Swift
BrandonStalnaker Feb 5, 2025
1d842e9
address pr
BrandonStalnaker Feb 7, 2025
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
1 change: 0 additions & 1 deletion UnitTests/MPBackendControllerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#import "MPKitConfiguration.h"
#import "MParticleSwift.h"
#import "MPBaseTestCase.h"
#import "MPDevice.h"
#import "MPLaunchInfo.h"

#if TARGET_OS_IOS == 1
Expand Down
17 changes: 8 additions & 9 deletions UnitTests/MPDeviceTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#import <XCTest/XCTest.h>
#import <OCMock/OCMock.h>
#import "MPDevice.h"
#import "mParticle.h"
#import "MPIConstants.h"
#import "MParticleSwift.h"

#if TARGET_OS_IOS == 1
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
#import <CoreTelephony/CTCarrier.h>
#endif
@interface MParticle ()

@property (nonatomic, strong, readonly) MPStateMachine_PRIVATE *stateMachine;
Expand All @@ -19,23 +21,20 @@ @interface MPDeviceTests : XCTestCase
@implementation MPDeviceTests

- (void)testTelephonyRadioAccessTechnology {
#if TARGET_OS_IOS == 1
CTTelephonyNetworkInfo *mockTelephonyNetworkInfo = OCMPartialMock([[CTTelephonyNetworkInfo alloc] init]);
[[[(id)mockTelephonyNetworkInfo stub] andReturn:@"foo"] currentRadioAccessTechnology];
MPDevice *device = [[MPDevice alloc] init];
[device setValue:mockTelephonyNetworkInfo forKey:@"telephonyNetworkInfo"];
#if TARGET_OS_IOS == 1 && !MPARTICLE_LOCATION_DISABLE
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSString *technology = device.radioAccessTechnology;
XCTAssertEqualObjects(technology, @"None");
#endif
}

- (void)testDictionaryDescription {
#if TARGET_OS_IOS == 1
#if TARGET_OS_IOS == 1 && !MPARTICLE_LOCATION_DISABLE
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
NSData *testDeviceToken = [@"<000000000000000000000000000000>" dataUsingEncoding:NSUTF8StringEncoding];
userDefaults[kMPDeviceTokenKey] = testDeviceToken;

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *testDictionary = device.dictionaryRepresentation;
XCTAssertEqualObjects(testDictionary[@"dll"], @"en");
XCTAssertEqualObjects(testDictionary[@"dlc"], @"US");
Expand Down
1 change: 0 additions & 1 deletion UnitTests/MPNetworkCommunicationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#import "MPPersistenceController.h"
#import "MPURL.h"
#import "MPStateMachine.h"
#import "MPDevice.h"
#import "MParticleSwift.h"
#import "MPIConstants.h"

Expand Down
1 change: 0 additions & 1 deletion UnitTests/MPUploadBuilderTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#import "MPIntegrationAttributes.h"
#import "MPPersistenceController.h"
#import "MPBaseTestCase.h"
#import "MPDevice.h"
#import "mParticle.h"
#import "MParticleSwift.h"

Expand Down
13 changes: 6 additions & 7 deletions UnitTests/MParticleTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#import "MPURLRequestBuilder.h"
#import "MPPersistenceController.h"
#import "MPURL.h"
#import "MPDevice.h"
#import "MPKitContainer.h"
#import "MPKitTestClassSideloaded.h"
#import "MPKitTestClassNoStartImmediately.h"
Expand Down Expand Up @@ -826,7 +825,7 @@ - (void)testSetATTStatusNotDetermined {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusNotDetermined);
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"not_determined");
Expand Down Expand Up @@ -854,7 +853,7 @@ - (void)testSetATTStatusRestricted {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusRestricted);
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"restricted");
Expand Down Expand Up @@ -882,7 +881,7 @@ - (void)testSetATTStatusDenied {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusDenied);
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"denied");
Expand Down Expand Up @@ -910,7 +909,7 @@ - (void)testSetATTStatusAuthorized {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusAuthorized);
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"authorized");
Expand Down Expand Up @@ -939,7 +938,7 @@ - (void)testSetATTStatusWithTimestamp {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusAuthorized);
XCTAssertEqual(instance.stateMachine.attAuthorizationTimestamp.doubleValue, testTimestamp.doubleValue);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"authorized");
Expand Down Expand Up @@ -967,7 +966,7 @@ - (void)testSetATTStatusRemoveIDFA {
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusDenied);
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);

MPDevice *device = [[MPDevice alloc] init];
MPDevice *device = [[MPDevice alloc] initWithStateMachine:[MParticle sharedInstance].stateMachine userDefaults:[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] identity:[MParticle sharedInstance].identity];
NSDictionary *deviceDict = [device dictionaryRepresentation];

XCTAssertEqualObjects(deviceDict[kMPATT], @"denied");
Expand Down
Loading