Add userId property to MockRemoteItem

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
claucambra · Nov 4, 2024 · f06c2c4 · f06c2c4
1 parent 33394ef
commit f06c2c4
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 1 deletion.
diff --git a/Tests/Interface/MockRemoteInterface.swift b/Tests/Interface/MockRemoteInterface.swift
@@ -117,6 +117,7 @@ public class MockRemoteInterface: RemoteInterface {
             directory: true,
             account: account.ncKitAccount,
             username: account.username,
+            userId: account.id,
             serverUrl: account.serverUrl
         )
         guard let parent = parentItem(path: remotePath) else {
@@ -185,6 +186,7 @@ public class MockRemoteInterface: RemoteInterface {
                 data: itemData,
                 account: account.ncKitAccount,
                 username: account.username,
+                userId: account.id,
                 serverUrl: account.serverUrl
             )
 

diff --git a/Tests/Interface/MockRemoteItem.swift b/Tests/Interface/MockRemoteItem.swift
@@ -26,6 +26,7 @@ public class MockRemoteItem: Equatable {
     public var size: Int64 { Int64(data?.count ?? 0) }
     public var account: String
     public var username: String
+    public var userId: String
     public var serverUrl: String
     public var nkfile: NKFile {
         let file = NKFile()
@@ -38,7 +39,7 @@ public class MockRemoteItem: Equatable {
         file.serverUrl = parent?.remotePath ?? remotePath
         file.account = account
         file.user = username
-        file.userId = username
+        file.userId = userId
         file.urlBase = serverUrl
         file.lock = locked
         file.lockOwner = lockOwner
@@ -62,6 +63,7 @@ public class MockRemoteItem: Equatable {
         lhs.modificationDate == rhs.modificationDate &&
         lhs.account == rhs.account &&
         lhs.username == rhs.username &&
+        lhs.userId == rhs.userId &&
         lhs.serverUrl == rhs.serverUrl
     }
 
@@ -79,6 +81,7 @@ public class MockRemoteItem: Equatable {
         lockTimeOut: Date? = nil,
         account: String,
         username: String,
+        userId: String,
         serverUrl: String
     ) {
         self.identifier = identifier
@@ -94,6 +97,7 @@ public class MockRemoteItem: Equatable {
         self.lockTimeOut = lockTimeOut
         self.account = account
         self.username = username
+        self.userId = userId
         self.serverUrl = serverUrl
     }
 }
diff --git a/Tests/InterfaceTests/MockRemoteInterfaceTests.swift b/Tests/InterfaceTests/MockRemoteInterfaceTests.swift
@@ -21,6 +21,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
         directory: true,
         account: Self.account.ncKitAccount,
         username: Self.account.username,
+        userId: Self.account.id,
         serverUrl: Self.account.serverUrl
     )
 
@@ -38,6 +39,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemB = MockRemoteItem(
@@ -48,6 +50,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemA_B = MockRemoteItem(
@@ -58,6 +61,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let targetItem = MockRemoteItem(
@@ -67,6 +71,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/a/b/target",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -166,6 +171,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemB = MockRemoteItem(
@@ -175,6 +181,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemC = MockRemoteItem(
@@ -184,6 +191,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let targetItem = MockRemoteItem(
@@ -192,6 +200,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/a/c/target",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -246,6 +255,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemB = MockRemoteItem(
@@ -255,6 +265,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemC = MockRemoteItem(
@@ -264,6 +275,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemA_A = MockRemoteItem(
@@ -273,6 +285,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemA_B = MockRemoteItem(
@@ -282,6 +295,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemC_A = MockRemoteItem(
@@ -291,6 +305,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemC_A_A = MockRemoteItem(
@@ -300,6 +315,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -383,6 +399,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemB = MockRemoteItem(
@@ -392,6 +409,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemA_C = MockRemoteItem(
@@ -401,6 +419,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let itemA_C_D = MockRemoteItem(
@@ -409,6 +428,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/a/c/d",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 

diff --git a/Tests/NextcloudFileProviderKitTests/EnumeratorTests.swift b/Tests/NextcloudFileProviderKitTests/EnumeratorTests.swift
@@ -36,6 +36,7 @@ final class EnumeratorTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -47,6 +48,7 @@ final class EnumeratorTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -57,6 +59,7 @@ final class EnumeratorTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/folder/itemA",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -66,6 +69,7 @@ final class EnumeratorTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/folder/itemB",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 
@@ -75,6 +79,7 @@ final class EnumeratorTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/folder/itemC",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
 

diff --git a/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift b/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift
@@ -25,6 +25,7 @@ final class ItemCreateTests: XCTestCase {
         directory: true,
         account: Self.account.ncKitAccount,
         username: Self.account.username,
+        userId: Self.account.id,
         serverUrl: Self.account.serverUrl
     )
     static let dbManager = FilesDatabaseManager(realmConfig: .defaultConfiguration)

diff --git a/Tests/NextcloudFileProviderKitTests/ItemDeleteTests.swift b/Tests/NextcloudFileProviderKitTests/ItemDeleteTests.swift
@@ -23,6 +23,7 @@ final class ItemDeleteTests: XCTestCase {
         directory: true,
         account: Self.account.ncKitAccount,
         username: Self.account.username,
+        userId: Self.account.id,
         serverUrl: Self.account.serverUrl
     )
     static let dbManager = FilesDatabaseManager(realmConfig: .defaultConfiguration)
@@ -45,6 +46,7 @@ final class ItemDeleteTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/file",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         remoteItem.parent = rootItem
@@ -80,6 +82,7 @@ final class ItemDeleteTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let remoteItem = MockRemoteItem(
@@ -88,6 +91,7 @@ final class ItemDeleteTests: XCTestCase {
             remotePath: Self.account.davFilesUrl + "/folder/file",
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         rootItem.children = [remoteFolder]

diff --git a/Tests/NextcloudFileProviderKitTests/ItemFetchTests.swift b/Tests/NextcloudFileProviderKitTests/ItemFetchTests.swift
@@ -24,6 +24,7 @@ final class ItemFetchTests: XCTestCase {
         directory: true,
         account: Self.account.ncKitAccount,
         username: Self.account.username,
+        userId: Self.account.id,
         serverUrl: Self.account.serverUrl
     )
     static let dbManager = FilesDatabaseManager(realmConfig: .defaultConfiguration)
@@ -47,6 +48,7 @@ final class ItemFetchTests: XCTestCase {
             data: "Hello, World!".data(using: .utf8),
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         rootItem.children = [remoteItem]
@@ -102,6 +104,7 @@ final class ItemFetchTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let remoteDirectoryChildFile = MockRemoteItem(
@@ -112,6 +115,7 @@ final class ItemFetchTests: XCTestCase {
             data: "Hello, World!".data(using: .utf8),
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let remoteDirectoryChildDirA = MockRemoteItem(
@@ -122,6 +126,7 @@ final class ItemFetchTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let remoteDirectoryChildDirB = MockRemoteItem(
@@ -132,6 +137,7 @@ final class ItemFetchTests: XCTestCase {
             directory: true,
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         let remoteDirectoryChildDirBChildFile = MockRemoteItem(
@@ -142,6 +148,7 @@ final class ItemFetchTests: XCTestCase {
             data: "Hello, World!".data(using: .utf8),
             account: Self.account.ncKitAccount,
             username: Self.account.username,
+            userId: Self.account.id,
             serverUrl: Self.account.serverUrl
         )
         rootItem.children = [remoteDirectory]