Skip to content

Commit 0fda347

Browse files
refactor: Port MPDevice to Swift (#328)
* refactor: Port MPDevice to Swift
1 parent db286bc commit 0fda347

22 files changed

+657
-686
lines changed

UnitTests/MPBackendControllerTests.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#import "MPKitConfiguration.h"
1818
#import "MParticleSwift.h"
1919
#import "MPBaseTestCase.h"
20-
#import "MPDevice.h"
2120
#import "MPLaunchInfo.h"
2221

2322
#if TARGET_OS_IOS == 1

UnitTests/MPDeviceTests.m

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#import <XCTest/XCTest.h>
22
#import <OCMock/OCMock.h>
3-
#import "MPDevice.h"
43
#import "mParticle.h"
54
#import "MPIConstants.h"
65
#import "MParticleSwift.h"
7-
6+
#if TARGET_OS_IOS == 1
7+
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
8+
#import <CoreTelephony/CTCarrier.h>
9+
#endif
810
@interface MParticle ()
911

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

2123
- (void)testTelephonyRadioAccessTechnology {
22-
#if TARGET_OS_IOS == 1
23-
CTTelephonyNetworkInfo *mockTelephonyNetworkInfo = OCMPartialMock([[CTTelephonyNetworkInfo alloc] init]);
24-
[[[(id)mockTelephonyNetworkInfo stub] andReturn:@"foo"] currentRadioAccessTechnology];
25-
MPDevice *device = [[MPDevice alloc] init];
26-
[device setValue:mockTelephonyNetworkInfo forKey:@"telephonyNetworkInfo"];
24+
#if TARGET_OS_IOS == 1 && !MPARTICLE_LOCATION_DISABLE
25+
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];
2726
NSString *technology = device.radioAccessTechnology;
2827
XCTAssertEqualObjects(technology, @"None");
2928
#endif
3029
}
3130

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

38-
MPDevice *device = [[MPDevice alloc] init];
37+
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];
3938
NSDictionary *testDictionary = device.dictionaryRepresentation;
4039
XCTAssertEqualObjects(testDictionary[@"dll"], @"en");
4140
XCTAssertEqualObjects(testDictionary[@"dlc"], @"US");

UnitTests/MPNetworkCommunicationTests.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#import "MPPersistenceController.h"
1212
#import "MPURL.h"
1313
#import "MPStateMachine.h"
14-
#import "MPDevice.h"
1514
#import "MParticleSwift.h"
1615
#import "MPIConstants.h"
1716

UnitTests/MPUploadBuilderTests.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import "MPIntegrationAttributes.h"
1010
#import "MPPersistenceController.h"
1111
#import "MPBaseTestCase.h"
12-
#import "MPDevice.h"
1312
#import "mParticle.h"
1413
#import "MParticleSwift.h"
1514

UnitTests/MParticleTests.m

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#import "MPURLRequestBuilder.h"
99
#import "MPPersistenceController.h"
1010
#import "MPURL.h"
11-
#import "MPDevice.h"
1211
#import "MPKitContainer.h"
1312
#import "MPKitTestClassSideloaded.h"
1413
#import "MPKitTestClassNoStartImmediately.h"
@@ -826,7 +825,7 @@ - (void)testSetATTStatusNotDetermined {
826825
XCTAssertEqual(instance.stateMachine.attAuthorizationStatus.intValue, MPATTAuthorizationStatusNotDetermined);
827826
XCTAssert(instance.stateMachine.attAuthorizationTimestamp);
828827

829-
MPDevice *device = [[MPDevice alloc] init];
828+
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];
830829
NSDictionary *deviceDict = [device dictionaryRepresentation];
831830

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

857-
MPDevice *device = [[MPDevice alloc] init];
856+
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];
858857
NSDictionary *deviceDict = [device dictionaryRepresentation];
859858

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

885-
MPDevice *device = [[MPDevice alloc] init];
884+
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];
886885
NSDictionary *deviceDict = [device dictionaryRepresentation];
887886

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

913-
MPDevice *device = [[MPDevice alloc] init];
912+
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];
914913
NSDictionary *deviceDict = [device dictionaryRepresentation];
915914

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

942-
MPDevice *device = [[MPDevice alloc] init];
941+
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];
943942
NSDictionary *deviceDict = [device dictionaryRepresentation];
944943

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

970-
MPDevice *device = [[MPDevice alloc] init];
969+
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];
971970
NSDictionary *deviceDict = [device dictionaryRepresentation];
972971

973972
XCTAssertEqualObjects(deviceDict[kMPATT], @"denied");

0 commit comments

Comments
 (0)