Some code updates to fix tests

Author: donnywals

.gitignore

@@ -31,3 +31,4 @@ Pods/
 
 # IntelliJ
 .idea/
+.vscode

.vscode/TUSKit.code-workspace

@@ -164,12 +164,15 @@ final class Files {
         let filePath = metaData.filePath
         let fileName = filePath.lastPathComponent
         let metaDataPath = storageDirectory.appendingPathComponent(fileName).appendingPathExtension("plist")
-        let metaDataCachePath = storageDirectory.appendingPathComponent("\(metaData.id)uploadData")
+        let uploadDataCachePath = storageDirectory.appendingPathComponent("\(metaData.id)uploadData")
+        let metaDataCachePath = storageDirectory.appendingPathComponent("\(metaData.id)")
 
         try queue.sync {
             try FileManager.default.removeItem(at: metaDataPath)
-            if FileManager.default.fileExists(atPath: metaDataCachePath.path) {
-                try FileManager.default.removeItem(at: metaDataCachePath)
+            try FileManager.default.removeItem(at: metaDataCachePath)
+            
+            if FileManager.default.fileExists(atPath: uploadDataCachePath.path) {
+                try FileManager.default.removeItem(at: uploadDataCachePath)
             }
 #if os(iOS)
             try FileManager.default.removeItem(at: filePath)

Sources/TUSKit/Files.swift

@@ -45,8 +45,10 @@ final class FilesTests: XCTestCase {
             }
         }
 
-        let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
-        let cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
+        let documentsDirectory = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]    
+            .appendingPathComponent(Bundle.main.bundleIdentifier ?? "")
+        let cacheDirectory = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
+            .appendingPathComponent(Bundle.main.bundleIdentifier ?? "")
 
         let values = [
             (URL(string: "ABC")!, documentsDirectory.appendingPathComponent("ABC")),
@@ -125,7 +127,9 @@ final class FilesTests: XCTestCase {
         // Normally we write to the documents dir. But we explicitly are storing a file in a "wrong dir"
         // To see if retrieving metadata updates its directory.
         func writeDummyFileToCacheDir() throws -> URL {
-            let cacheURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)[0]
+            let cacheURL = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
+                .appendingPathComponent(Bundle.main.bundleIdentifier ?? "")
+                .appendingPathComponent("TUS")
             let fileURL = cacheURL.appendingPathComponent("abcdefgh.txt")
             return fileURL
         }

Tests/TUSKitTests/FilesTests.swift

@@ -16,7 +16,8 @@ final class TUSClient_CacheTests: XCTestCase {
 
         MockURLProtocol.reset()
 
-        let docDir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
+        let docDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
+            .appendingPathComponent(Bundle.main.bundleIdentifier ?? "")
         fullStoragePath = docDir.appendingPathComponent(relativeStoragePath.absoluteString)
 
         clearDirectory(dir: fullStoragePath)
@@ -96,7 +97,7 @@ final class TUSClient_CacheTests: XCTestCase {
 
         clearDirectory(dir: fullStoragePath)
 
-        client = makeClient(storagePath: storagePath)
+        client = makeClient(storagePath: fullStoragePath)
         tusDelegate = TUSMockDelegate()
         client.delegate = tusDelegate