CORE-1391 fix tests for apple processor macs

BranchMetrics · May 26, 2021 · 2696ab4 · 2696ab4
1 parent af8f3c0
commit 2696ab4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCDeviceInfoTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCDeviceInfoTests.m
@@ -33,7 +33,13 @@ - (void)testBrandName {
 }
 
 - (void)testModelName_Simulator {
-    XCTAssert([@"x86_64" isEqualToString:self.deviceInfo.modelName]);
+    // intel processor
+    bool x86_64 = [@"x86_64" isEqualToString:self.deviceInfo.modelName];
+
+    // apple processor
+    bool arm64 = [@"arm64" isEqualToString:self.deviceInfo.modelName];
+
+    XCTAssert(x86_64 || arm64);
 }
 
 //- (void)testModelName_iPhone7 {
@@ -59,15 +65,15 @@ - (void)testEnvironment {
 }
 
 - (void)testCpuType_Simulator {
-    NSString *expected = @"7";
-    XCTAssert([expected isEqualToString:self.deviceInfo.cpuType]);
+    // intel processors
+    bool x86 = [@"7" isEqualToString:self.deviceInfo.cpuType];
+
+    // apple processors
+    bool arm = [@"16777228" isEqualToString:self.deviceInfo.cpuType];
+
+    XCTAssert(x86 || arm);
 }
 
-//- (void)testCpuType_iPhone7 {
-//    NSString *expected = @"16777228";
-//    XCTAssert([expected isEqualToString:self.deviceInfo.cpuType]);
-//}
-
 - (void)testScreenWidth {
     XCTAssert(self.deviceInfo.screenWidth.intValue > 320);
 }

diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCDeviceSystemTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCDeviceSystemTests.m
@@ -31,12 +31,30 @@ - (void)testSystemBuildVersion {
 }
 
 - (void)testMachine_Simulator {
-    XCTAssert([@"x86_64" isEqualToString:self.deviceSystem.machine]);
+    // intel processor
+    bool x86_64 = [@"x86_64" isEqualToString:self.deviceSystem.machine];
+
+    // apple processor
+    bool arm64 = [@"arm64" isEqualToString:self.deviceSystem.machine];
+
+    XCTAssert(x86_64 || arm64);
 }
 
 - (void)testCPUType_Simulator {
-    XCTAssert([@(7) isEqualToNumber:self.deviceSystem.cpuType]);
-    XCTAssert([@(8) isEqualToNumber:self.deviceSystem.cpuSubType]);
+    // intel processor
+    bool x86 = [@(7) isEqualToNumber:self.deviceSystem.cpuType];
+    bool x86_sub = [@(8) isEqualToNumber:self.deviceSystem.cpuSubType];
+
+    // apple processor
+    bool arm = [@(16777228) isEqualToNumber:self.deviceSystem.cpuType];
+    bool arm_sub = [@(2) isEqualToNumber:self.deviceSystem.cpuSubType];
+
+    XCTAssert(x86 || arm);
+    if (x86) {
+        XCTAssert(x86_sub);
+    } else {
+        XCTAssert(arm_sub);
+    }
 }
 
 @end