Update tests

Author: nerdsupremacist

Tests/iOS/Tests/Library/ObjectConverterTests.swift

@@ -2,12 +2,12 @@ import XCTest
 @testable import Cache
 
 final class JSONDecoderExtensionsTests: XCTestCase {
-  private var storage: HybridStorage<User>!
+  private var storage: HybridStorage<String, User>!
 
   override func setUp() {
     super.setUp()
-    let memory = MemoryStorage<User>(config: MemoryConfig())
-    let disk = try! DiskStorage<User>(
+    let memory = MemoryStorage<String, User>(config: MemoryConfig())
+    let disk = try! DiskStorage<String, User>(
       config: DiskConfig(name: "HybridDisk"),
       transformer: TransformerFactory.forCodable(ofType: User.self)
     )

Tests/iOS/Tests/Storage/AsyncStorageTests.swift

@@ -3,14 +3,14 @@ import Dispatch
 @testable import Cache
 
 final class AsyncStorageTests: XCTestCase {
-  private var storage: AsyncStorage<User>!
+  private var storage: AsyncStorage<String, User>!
   let user = User(firstName: "John", lastName: "Snow")
 
   override func setUp() {
     super.setUp()
-    let memory = MemoryStorage<User>(config: MemoryConfig())
-    let disk = try! DiskStorage<User>(config: DiskConfig(name: "Async Disk"), transformer: TransformerFactory.forCodable(ofType: User.self))
-    let hybrid = HybridStorage<User>(memoryStorage: memory, diskStorage: disk)
+    let memory = MemoryStorage<String, User>(config: MemoryConfig())
+    let disk = try! DiskStorage<String, User>(config: DiskConfig(name: "Async Disk"), transformer: TransformerFactory.forCodable(ofType: User.self))
+    let hybrid = HybridStorage<String, User>(memoryStorage: memory, diskStorage: disk)
     storage = AsyncStorage(storage: hybrid, serialQueue: DispatchQueue(label: "Async"))
   }
 

Tests/iOS/Tests/Storage/DiskStorageTests.swift

@@ -5,12 +5,12 @@ final class DiskStorageTests: XCTestCase {
   private let key = "youknownothing"
   private let testObject = User(firstName: "John", lastName: "Snow")
   private let fileManager = FileManager()
-  private var storage: DiskStorage<User>!
+  private var storage: DiskStorage<String, User>!
   private let config = DiskConfig(name: "Floppy")
 
   override func setUp() {
     super.setUp()
-    storage = try! DiskStorage<User>(config: config, transformer: TransformerFactory.forCodable(ofType: User.self))
+    storage = try! DiskStorage<String, User>(config: config, transformer: TransformerFactory.forCodable(ofType: User.self))
   }
 
   override func tearDown() {
@@ -47,7 +47,7 @@ final class DiskStorageTests: XCTestCase {
 
     let customConfig = DiskConfig(name: "SSD", directory: url)
 
-    storage = try DiskStorage<User>(config: customConfig, transformer: TransformerFactory.forCodable(ofType: User.self))
+    storage = try DiskStorage<String, User>(config: customConfig, transformer: TransformerFactory.forCodable(ofType: User.self))
 
     XCTAssertEqual(
       storage.path,

Tests/iOS/Tests/Storage/HybridStorageTests.swift

@@ -5,13 +5,13 @@ final class HybridStorageTests: XCTestCase {
   private let cacheName = "WeirdoCache"
   private let key = "alongweirdkey"
   private let testObject = User(firstName: "John", lastName: "Targaryen")
-  private var storage: HybridStorage<User>!
+  private var storage: HybridStorage<String, User>!
   private let fileManager = FileManager()
 
   override func setUp() {
     super.setUp()
-    let memory = MemoryStorage<User>(config: MemoryConfig())
-    let disk = try! DiskStorage<User>(config: DiskConfig(name: "HybridDisk"), transformer: TransformerFactory.forCodable(ofType: User.self))
+    let memory = MemoryStorage<String, User>(config: MemoryConfig())
+    let disk = try! DiskStorage<String, User>(config: DiskConfig(name: "HybridDisk"), transformer: TransformerFactory.forCodable(ofType: User.self))
 
     storage = HybridStorage(memoryStorage: memory, diskStorage: disk)
   }
@@ -160,7 +160,7 @@ final class HybridStorageTests: XCTestCase {
   // MARK: - Storage observers
 
   func testAddStorageObserver() throws {
-    var changes = [StorageChange]()
+    var changes = [StorageChange<String>]()
     storage.addStorageObserver(self) { _, _, change in
       changes.append(change)
     }

Tests/iOS/Tests/Storage/MemoryStorageTests.swift

@@ -4,12 +4,12 @@ import XCTest
 final class MemoryStorageTests: XCTestCase {
   private let key = "youknownothing"
   private let testObject = User(firstName: "John", lastName: "Snow")
-  private var storage: MemoryStorage<User>!
+  private var storage: MemoryStorage<String, User>!
   private let config = MemoryConfig(expiry: .never, countLimit: 10, totalCostLimit: 10)
 
   override func setUp() {
     super.setUp()
-    storage = MemoryStorage<User>(config: config)
+    storage = MemoryStorage<String, User>(config: config)
   }
 
   override func tearDown() {

Tests/iOS/Tests/Storage/StorageSupportTests.swift

@@ -2,13 +2,13 @@ import XCTest
 @testable import Cache
 
 final class StorageSupportTests: XCTestCase {
-  private var storage: HybridStorage<Bool>!
+  private var storage: HybridStorage<String, Bool>!
 
   override func setUp() {
     super.setUp()
-    let memory = MemoryStorage<Bool>(config: MemoryConfig())
-    let disk = try! DiskStorage<Bool>(config: DiskConfig(name: "PrimitiveDisk"), transformer: TransformerFactory.forCodable(ofType: Bool.self))
-    storage = HybridStorage<Bool>(memoryStorage: memory, diskStorage: disk)
+    let memory = MemoryStorage<String, Bool>(config: MemoryConfig())
+    let disk = try! DiskStorage<String, Bool>(config: DiskConfig(name: "PrimitiveDisk"), transformer: TransformerFactory.forCodable(ofType: Bool.self))
+    storage = HybridStorage<String, Bool>(memoryStorage: memory, diskStorage: disk)
   }
 
   override func tearDown() {

Tests/iOS/Tests/Storage/StorageTests.swift

@@ -2,13 +2,13 @@ import XCTest
 @testable import Cache
 
 final class StorageTests: XCTestCase {
-  private var storage: Storage<User>!
+  private var storage: Storage<String, User>!
   let user = User(firstName: "John", lastName: "Snow")
 
   override func setUp() {
     super.setUp()
 
-    storage = try! Storage<User>(
+    storage = try! Storage<String, User>(
       diskConfig: DiskConfig(name: "Thor"),
       memoryConfig: MemoryConfig(),
       transformer: TransformerFactory.forCodable(ofType: User.self)
@@ -100,7 +100,7 @@ final class StorageTests: XCTestCase {
   // MARK: - Storage observers
 
   func testAddStorageObserver() throws {
-    var changes = [StorageChange]()
+    var changes = [StorageChange<String>]()
     var observer: ObserverMock? = ObserverMock()
 
     storage.addStorageObserver(observer!) { _, _, change in
@@ -115,7 +115,7 @@ final class StorageTests: XCTestCase {
     observer = nil
     try storage.setObject(user, forKey: "user1")
 
-    let expectedChanges: [StorageChange] = [
+    let expectedChanges: [StorageChange<String>] = [
       .add(key: "user1"),
       .add(key: "user2"),
       .remove(key: "user1"),
@@ -127,8 +127,8 @@ final class StorageTests: XCTestCase {
   }
 
   func testRemoveAllStorageObservers() throws {
-    var changes1 = [StorageChange]()
-    var changes2 = [StorageChange]()
+    var changes1 = [StorageChange<String>]()
+    var changes2 = [StorageChange<String>]()
 
     storage.addStorageObserver(self) { _, _, change in
       changes1.append(change)

Tests/iOS/Tests/Storage/SyncStorageTests.swift

@@ -3,14 +3,14 @@ import Dispatch
 @testable import Cache
 
 final class SyncStorageTests: XCTestCase {
-  private var storage: SyncStorage<User>!
+  private var storage: SyncStorage<String, User>!
   let user = User(firstName: "John", lastName: "Snow")
 
   override func setUp() {
     super.setUp()
 
-    let memory = MemoryStorage<User>(config: MemoryConfig())
-    let disk = try! DiskStorage<User>(config: DiskConfig(name: "HybridDisk"), transformer: TransformerFactory.forCodable(ofType: User.self))
+    let memory = MemoryStorage<String, User>(config: MemoryConfig())
+    let disk = try! DiskStorage<String, User>(config: DiskConfig(name: "HybridDisk"), transformer: TransformerFactory.forCodable(ofType: User.self))
 
     let hybridStorage = HybridStorage(memoryStorage: memory, diskStorage: disk)
     storage = SyncStorage(storage: hybridStorage, serialQueue: DispatchQueue(label: "Sync"))