Merge pull request #13 from tidepool-org/scott/QAE-456-SimpleBolusCalculator-MinandMaxGlucos

Formatting comments addressed using amend last commit. Conflict on HomeScreen addressed and other changes merged.

Author: Foscottl-TP

Sources/LoopUITestingKit/Screens/BaseScreen.swift

@@ -7,6 +7,10 @@
 
 import XCTest
 
+extension XCUIElementQuery {
+    var lastMatch : XCUIElement { return self.element(boundBy: self.count - 1) }
+}
+
 open class BaseScreen {
     let app: XCUIApplication
     let springBoard: XCUIApplication = XCUIApplication(bundleIdentifier:"com.apple.springboard")

Sources/LoopUITestingKit/Screens/BolusScreen.swift

@@ -12,7 +12,9 @@ public final class BolusScreen: BaseScreen {
     // MARK: Elements
 
     private var bolusTitleText: XCUIElement { app.navigationBars.staticTexts["Bolus"] }
-    private var bolusEntryTextField: XCUIElement { app.textFields["dismissibleKeyboardTextField"] }
+    private var currentGlucoseEntryTextField: XCUIElement { app.textFields["textField_CurrentGlucose"] }
+    private var bolusEntryTextField: XCUIElement { app.textFields["textField_Bolus"] }
+    private var carbohydratesTextField: XCUIElement { app.textFields["textField_Carbohydrates"] }
     private var bolusCancelButton: XCUIElement { app.navigationBars.buttons["Cancel"] }
     private var simpleBolusCalculatorTitle: XCUIElement { app.navigationBars.staticTexts["Simple Bolus Calculator"] }
     private var bolusActionButton: XCUIElement { app.buttons["button_bolusAction"] }
@@ -27,9 +29,18 @@ public final class BolusScreen: BaseScreen {
     public var getActiveCarbsText: String { activeCarbsText.getLableSafe() }
 
     public func tapCancelBolusButton() { bolusCancelButton.safeTap() }
+    public func tapCurrentGlucoseEntryTextField() { currentGlucoseEntryTextField.safeTap() }
     public func tapBolusEntryTextField() { bolusEntryTextField.safeTap() }
     public func tapBolusActionButton() { bolusActionButton.safeForceTap() }
+    public func getBolusFieldValue() -> String { bolusEntryTextField.getValueSafe() }
+    public func getCurrentGlucoseFieldValue() -> String { currentGlucoseEntryTextField.getValueSafe() }
 
+    public func clearCurrentGlucoseEntryTextField() {
+        let currentTextLength = currentGlucoseEntryTextField.getValueSafe().count
+        
+        currentGlucoseEntryTextField
+            .typeText(String(repeating: XCUIKeyboardKey.delete.rawValue, count: currentTextLength))
+    }
     public func clearBolusEntryTextField() {
         let currentTextLength = bolusEntryTextField.getValueSafe().count
 
@@ -48,6 +59,7 @@ public final class BolusScreen: BaseScreen {
     }
 
     public func setBolusEntryTextField(value: String) { bolusEntryTextField.typeText(value) }
+    public func setCurrentGlucoseEntryTextField(value: String) { currentGlucoseEntryTextField.typeText(value) }
     public func tapKeyboardDoneButton() { keyboardDoneButton.safeTap() }
 
     // MARK: Verifications

Sources/LoopUITestingKit/Screens/HomeScreen.swift

@@ -60,6 +60,11 @@ public final class HomeScreen: BaseScreen {
         return navigateToActiveCarbsDetailsText.identifier.components(separatedBy: "_")[2]
     }
 
+
+
+    public func getPumpPillValue() -> String { hudPumpPill.getValueSafe() }
+    public func getHudGlucosePill() -> String { hudGlucosePill.getValueSafe() }
+
     public func tapBolusEntry() { bolusTabButton.safeTap() }
     public func tapSettingsButton() { settingsTabButton.safeTap() }
     public func tapSafetyNotificationAlertCloseButton() { safetyNotificationsAlertCloseButton.safeTap() }
@@ -71,7 +76,7 @@ public final class HomeScreen: BaseScreen {
     public func tapHudGlucosePill() { hudGlucosePill.safeTap() }
     public func tapPresetsTabButton() { presetsTabButton.safeTap() }
     public func tapNavigateToActiveCarbsDetails() { navigateToActiveCarbsDetailsText.safeTap() }
-    public func getPumpPillValue() -> String { hudPumpPill.getValueSafe() }
+
 
     public func getHudGlucosePillValue() -> [String] {
         let outOfRangeValues = Set(["HIGH", "LOW"])