More tests

RomanPodymov · Jun 28, 2024 · b65eae8 · b65eae8
1 parent b3c4b33
commit b65eae8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/Calcium/MainReducer.swift b/Calcium/MainReducer.swift
@@ -9,6 +9,10 @@
 import BigNumber
 import ComposableArchitecture
 
+enum MainReducerError: Error {
+    case invalidValues
+}
+
 @Reducer
 struct MainReducer {
     @ObservableState
@@ -30,6 +34,9 @@ struct MainReducer {
         var enabledDivide = true
         var enabledFactorial = true
 
+        var enabledClear = true
+        var enabledEquals = true
+
         var leftValue: BInt?
         var displayingText = ""
         var latestOperationButton: CalculatorButton?
@@ -52,14 +59,14 @@ struct MainReducer {
             switch calculatorButton {
             case let .operation(operation):
                 if operation.isUnary {
-                    set(enabled: false)
+                    set(enabled: false, all: false)
                 }
             default:
                 break
             }
         }
 
-        mutating func set(enabled: Bool) {
+        mutating func set(enabled: Bool, all: Bool) {
             enabled0 = enabled
             enabled1 = enabled
             enabled2 = enabled
@@ -76,14 +83,22 @@ struct MainReducer {
             enabledMultiply = enabled
             enabledDivide = enabled
             enabledFactorial = enabled
+
+            if all {
+                enabledClear = enabled
+                enabledEquals = enabled
+            }
         }
 
         mutating func onButtonPressed(calculatorButton: CalculatorButton) -> Operation? {
             switch calculatorButton {
             case let .digit(value):
                 onDigitButtonPressed(value: value)
             case .clear:
+                leftValue = nil
                 displayingText = ""
+                latestOperationButton = nil
+                set(enabled: true, all: true)
             case let .operation(value):
                 switch value {
                 case .plus, .minus, .multiply, .divide, .factorial:
@@ -115,11 +130,15 @@ struct MainReducer {
                 let lhs = state.leftValue
                 let rhs = BInt(state.displayingText)
                 if let operation = state.onButtonPressed(calculatorButton: button) {
+                    state.set(enabled: false, all: true)
                     return .run { send in
+                        guard let lhs, let rhs else {
+                            throw MainReducerError.invalidValues
+                        }
                         let value = await Task {
                             operation.calculateValue(
-                                lhs: lhs!,
-                                rhs: rhs!
+                                lhs: lhs,
+                                rhs: rhs
                             )
                         }.value
                         await send(.calculated(value), animation: .calciumDefault)
@@ -131,9 +150,7 @@ struct MainReducer {
             case let .calculated(value):
                 state.displayingText = String(value)
                 state.latestOperationButton = .operation(.equals)
-
-                state.set(enabled: true)
-
+                state.set(enabled: true, all: true)
                 return .none
             }
         }

diff --git a/Calcium/MainScreen.swift b/Calcium/MainScreen.swift
@@ -18,7 +18,7 @@ extension Animation {
 struct MainScreen: View {
     @Perception.Bindable var store: StoreOf<MainReducer>
 
-    private func view(for calculatorButton: CalculatorButton, enabled: Bool = true) -> some View {
+    private func view(for calculatorButton: CalculatorButton, enabled: Bool) -> some View {
         Button {
             store.send(.pressButton(calculatorButton), animation: .calciumDefault)
         } label: {
@@ -54,15 +54,15 @@ struct MainScreen: View {
             HStack {
                 view(for: .digit(.zero), enabled: store.state.enabled0)
                 view(for: .operation(.factorial), enabled: store.state.enabledFactorial)
-                view(for: .clear)
+                view(for: .clear, enabled: store.state.enabledClear)
             }
 
             HStack {
                 view(for: .operation(.plus), enabled: store.state.enabledPlus)
                 view(for: .operation(.minus), enabled: store.state.enabledMinus)
                 view(for: .operation(.multiply), enabled: store.state.enabledMultiply)
                 view(for: .operation(.divide), enabled: store.state.enabledDivide)
-                view(for: .operation(.equals))
+                view(for: .operation(.equals), enabled: store.state.enabledEquals)
             }
         }
     }

diff --git a/CalciumTests/CalciumTests.swift b/CalciumTests/CalciumTests.swift
@@ -21,4 +21,22 @@ class CalciumTests: XCTestCase {
         store.send(.pressButton(.digit(.one)))
         XCTAssertEqual(screen.store.state.displayingText, CalculatorButton.digit(.one).displayingValue)
     }
+
+    @MainActor
+    func testStateComplex() async throws {
+        let store = Store(initialState: MainReducer.State()) {
+            MainReducer()
+        }
+        let screen = MainScreen(
+            store: store
+        )
+        store.send(.pressButton(.digit(.one)))
+        store.send(.pressButton(.operation(.plus)))
+        store.send(.pressButton(.digit(.two)))
+        store.send(.pressButton(.operation(.equals)))
+
+        try await Task.sleep(nanoseconds: 1_000_000_000)
+
+        XCTAssertEqual(screen.store.state.displayingText, String(1 + 2))
+    }
 }