Fix tests for AppSettingsStore

Author: koke

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests+CardReaderSettings.swift

@@ -23,6 +23,10 @@ final class AppSettingsStoreTests_CardReaderSettings: XCTestCase {
     ///
     private var fileStorage: MockInMemoryStorage!
 
+    /// Mock General Settings Storage: Load data in memory
+    ///
+    private var generalAppSettings: GeneralAppSettingsStorage!
+
     /// Test subject
     ///
     private var subject: AppSettingsStore!
@@ -32,13 +36,15 @@ final class AppSettingsStoreTests_CardReaderSettings: XCTestCase {
         dispatcher = Dispatcher()
         storageManager = MockStorageManager()
         fileStorage = MockInMemoryStorage()
-        subject = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage)
+        generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage)
+        subject = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage, generalAppSettings: generalAppSettings)
     }
 
     override func tearDown() {
         dispatcher = nil
         storageManager = nil
         fileStorage = nil
+        generalAppSettings = nil
         subject = nil
         super.tearDown()
     }

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift

@@ -15,6 +15,10 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
     ///
     private var fileStorage: MockInMemoryStorage!
 
+    /// Mock General Settings Storage: Load data in memory
+    ///
+    private var generalAppSettings: GeneralAppSettingsStorage!
+
     /// Test subject
     ///
     private var subject: AppSettingsStore!
@@ -24,13 +28,15 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
         dispatcher = Dispatcher()
         storageManager = MockStorageManager()
         fileStorage = MockInMemoryStorage()
-        subject = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage)
+        generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage)
+        subject = AppSettingsStore(dispatcher: dispatcher!, storageManager: storageManager!, fileStorage: fileStorage!, generalAppSettings: generalAppSettings!)
     }
 
     override func tearDown() {
         dispatcher = nil
         storageManager = nil
         fileStorage = nil
+        generalAppSettings = nil
         subject = nil
         super.tearDown()
     }

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests+ProductsFeatureSwitch.swift

@@ -17,6 +17,10 @@ final class AppSettingsStoreTests_ProductsFeatureSwitch: XCTestCase {
     ///
     private var fileStorage: MockInMemoryStorage!
 
+    /// Mock General Settings Storage: Load data in memory
+    ///
+    private var generalAppSettings: GeneralAppSettingsStorage!
+
     /// Test subject
     ///
     private var subject: AppSettingsStore!
@@ -38,13 +42,15 @@ final class AppSettingsStoreTests_ProductsFeatureSwitch: XCTestCase {
         dispatcher = Dispatcher()
         storageManager = MockStorageManager()
         fileStorage = MockInMemoryStorage()
-        subject = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage)
+        generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage)
+        subject = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage, generalAppSettings: generalAppSettings)
     }
 
     override func tearDown() {
         dispatcher = nil
         storageManager = nil
         fileStorage = nil
+        generalAppSettings = nil
         subject = nil
         super.tearDown()
     }

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests+ProductsSettings.swift

@@ -15,6 +15,10 @@ final class AppSettingsStoreTests_ProductsSettings: XCTestCase {
     ///
     private var fileStorage: MockInMemoryStorage!
 
+    /// Mock General Settings Storage: Load data in memory
+    ///
+    private var generalAppSettings: GeneralAppSettingsStorage!
+
     /// Test subject
     ///
     private var subject: AppSettingsStore!
@@ -24,13 +28,15 @@ final class AppSettingsStoreTests_ProductsSettings: XCTestCase {
         dispatcher = Dispatcher()
         storageManager = MockStorageManager()
         fileStorage = MockInMemoryStorage()
-        subject = AppSettingsStore(dispatcher: dispatcher!, storageManager: storageManager!, fileStorage: fileStorage!)
+        generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage)
+        subject = AppSettingsStore(dispatcher: dispatcher!, storageManager: storageManager!, fileStorage: fileStorage!, generalAppSettings: generalAppSettings!)
     }
 
     override func tearDown() {
         dispatcher = nil
         storageManager = nil
         fileStorage = nil
+        generalAppSettings = nil
         subject = nil
         super.tearDown()
     }

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift

@@ -35,6 +35,10 @@ final class AppSettingsStoreTests: XCTestCase {
     ///
     private var fileStorage: MockInMemoryStorage?
 
+    /// Mock General Settings Storage: Load data in memory
+    ///
+    private var generalAppSettings: GeneralAppSettingsStorage?
+
     /// Test subject
     ///
     private var subject: AppSettingsStore?
@@ -44,7 +48,8 @@ final class AppSettingsStoreTests: XCTestCase {
         dispatcher = Dispatcher()
         storageManager = MockStorageManager()
         fileStorage = MockInMemoryStorage()
-        subject = AppSettingsStore(dispatcher: dispatcher!, storageManager: storageManager!, fileStorage: fileStorage!)
+        generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage!)
+        subject = AppSettingsStore(dispatcher: dispatcher!, storageManager: storageManager!, fileStorage: fileStorage!, generalAppSettings: generalAppSettings!)
         subject?.selectedProvidersURL = TestConstants.fileURL!
         subject?.customSelectedProvidersURL = TestConstants.customFileURL!
     }
@@ -53,6 +58,7 @@ final class AppSettingsStoreTests: XCTestCase {
         dispatcher = nil
         storageManager = nil
         fileStorage = nil
+        generalAppSettings = nil
         subject = nil
         super.tearDown()
     }
@@ -227,8 +233,9 @@ final class AppSettingsStoreTests: XCTestCase {
         // Create our own infrastructure so we can inject `PListFileStorage`.
         let fileStorage = PListFileStorage()
         let storageManager = MockStorageManager()
+        let generalAppSettings = GeneralAppSettingsStorage(fileStorage: fileStorage)
         let dispatcher = Dispatcher()
-        let store = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage)
+        let store = AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: fileStorage, generalAppSettings: generalAppSettings)
 
         if FileManager.default.fileExists(atPath: expectedGeneralAppSettingsFileURL.path) {
             try fileStorage.deleteFile(at: expectedGeneralAppSettingsFileURL)