Work in progress: Fixed some compiler errors.

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>

Author: i2h3

Sources/NextcloudFileProviderKit/Enumeration/RemoteChangeObserver.swift

@@ -18,7 +18,7 @@ public actor RemoteChangeObserver: NSObject, Sendable {
     private(set) var account: Account
     public var accountId: String { account.ncKitAccount }
 
-    public let webSocketPingIntervalNanoseconds: UInt64 = 3 * 1_000_000_000
+    public var webSocketPingIntervalNanoseconds: UInt64 = 3 * 1_000_000_000
     public let webSocketReconfigureIntervalNanoseconds: UInt64 = 1 * 1_000_000_000
     public let webSocketPingFailLimit = 8
     public let webSocketAuthenticationFailLimit = 3
@@ -40,7 +40,8 @@ public actor RemoteChangeObserver: NSObject, Sendable {
     private(set) var webSocketAuthenticationFailCount = 0
 
     private(set) var pollingTimer: Timer?
-    public var pollInterval: TimeInterval = 60 {
+
+    private(set) var pollInterval: TimeInterval = 60 {
         didSet {
             if pollingActive {
                 stopPollingTimer()
@@ -364,6 +365,14 @@ public actor RemoteChangeObserver: NSObject, Sendable {
     func replaceAccount(with account: Account) {
         self.account = account
     }
+
+    func setPollInterval(to interval: TimeInterval) {
+        self.pollInterval = interval
+    }
+
+    func setWebSocketPingInterval(to nanoseconds: UInt64) {
+        self.webSocketPingIntervalNanoseconds = nanoseconds
+    }
 }
 
 // MARK: - URLSessionWebSocketDelegate

Sources/NextcloudFileProviderKitMocks/TestableRemoteInterface.swift

@@ -8,7 +8,13 @@ import NextcloudCapabilitiesKit
 import NextcloudKit
 
 public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
-    public init() {}
+    public typealias FetchCapabilitiesHandler = @Sendable (Account, NKRequestOptions, @Sendable @escaping (URLSessionTask) -> Void) async -> FetchResult
+
+    public let fetchCapabilitiesHandler: FetchCapabilitiesHandler?
+
+    public init(fetchCapabilitiesHandler: FetchCapabilitiesHandler?) {
+        self.fetchCapabilitiesHandler = fetchCapabilitiesHandler
+    }
 
     public func setDelegate(_: any NextcloudKitDelegate) {}
 
@@ -171,8 +177,6 @@ public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
 
     public typealias FetchResult = (account: String, capabilities: Capabilities?, data: Data?, error: NKError)
 
-    public var fetchCapabilitiesHandler: (@Sendable (Account, NKRequestOptions, @Sendable @escaping (URLSessionTask) -> Void) async -> FetchResult)?
-
     public func fetchCapabilities(
         account: Account,
         options: NKRequestOptions = .init(),

Tests/NextcloudFileProviderKitTests/EnumeratorTests.swift

@@ -310,9 +310,7 @@ final class EnumeratorTests: NextcloudFileProviderKitTestCase {
         // --- Scenario A: Initial Paginated Request (isFollowUpPaginatedRequest == false) ---
 
         // 2. Act: Call readServerUrl for the first page.
-        let (
-            initialMetadatas, _, _, _, initialNextPage, initialError
-        ) = await Enumerator.readServerUrl(
+        let (initialMetadatas, _, _, _, initialNextPage, initialError) = await Enumerator.readServerUrl(
             remoteFolder.remotePath,
             pageSettings: (page: nil, index: 0, size: 5), // index is 0
             account: Self.account,
@@ -324,6 +322,7 @@ final class EnumeratorTests: NextcloudFileProviderKitTestCase {
         // 3. Assert: Verify the initial request's behavior.
         XCTAssertNil(initialError)
         XCTAssertNotNil(initialNextPage, "Should receive a next page token for the initial request")
+
         // The first request for a folder returns the folder itself plus the first page of children.
         XCTAssertEqual(
             initialMetadatas?.count,
@@ -334,27 +333,21 @@ final class EnumeratorTests: NextcloudFileProviderKitTestCase {
             so count is (4).
             """
         )
-        XCTAssertFalse(
-            initialMetadatas?.contains(where: { $0.ocId == remoteFolder.identifier }) ?? false,
-            "The folder itself should not be in the initial results."
-        )
+
+        XCTAssertFalse(initialMetadatas?.contains(where: { $0.ocId == remoteFolder.identifier }) ?? false, "The folder itself should not be in the initial results.")
 
         // The logic inside `if !isFollowUpPaginatedRequest` should have run,
         // updating the folder's metadata.
-        let updatedFolderMetadata =
-            try XCTUnwrap(Self.dbManager.itemMetadata(ocId: remoteFolder.identifier))
-        XCTAssertNotEqual(
-            updatedFolderMetadata.etag, oldEtag, "The folder's etag should have been updated."
-        )
+        let updatedFolderMetadata = try XCTUnwrap(Self.dbManager.itemMetadata(ocId: remoteFolder.identifier))
+        XCTAssertNotEqual(updatedFolderMetadata.etag, oldEtag, "The folder's etag should have been updated.")
         XCTAssertEqual(updatedFolderMetadata.etag, remoteFolder.versionIdentifier)
 
         // --- Scenario B: Follow-up Paginated Request (isFollowUpPaginatedRequest == true) ---
 
         // 4. Act: Call readServerUrl for the second page using the received page token.
         let followUpPage = NSFileProviderPage(initialNextPage!.token!.data(using: .utf8)!)
-        let (
-            followUpMetadatas, _, _, _, finalNextPage, followUpError
-        ) = await Enumerator.readServerUrl(
+
+        let (followUpMetadatas, _, _, _, finalNextPage, followUpError) = await Enumerator.readServerUrl(
             remoteFolder.remotePath,
             pageSettings: (page: followUpPage, index: 1, size: 5), // index > 0 and page is non-nil
             account: Self.account,

Tests/NextcloudFileProviderKitTests/FilesDatabaseManagerTests.swift

@@ -480,42 +480,6 @@ final class FilesDatabaseManagerTests: NextcloudFileProviderKitTestCase {
         XCTAssertTrue(results.updatedMetadatas?.isEmpty ?? true, "No items should have been updated.")
     }
 
-    func testConcurrencyOnDatabaseWrites() {
-        let semaphore = DispatchSemaphore(value: 0)
-        let count = 100
-        Task {
-            for i in 0 ... count {
-                let metadata = SendableItemMetadata(
-                    ocId: "concurrency-\(i)",
-                    fileName: "name",
-                    account: Account(user: "", id: "", serverUrl: "", password: "")
-                )
-                Self.dbManager.addItemMetadata(metadata)
-            }
-            semaphore.signal()
-        }
-
-        Task {
-            for i in 0 ... count {
-                let metadata = SendableItemMetadata(
-                    ocId: "concurrency-\(count + 1 + i)",
-                    fileName: "name",
-                    account: Account(user: "", id: "", serverUrl: "", password: "")
-                )
-                Self.dbManager.addItemMetadata(metadata)
-            }
-            semaphore.signal()
-        }
-
-        semaphore.wait()
-        semaphore.wait()
-
-        for i in 0 ... count * 2 + 1 {
-            let resultsI = Self.dbManager.itemMetadata(ocId: "concurrency-\(i)")
-            XCTAssertNotNil(resultsI, "Metadata \(i) should be saved even under concurrency")
-        }
-    }
-
     func testDirectoryMetadataRetrieval() throws {
         let account = "TestAccount"
         let serverUrl = "https://cloud.example.com/files/documents"