Pass RCNConfigDBManagerTest.m

Author: paulb777

FirebaseRemoteConfig/SwiftNew/ConfigDBManager.swift

@@ -50,17 +50,17 @@ open class ConfigDBManager: NSObject {
   /// Shared Singleton Instance
   @objc public static let sharedInstance = ConfigDBManager()
 
-  private let databaseActor = DatabaseActor() // Use the actor
+  private let databaseActor: DatabaseActor
 
   @objc public var isNewDatabase: Bool = false
 
-  @objc override public init() {
+  @objc public init(dbPath: String = remoteConfigPathForDatabase()) {
+    databaseActor = DatabaseActor(dbPath: dbPath)
     super.init()
   }
 
   /// Returns the current version of the Remote Config database.
-  @objc public
-  static func remoteConfigPathForDatabase() -> String {
+  public static func remoteConfigPathForDatabase() -> String {
     #if os(tvOS)
       let dirPaths = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)
     #else

FirebaseRemoteConfig/SwiftNew/DatabaseActor.swift

@@ -24,8 +24,10 @@ private let RCNDatabaseName = "RemoteConfig.sqlite3"
 actor DatabaseActor {
   private var database: OpaquePointer?
   private var isNewDatabase: Bool = false
+  private let dbPath: String
 
-  init() {
+  init(dbPath: String) {
+    self.dbPath = dbPath
     Task {
       await createOrOpenDatabase()
     }
@@ -39,13 +41,9 @@ actor DatabaseActor {
                  "Old database V0 exists, removed it and replace with the new one.")
       removeDatabase(atPath: oldV0DBPath)
     }
-    let dbPath = ConfigDBManager.remoteConfigPathForDatabase()
     RCLog.info("I-RCN000062", "Loading database at path \(dbPath)")
     let cDbPath = (dbPath as NSString).utf8String
 
-    #warning("Delete me")
-    removeDatabase(atPath: dbPath)
-
     // Create or open database path.
     if !createFilePath(ifNotExist: dbPath) {
       return
@@ -87,7 +85,7 @@ actor DatabaseActor {
 
   func insertMetadataTable(withValues columnNameToValue: [String: Any]) -> Bool {
     let sql = """
-    INSERT INTO fetch_metadata (\
+    INSERT into fetch_metadata (\
       bundle_identifier, \
       namespace, \
       fetch_time, \

FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m

@@ -55,12 +55,10 @@ - (void)setUp {
   _DBPath = [RCNTestUtilities remoteConfigPathForTestDatabase];
 
   _expectionTimeout = 10.0;
-  id classMock = OCMClassMock([RCNConfigDBManager class]);
-  OCMStub([classMock remoteConfigPathForDatabase]).andReturn(_DBPath);
-  _DBManager = [[RCNConfigDBManager alloc] init];
+  _DBManager = [[RCNConfigDBManager alloc] initWithDbPath:_DBPath];
 
   // TODO: Why does this make all tests fail?
-  //  [_DBManager removeDatabaseWithPath: _DBPath];
+  //[_DBManager removeDatabaseWithPath: _DBPath];
 }
 
 - (void)tearDown {
@@ -134,9 +132,12 @@ - (void)testWriteAndLoadMainTableResult {
         // check DB read correctly
         [self->_DBManager
             loadMainWithBundleIdentifier:bundleIdentifier
-                       completionHandler:^(BOOL success, NSDictionary *fetchedConfig,
-                                           NSDictionary *activeConfig, NSDictionary *defaultConfig,
-                                           NSDictionary *unusedRolloutMetadata) {
+                       completionHandler:^(
+                           BOOL loadSuccess,
+                           NSDictionary<NSString *, NSDictionary<NSString *, id> *> *fetchedConfig,
+                           NSDictionary<NSString *, NSDictionary<NSString *, id> *> *activeConfig,
+                           NSDictionary<NSString *, NSDictionary<NSString *, id> *> *defaultConfig,
+                           NSDictionary *unusedRolloutMetadata) {
                          NSMutableDictionary *res = [fetchedConfig mutableCopy];
                          XCTAssertTrue(success);
                          FIRRemoteConfigValue *value = res[namespace_p][@"key100"];
@@ -219,7 +220,7 @@ - (void)testWriteAndLoadMetadataResult {
   NSTimeInterval lastFetchTimestamp = [NSDate date].timeIntervalSince1970;
 
   NSDictionary *deviceContext =
-      @{@"app_version" : @"1.0.1", @"app_build" : @"1.0.1.11", @"os_version" : @"iOS9.1"};
+      @{@"app_version" : @"1.0.1", @"app_build" : @"1.0.1.11", @"os_version" : @"iOS19.1"};
   NSDictionary *syncedDBCustomVariables = @{@"user_level" : @15, @"user_experiences" : @"2468"};
   NSArray *successFetchTimes = @[];
   NSTimeInterval now = [NSDate date].timeIntervalSince1970;

FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m

@@ -63,8 +63,6 @@ - (void)setUp {
   [super setUp];
   _expectationTimeout = 1.0;
   _DBPath = [RCNTestUtilities remoteConfigPathForTestDatabase];
-  _DBManagerMock = OCMClassMock([RCNConfigDBManager class]);
-  OCMStub([_DBManagerMock remoteConfigPathForDatabase]).andReturn(_DBPath);
 
   // Mock all database operations.
   NSDictionary<NSString *, id> *payload1 = @{@"experimentId" : @"DBValue1"};

FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m

@@ -93,9 +93,7 @@ - (void)setUpConfigMock {
 
   // Always remove the database at the start of testing.
   _DBPath = [RCNTestUtilities remoteConfigPathForTestDatabase];
-  id classMock = OCMClassMock([RCNConfigDBManager class]);
-  OCMStub([classMock remoteConfigPathForDatabase]).andReturn(_DBPath);
-  _DBManager = [[RCNConfigDBManager alloc] init];
+  _DBManager = [[RCNConfigDBManager alloc] initWithDbPath:_DBPath];
 
   _userDefaultsSuiteName = [RCNTestUtilities userDefaultsSuiteNameForTestSuite];
   _userDefaults = [[NSUserDefaults alloc] initWithSuiteName:_userDefaultsSuiteName];

FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m

@@ -93,18 +93,17 @@ - (void)setUp {
 
   // Always remove the database at the start of testing.
   NSString *DBPath = [RCNTestUtilities remoteConfigPathForTestDatabase];
-  id DBMock = OCMClassMock([RCNConfigDBManager class]);
-  OCMStub([DBMock remoteConfigPathForDatabase]).andReturn(DBPath);
+  RCNConfigDBManager *DBManager = [[RCNConfigDBManager alloc] initWithDbPath:DBPath];
 
-  RCNConfigContent *configContent = [[RCNConfigContent alloc] initWithDBManager:DBMock];
+  RCNConfigContent *configContent = [[RCNConfigContent alloc] initWithDBManager:DBManager];
 
   // Create a mock FIRRemoteConfig instance.
   _configInstance = OCMPartialMock([[FIRRemoteConfig alloc]
       initWithAppName:@"testApp"
            FIROptions:[[FIROptions alloc] initWithGoogleAppID:@"1:123:ios:test"
                                                   GCMSenderID:@"testSender"]
             namespace:@"namespace"
-            DBManager:DBMock
+            DBManager:DBManager
         configContent:configContent
             analytics:_analyticsMock]);
   [_configInstance setValue:[RCNPersonalizationTest mockFetchRequest] forKey:@"_configFetch"];

FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m

@@ -165,9 +165,7 @@ - (void)setUp {
 
   // Always remove the database at the start of testing.
   _DBPath = [RCNTestUtilities remoteConfigPathForTestDatabase];
-  _DBManagerMock = OCMClassMock([RCNConfigDBManager class]);
-  OCMStub([_DBManagerMock remoteConfigPathForDatabase]).andReturn(_DBPath);
-  _DBManager = [[RCNConfigDBManager alloc] init];
+  _DBManager = [[RCNConfigDBManager alloc] initWithDbPath:_DBPath];
 
   _userDefaultsSuiteName = [RCNTestUtilities userDefaultsSuiteNameForTestSuite];
   _userDefaults = [[NSUserDefaults alloc] initWithSuiteName:_userDefaultsSuiteName];