Work in progress: Fixed some compiler errors.

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

Author: i2h3

Tests/NextcloudFileProviderKitTests/RemoteInterfaceTests.swift

@@ -51,23 +51,24 @@ struct RemoteInterfaceExtensionTests {
         await RetrievedCapabilitiesActor.shared.reset()
 
         let (fetchedCaps, fetchedData) = capabilitiesFromMockJSON()
-        var fetcherCalled = false
         var remoteInterface = TestableRemoteInterface()
-        remoteInterface.fetchCapabilitiesHandler = { acc, _, _ in
-            fetcherCalled = true
-            #expect(acc.ncKitAccount == testAccount.ncKitAccount)
-            return (acc.ncKitAccount, fetchedCaps, fetchedData, .success)
+
+        await confirmation("fetcherCalled") { fetcherCalled in
+            remoteInterface.fetchCapabilitiesHandler = { acc, _, _ in
+                fetcherCalled()
+                #expect(acc.ncKitAccount == testAccount.ncKitAccount)
+                return (acc.ncKitAccount, fetchedCaps, fetchedData, .success)
+            }
         }
 
         let result = await remoteInterface.currentCapabilities(account: testAccount)
 
-        #expect(fetcherCalled, "fetchCapabilities should be called when cache is empty.")
         #expect(result.error == .success)
         #expect(result.capabilities == fetchedCaps)
         #expect(result.data == fetchedData)
 
-        let actorCache = await RetrievedCapabilitiesActor.shared.data
-        #expect(actorCache[testAccount.ncKitAccount]?.capabilities == fetchedCaps)
+        let actorCache = await RetrievedCapabilitiesActor.shared.getCapabilities(for: testAccount.ncKitAccount)
+        #expect(actorCache?.capabilities == fetchedCaps)
     }
 
     @Test func currentCapabilitiesFetchesOnStaleCache() async throws {
@@ -101,23 +102,25 @@ struct RemoteInterfaceExtensionTests {
         )
 
         let (newCaps, newData) = capabilitiesFromMockJSON() // Fresh data to be fetched
-        var fetcherCalled = false
+
         var remoteInterface = TestableRemoteInterface()
-        remoteInterface.fetchCapabilitiesHandler = { acc, _, _ in
-            fetcherCalled = true
-            return (acc.ncKitAccount, newCaps, newData, .success)
+
+        await confirmation("fetcherCalled") { fetcherCalled in
+            remoteInterface.fetchCapabilitiesHandler = { acc, _, _ in
+                fetcherCalled()
+                return (acc.ncKitAccount, newCaps, newData, .success)
+            }
         }
 
         let result = await remoteInterface.currentCapabilities(account: testAccount)
 
-        #expect(fetcherCalled, "fetchCapabilities should be called for stale cache.")
         #expect(result.error == .success)
         #expect(result.capabilities == newCaps, "Should return newly fetched capabilities.")
         #expect(result.data == newData)
 
-        let actorCache = await RetrievedCapabilitiesActor.shared.data
-        #expect(actorCache[testAccount.ncKitAccount]?.capabilities == newCaps)
-        #expect((actorCache[testAccount.ncKitAccount]?.retrievedAt ?? .distantPast) > staleDate)
+        let actorCache = await RetrievedCapabilitiesActor.shared.getCapabilities(for: testAccount.ncKitAccount)
+        #expect(actorCache?.capabilities == newCaps)
+        #expect((actorCache?.retrievedAt ?? .distantPast) > staleDate)
     }
 
     @Test func currentCapabilitiesAwaitsAndUsesCache() async throws {