Release 2.1.2

Author: echo-branch

Branch-TestBed/Branch-SDK-Tests/BNCDeviceInfoTests.m

@@ -8,6 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "BNCDeviceInfo.h"
+#import "BNCUserAgentCollector.h"
 
 @interface BNCDeviceInfoTests : XCTestCase
 @property (nonatomic, strong, readwrite) BNCDeviceInfo *deviceInfo;
@@ -16,16 +17,85 @@ @interface BNCDeviceInfoTests : XCTestCase
 @implementation BNCDeviceInfoTests
 
 - (void)setUp {
+    [self workaroundUserAgentLazyLoad];
     self.deviceInfo = [BNCDeviceInfo new];
 }
 
+// user agent needs to be loaded
+- (void)workaroundUserAgentLazyLoad {
+    __block XCTestExpectation *expectation = [self expectationWithDescription:@"setup"];
+    [[BNCUserAgentCollector instance] loadUserAgentWithCompletion:^(NSString * _Nullable userAgent) {
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError * _Nullable error) { }];
+}
+
 - (void)tearDown {
 
 }
 
-- (void)testAppVersion {
-    // checks test app version
-    XCTAssert([@"1.1" isEqualToString:self.deviceInfo.applicationVersion]);
+- (void)testHardwareId {
+    XCTAssertNotNil(self.deviceInfo.hardwareId);
+    
+    // verify hardwareId is a valid UUID
+    NSUUID *hardwareId = [[NSUUID alloc] initWithUUIDString:self.deviceInfo.hardwareId];
+    XCTAssertNotNil(hardwareId);
+}
+
+- (void)testHardwareIdType {
+    // without ATT, this is the IDFV. Branch servers expect it as vendor_id
+    XCTAssert([self.deviceInfo.hardwareIdType isEqualToString:@"vendor_id"]);
+}
+
+- (void)testIsRealHardwareId {
+    XCTAssert(self.deviceInfo.isRealHardwareId);
+}
+
+- (void)testAdvertiserId {
+    // the testbed does not show the ATT prompt.
+    XCTAssertNil(self.deviceInfo.advertiserId);
+}
+
+- (void)testVendorId {
+    XCTAssertNotNil(self.deviceInfo.vendorId);
+    
+    // verify vendorId is a valid UUID
+    NSUUID *vendorId = [[NSUUID alloc] initWithUUIDString:self.deviceInfo.vendorId];
+    XCTAssertNotNil(vendorId);
+}
+
+- (void)testAnonId {
+    XCTAssertNotNil(self.deviceInfo.anonId);
+    
+    // verify anonId is a valid UUID
+    NSUUID *anonId = [[NSUUID alloc] initWithUUIDString:self.deviceInfo.anonId];
+    XCTAssertNotNil(anonId);
+}
+
+- (void)testOptedInStatus {
+    // the testbed does not show the ATT prompt.
+    XCTAssert([self.deviceInfo.optedInStatus isEqualToString:@"not_determined"]);
+}
+
+- (void)testIsFirstOptIn {
+    // the testbed does not show the ATT prompt.
+    XCTAssert(self.deviceInfo.isFirstOptIn == NO);
+}
+
+- (void)testIsAdTrackingEnabled {
+    // on iOS 14+, this is always NO
+    XCTAssert(self.deviceInfo.isAdTrackingEnabled == NO);
+}
+
+- (void)testLocalIPAddress {
+    NSString *address = [self.deviceInfo localIPAddress];
+    XCTAssertNotNil(address);
+    XCTAssert(address.length > 7);
+}
+
+- (void)testConnectionType {
+    // simulator is on wifi
+    XCTAssert([[self.deviceInfo connectionType] isEqualToString:@"wifi"]);
 }
 
 - (void)testBrandName {
@@ -42,13 +112,9 @@ - (void)testModelName_Simulator {
     XCTAssert(x86_64 || arm64);
 }
 
-//- (void)testModelName_iPhone7 {
-//    XCTAssert([@"iPhone9,3" isEqualToString:self.deviceInfo.modelName]);
-//}
-
 - (void)testOSName {
     XCTAssertNotNil(self.deviceInfo.osName);
-    XCTAssert([self.deviceInfo.osName isEqualToString:[UIDevice currentDevice].systemName]);
+    XCTAssert([@"iOS" isEqualToString:self.deviceInfo.osName]);
 }
 
 - (void)testOSVersion {
@@ -61,6 +127,7 @@ - (void)testOSBuildVersion {
 }
 
 - (void)testEnvironment {
+    // currently not running unit tests on extensions
     XCTAssert([@"FULL_APP" isEqualToString:self.deviceInfo.environment]);
 }
 
@@ -75,25 +142,21 @@ - (void)testCpuType_Simulator {
 }
 
 - (void)testScreenWidth {
-    XCTAssert(self.deviceInfo.screenWidth.intValue > 320);
+    XCTAssert(self.deviceInfo.screenWidth.intValue >= 320);
 }
 
 - (void)testScreenHeight {
-    XCTAssert(self.deviceInfo.screenHeight.intValue > 320);
+    XCTAssert(self.deviceInfo.screenHeight.intValue >= 320);
 }
 
 - (void)testScreenScale {
-    XCTAssert(self.deviceInfo.screenScale.intValue > 0);
+    XCTAssert(self.deviceInfo.screenScale.intValue >= 1);
 }
 
 - (void)testCarrierName_Simulator {
     XCTAssertNil(self.deviceInfo.carrierName);
 }
 
-//- (void)testCarrierName_Att {
-//    XCTAssert([@"AT&T" isEqualToString:self.deviceInfo.carrierName]);
-//}
-
 - (void)testLocale {
     NSString *locale = [NSLocale currentLocale].localeIdentifier;
     XCTAssertNotNil(locale);
@@ -113,11 +176,14 @@ - (void)testLanguage {
 }
 
 - (void)testUserAgentString {
-    // Currently this method is a trivial pass through to the BNCUserAgentCollector singleton
-    // Eventually remove the singleton to enable easier testing
+    XCTAssert([self.deviceInfo.userAgentString containsString:@"AppleWebKit"]);
 }
 
-- (void)testPlugin {
+- (void)testApplicationVersion_TestBed {
+    XCTAssert([@"1.1" isEqualToString:self.deviceInfo.applicationVersion]);
+}
+
+- (void)testRegisterPluginNameVersion {
     XCTAssertNil(self.deviceInfo.pluginName);
     XCTAssertNil(self.deviceInfo.pluginVersion);
 
@@ -130,14 +196,6 @@ - (void)testPlugin {
     XCTAssert([expectedVersion isEqualToString:self.deviceInfo.pluginVersion]);
 }
 
-- (void)testLocalIPAddress {
-    NSString *address = [self.deviceInfo localIPAddress];
-    XCTAssertNotNil(address);
-    
-    // shortest ipv4 is 7
-    XCTAssert(address.length >= 7);
-}
-
 // just a sanity check on the V2 dictionary
 - (void)testV2Dictionary {
     NSDictionary *dict = [self.deviceInfo v2dictionary];

Branch-TestBed/Branch-SDK-Tests/BNCDeviceSystemTests.m

@@ -40,7 +40,6 @@ - (void)testMachine_Simulator {
     XCTAssert(x86_64 || arm64);
 }
 
-/* Commenting out until this can be made more robust/portable/updated/whatever.
 - (void)testCPUType_Simulator {
     // intel processor
     bool x86 = [@(7) isEqualToNumber:self.deviceSystem.cpuType];
@@ -51,12 +50,13 @@ - (void)testCPUType_Simulator {
     bool arm_sub = [@(2) isEqualToNumber:self.deviceSystem.cpuSubType];
 
     XCTAssert(x86 || arm);
-    if (x86) {
-        XCTAssert(x86_sub);
-    } else {
-        XCTAssert(arm_sub);
-    }
+
+// cpu subtype is different on cloud runners
+//    if (x86) {
+//        XCTAssert(x86_sub);
+//    } else {
+//        XCTAssert(arm_sub);
+//    }
 }
-// */
 
 @end

Branch-TestBed/Branch-SDK-Tests/BNCNetworkInterfaceTests.m

@@ -0,0 +1,82 @@
+//
+//  BNCNetworkInterfaceTests.m
+//  Branch-SDK-Tests
+//
+//  Created by Ernest Cho on 3/10/23.
+//  Copyright © 2023 Branch, Inc. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import <arpa/inet.h>
+#import "BNCNetworkInterface.h"
+
+// Category using inet_pton to validate
+@implementation NSString (Test)
+
+- (BOOL)isValidIPAddress {
+    const char *utf8 = [self UTF8String];
+    int success;
+
+    struct in_addr dst;
+    success = inet_pton(AF_INET, utf8, &dst);
+    if (success != 1) {
+        struct in6_addr dst6;
+        success = inet_pton(AF_INET6, utf8, &dst6);
+    }
+
+    return success == 1;
+}
+
+@end
+
+@interface BNCNetworkInterfaceTests : XCTestCase
+
+@end
+
+@implementation BNCNetworkInterfaceTests
+
+- (void)setUp {
+    
+}
+
+- (void)tearDown {
+
+}
+
+// verify tooling method works
+- (void)testIPValidationCategory {
+    XCTAssert(![@"" isValidIPAddress]);
+    
+    // ipv4
+    XCTAssert([@"0.0.0.0" isValidIPAddress]);
+    XCTAssert([@"127.0.0.1" isValidIPAddress]);
+    XCTAssert([@"10.1.2.3" isValidIPAddress]);
+    XCTAssert([@"172.0.0.0" isValidIPAddress]);
+    XCTAssert([@"192.0.0.0" isValidIPAddress]);
+    XCTAssert([@"255.255.255.255" isValidIPAddress]);
+    
+    // invalid ipv4
+    XCTAssert(![@"-1.0.0.0" isValidIPAddress]);
+    XCTAssert(![@"256.0.0.0" isValidIPAddress]);
+    
+    // ipv6
+    XCTAssert([@"2001:0db8:0000:0000:0000:8a2e:0370:7334" isValidIPAddress]);
+    XCTAssert([@"2001:db8::8a2e:370:7334" isValidIPAddress]);
+    
+    // invalid ipv6
+    XCTAssert(![@"2001:0db8:0000:0000:0000:8a2e:0370:733g" isValidIPAddress]);
+    XCTAssert(![@"2001:0db8:0000:0000:0000:8a2e:0370:7330:1234" isValidIPAddress]);
+}
+
+- (void)testLocalIPAddress {
+    XCTAssert([[BNCNetworkInterface localIPAddress] isValidIPAddress]);
+}
+
+- (void)testAllIPAddresses {
+    // All IP addresses is a debug method that returns object descriptions
+    for (NSString *address in BNCNetworkInterface.allIPAddresses) {
+        XCTAssert([address containsString:@"BNCNetworkInterface"]);
+    }
+}
+
+@end