Merge pull request #102 from DeluxeAlonso/automation-tests

Automation tests
DeluxeAlonso · Feb 19, 2024 · 19b19f1 · 19b19f1
2 parents 9cb507b + 221c81a
commit 19b19f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/CalculatorReplicaSwiftUI/Extensions/String+Digits.swift b/CalculatorReplicaSwiftUI/Extensions/String+Digits.swift
@@ -31,7 +31,11 @@ extension String {
             return fractionDigitsCount() > 0
         }
     }
-
+
+    func extractLastCharactersOf(_ buttonRepresentable: CalculatorButtonRepresentable) -> Self {
+        extractLastCharactersOf(buttonRepresentable.character)
+    }
+
     func extractLastCharactersOf(_ character: Character) -> Self {
         var array: [String] = []
         var mutableString = self
@@ -40,6 +44,11 @@ extension String {
         }
         return array.joined()
     }
+
+    func extractLastCharactersOf(_ buttonRepresentables: [CalculatorButtonRepresentable],
+                                 withCutCharacter cutButtonRepresentable: CalculatorButtonRepresentable? = nil) -> Self {
+        extractLastCharactersOf(buttonRepresentables.compactMap { $0.character }, withCutCharacter: cutButtonRepresentable?.character)
+    }
 
     func extractLastCharactersOf(_ characters: [Character], withCutCharacter cutCharacter: Character? = nil) -> Self {
         var array: [String] = []
@@ -51,6 +60,10 @@ extension String {
         }
         return array.joined()
     }
+
+    func trimLeadingOcurrencesOf(_ buttonRepresentable: CalculatorButtonRepresentable) -> Self {
+        return String(drop { $0 == buttonRepresentable.character })
+    }
 
     func trimLeadingOcurrencesOf(_ character: Character) -> Self {
         return String(drop { $0 == character })

diff --git a/CalculatorReplicaSwiftUI/Helpers/OperationHandler/CalculatorDisplayTrimmer.swift b/CalculatorReplicaSwiftUI/Helpers/OperationHandler/CalculatorDisplayTrimmer.swift
@@ -10,7 +10,7 @@ struct CalculatorDisplayTrimmer: CalculatorDisplayTrimmerProtocol {
     // MARK: - CalculatorDisplayTrimmerProtocol
 
     func getTrimmedCalculatorDisplay(_ calculatorDisplay: String) -> String {
-        var trimmedCalculatorDisplay = calculatorDisplay.trimLeadingOcurrencesOf(CalculatorButtonRepresentable.zero.character)
+        var trimmedCalculatorDisplay = calculatorDisplay.trimLeadingOcurrencesOf(.zero)
 
         if trimmedCalculatorDisplay.first == CalculatorButtonRepresentable.decimal.character {
             trimmedCalculatorDisplay.insert(CalculatorButtonRepresentable.zero.character, at: trimmedCalculatorDisplay.startIndex)

diff --git a/CalculatorReplicaSwiftUI/Helpers/OperationHandler/CalculatorOperationValidator.swift b/CalculatorReplicaSwiftUI/Helpers/OperationHandler/CalculatorOperationValidator.swift
@@ -32,8 +32,8 @@ struct CalculatorOperationValidator: CalculatorOperationValidatorProtocol {
 
     func isEnteringSignificantNumber(_ calculatorButton: CalculatorButtonProtocol,
                                      in calculatorDisplay: String) -> Bool {
-        guard calculatorButton.title == "0" else { return true }
-        let numberOfZeros = calculatorDisplay.extractLastCharactersOf("0").count
+        guard calculatorButton.title == CalculatorButtonRepresentable.zero.rawValue else { return true }
+        let numberOfZeros = calculatorDisplay.extractLastCharactersOf(.zero).count
         return !(numberOfZeros == calculatorDisplay.count && numberOfZeros > 0)
     }
 }