Fix tests

duckduckgo · Aug 30, 2024 · 636d565 · 636d565
1 parent 0106b03
commit 636d565
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 40 deletions.
diff --git a/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift b/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift
@@ -91,7 +91,7 @@ final class MockPrivacyConfigurationManager: NSObject, PrivacyConfigurationManag
     }
 
     func reload(etag: String?, data: Data?) -> BrowserServicesKit.PrivacyConfigurationManager.ReloadResult {
-        fatalError("not implemented")
+        return .embedded
     }
 
     var updatesPublisher: AnyPublisher<Void, Never> = Just(()).eraseToAnyPublisher()

diff --git a/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift b/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift
@@ -43,7 +43,6 @@ class HTTPSUpgradeIntegrationTests: XCTestCase {
         window = WindowsManager.openNewWindow(with: .none)!
 
         XCTAssertTrue(AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig.isFeature(.httpsUpgrade, enabledForDomain: "privacy-test-pages.site"))
-        await ConfigurationManager.shared.refreshIfNeeded()?.value
     }
 
     @MainActor

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -41,6 +41,8 @@ let package = Package(
                 .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions"),
                 .byName(name: "XPCHelper"),
                 .product(name: "PixelKit", package: "BrowserServicesKit"),
+                .product(name: "Configuration", package: "BrowserServicesKit"),
+                .product(name: "Persistence", package: "BrowserServicesKit")
             ],
             resources: [.process("Resources")],
             swiftSettings: [

diff --git a/...rProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift b/...rProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift
@@ -116,7 +116,7 @@ public final class DataBrokerProtectionAgentManager {
     private let operationDependencies: DataBrokerOperationDependencies
     private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let agentStopper: DataBrokerProtectionAgentStopper
-    private let configurationManger: ConfigurationManager
+    private let configurationManger: DefaultConfigurationManager
 
     // Used for debug functions only, so not injected
     private lazy var browserWindowManager = BrowserWindowManager()
@@ -131,7 +131,7 @@ public final class DataBrokerProtectionAgentManager {
          operationDependencies: DataBrokerOperationDependencies,
          pixelHandler: EventMapping<DataBrokerProtectionPixels>,
          agentStopper: DataBrokerProtectionAgentStopper,
-         configurationManager: ConfigurationManager
+         configurationManager: DefaultConfigurationManager
     ) {
         self.userNotificationService = userNotificationService
         self.activityScheduler = activityScheduler

diff --git a/...kerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionAgentManagerTests.swift b/...kerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionAgentManagerTests.swift
@@ -17,6 +17,8 @@
 //
 
 import XCTest
+import Configuration
+import Persistence
 @testable import DataBrokerProtection
 
 final class DataBrokerProtectionAgentManagerTests: XCTestCase {
@@ -32,13 +34,15 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
     private var mockDependencies: DefaultDataBrokerOperationDependencies!
     private var mockProfile: DataBrokerProtectionProfile!
     private var mockAgentStopper: MockAgentStopper!
+    private var mockConfigurationManager: MockConfigurationManager!
 
     override func setUpWithError() throws {
 
         mockPixelHandler = MockPixelHandler()
         mockActivityScheduler = MockDataBrokerProtectionBackgroundActivityScheduler()
         mockNotificationService = MockUserNotificationService()
         mockAgentStopper = MockAgentStopper()
+        mockConfigurationManager = MockConfigurationManager()
 
         let mockDatabase = MockDatabase()
         let mockMismatchCalculator = MockMismatchCalculator(database: mockDatabase, pixelHandler: mockPixelHandler)
@@ -78,7 +82,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockDataManager.profileToReturn = mockProfile
 
@@ -121,7 +126,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: agentStopper)
+            agentStopper: agentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockDataManager.profileToReturn = nil
 
@@ -153,7 +159,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockDataManager.profileToReturn = nil
 
@@ -190,7 +197,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockDataManager.profileToReturn = mockProfile
 
@@ -216,7 +224,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockDataManager.profileToReturn = mockProfile
 
@@ -242,7 +251,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockNotificationService.reset()
 
@@ -263,7 +273,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockNotificationService.reset()
 
@@ -284,7 +295,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockNotificationService.reset()
         mockQueueManager.startImmediateOperationsIfPermittedCompletionError = DataBrokerProtectionAgentErrorCollection(oneTimeError: NSError(domain: "test", code: 10))
@@ -306,7 +318,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockNotificationService.reset()
         mockDataManager.shouldReturnHasMatches = true
@@ -328,7 +341,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         mockNotificationService.reset()
         mockDataManager.shouldReturnHasMatches = false
@@ -350,7 +364,8 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
             dataManager: mockDataManager,
             operationDependencies: mockDependencies,
             pixelHandler: mockPixelHandler,
-            agentStopper: mockAgentStopper)
+            agentStopper: mockAgentStopper,
+            configurationManager: mockConfigurationManager)
 
         var startScheduledScansCalled = false
         mockQueueManager.startScheduledOperationsIfPermittedCalledCompletion = { _ in
@@ -364,3 +379,48 @@ final class DataBrokerProtectionAgentManagerTests: XCTestCase {
         XCTAssertTrue(startScheduledScansCalled)
     }
 }
+
+struct MockConfigurationFetcher: ConfigurationFetching {
+    func fetch(_ configuration: Configuration, isDebug: Bool) async throws {
+        return
+    }
+
+    func fetch(all configurations: [Configuration]) async throws {
+        return
+    }
+}
+
+struct MockConfigurationStore: ConfigurationStoring {
+    func loadData(for configuration: Configuration) -> Data? {
+        return nil
+    }
+
+    func loadEtag(for configuration: Configuration) -> String? {
+        return nil
+    }
+
+    func loadEmbeddedEtag(for configuration: Configuration) -> String? {
+        return nil
+    }
+
+    mutating func saveData(_ data: Data, for configuration: Configuration) throws {
+        return
+    }
+
+    mutating func saveEtag(_ etag: String, for configuration: Configuration) throws {
+        return
+    }
+
+    func fileUrl(for configuration: Configuration) -> URL {
+        return URL(string: "file:///\(configuration.rawValue)")!
+    }
+
+}
+
+final class MockConfigurationManager: DefaultConfigurationManager {
+    override init(fetcher: ConfigurationFetching = MockConfigurationFetcher(),
+                  store: ConfigurationStoring = MockConfigurationStore(),
+                  defaults: KeyValueStoring = UserDefaults()) {
+        super.init(fetcher: fetcher, store: store)
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -19,6 +19,7 @@
 import BrowserServicesKit
 import Combine
 import Common
+import Configuration
 import Foundation
 import GRDB
 import SecureStorage
@@ -1929,3 +1930,17 @@ struct MockMigrationsProvider: DataBrokerProtectionDatabaseMigrationsProvider {
         return { _ in }
     }
 }
+
+//struct MockConfigurationFetcher: ConfigurationFetching {
+//    func fetch(_ configuration: Configuration, isDebug: Bool) async throws {
+//        return
+//    }
+//    
+//    func fetch(all configurations: [Configuration]) async throws {
+//        return
+//    }
+//}
+//
+//final class MockConfigurationManager: DefaultConfigurationManager {
+//
+//}