updated tests

KazaiMazai · Sep 18, 2024 · cd61d9f · cd61d9f
1 parent 2d210fa
commit cd61d9f
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 20 deletions.
diff --git a/Tests/PureduxMacrosTests/InjectedStoreMacroTests.swift b/Tests/PureduxMacrosTests/InjectedStoreMacroTests.swift
@@ -12,10 +12,9 @@ import XCTest
 @testable import PureduxMacros
 
 final class InjectedStoreMacroTests: XCTestCase {
-
-    private let macros = ["StoreEntry": DependencyInjectionMacro.self]
-
-    func testEnvironmentValue() {
+    func test_WhenStoreEntry_StoreInjectionKeyGenerated() {
+        let macros = ["StoreEntry": StoreInjectionMacro.self]
+
         assertMacroExpansion(
               """
               extension SharedStores {
@@ -43,5 +42,36 @@ final class InjectedStoreMacroTests: XCTestCase {
               macros: macros
         )
     }
+
+    func test_WhenDependencyEntry_DepenencyInjectionKeyGenerated() {
+        let macros = ["DependencyEntry": DependencyInjectionMacro.self]
+
+        assertMacroExpansion(
+              """
+              extension Dependencies {
+                  @DependencyEntry var value = 10
+              }
+              """,
+              expandedSource:
+                """
+                extension SharedStores {
+                    var root {
+                        get {
+                            self [_ValueKey.self]
+                        }
+                        set {
+                            self [_ValueKey.self] = newValue
+                        }
+                    }
+
+                    private enum _ValueKey: DependencyKey {
+                        nonisolated (unsafe) static var currentValue = 10
+                        }
+                    }
+                }
+                """,
+              macros: macros
+        )
+    }
 }
 #endif
diff --git a/Tests/PureduxTests/InjectionTests/InjectionTests.swift b/Tests/PureduxTests/InjectionTests/InjectionTests.swift
@@ -6,26 +6,31 @@
 //
 
 import Foundation
-
 import XCTest
 @testable import Puredux
 
-#if canImport(PureduxMacros)
 extension SharedStores {
-    @StoreEntry var intValue: Int = 1
+    @StoreEntry var theStore = StateStore<Int, Int>(1) { _,_ in }
 }
 
 extension Injected {
     @InjectEntry var anotherIntValue: Int = 1
 }
 
-final class InjectionTests: XCTestCase {
+final class SharedStoresTests: XCTestCase {
     func test_whenReadAndWriteToSharedStoresValue_NoDeadlockOccurs() {
-        SharedStores[\.intValue] = 1
+        let exp = expectation(description: "wait for store state")
+        SharedStores[\.theStore] = StateStore(2) {_,_ in }
+
 
-        SharedStores[\.intValue] = SharedStores[\.intValue] + 1
-        XCTAssertEqual(SharedStores[\.intValue], 2)
-
+        let store =  SharedStores[\.theStore]
+        store.subscribe(observer: Observer { state in
+            XCTAssertEqual(state, 2)
+            exp.fulfill()
+            return .active
+        })
+
+        wait(for: [exp], timeout: 3.0)
     }
 
     func test_whenReadAndWriteToInjectedValue_NoDeadlockOccurs() {
@@ -36,4 +41,17 @@ final class InjectionTests: XCTestCase {
 
     }
 }
-#endif
+
+extension Dependencies {
+    @DependencyEntry var intValue: Int = 1
+}
+
+final class DependenciesTests: XCTestCase {
+    func test_whenReadAndWriteToSharedStoresValue_NoDeadlockOccurs() {
+        XCTAssertEqual(Dependency[\.intValue], 1)
+
+        Dependencies[\.intValue] = Dependencies[\.intValue] + 1
+        XCTAssertEqual(Dependencies[\.intValue], 2)
+    }
+}
+
diff --git a/...ureduxTests/SwiftUITests/StoreViewTests/StoreViewAlwaysEqualDeduplicationPropsTests.swift b/...ureduxTests/SwiftUITests/StoreViewTests/StoreViewAlwaysEqualDeduplicationPropsTests.swift
@@ -8,7 +8,7 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
+
 import Dispatch
 
 final class StoreViewAlwaysEqualDeduplicationPropsTests: XCTestCase {

diff --git a/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewContentRenderTests.swift b/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewContentRenderTests.swift
@@ -8,7 +8,6 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
 import Dispatch
 
 final class StoreViewContentRenderTests: XCTestCase {

diff --git a/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewDeduplicationPropsTests.swift b/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewDeduplicationPropsTests.swift
@@ -8,7 +8,6 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
 import Dispatch
 
 final class StoreViewDeduplicationPropsTests: XCTestCase {

diff --git a/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewNoDeduplicationPropsTests.swift b/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewNoDeduplicationPropsTests.swift
@@ -8,7 +8,6 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
 import Dispatch
 
 final class StoreViewNoDeduplicationPropsTests: XCTestCase {

diff --git a/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewPresentationQueueTest.swift b/Tests/PureduxTests/SwiftUITests/StoreViewTests/StoreViewPresentationQueueTest.swift
@@ -8,7 +8,6 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
 import Dispatch
 
 final class StoreViewPresentationQueueTest: XCTestCase {

diff --git a/Tests/PureduxTests/TestUtils/TestRootAppStore.swift b/Tests/PureduxTests/TestUtils/TestRootAppStore.swift
@@ -8,10 +8,9 @@
 import XCTest
 @testable import Puredux
 import SwiftUI
-import UIKit
 import PureduxMacros
 
-extension Stores {
+extension SharedStores {
     @InjectEntry var rootStore = StateStore<Int, Int>(0) { state, action in state += action }
 }
 #endif