Index: suite_leahi/tst_feature_options/test.py =================================================================== diff -u -r8ac0eae52c22298abedaec3200ebd450888c3ac2 -re85182ef64c5e04deea763fbc45b54d5929d4bcc --- suite_leahi/tst_feature_options/test.py (.../test.py) (revision 8ac0eae52c22298abedaec3200ebd450888c3ac2) +++ suite_leahi/tst_feature_options/test.py (.../test.py) (revision e85182ef64c5e04deea763fbc45b54d5929d4bcc) @@ -13,32 +13,22 @@ # Disable it and Verify Disable state then Click Back Button Navigate to Main Treatment Screen # In Main Treatment Screen and Click Vitals Button and Verify that Measure Vitals button Enabled state in Vitals popup # 2 Navigate back to Feature Configurations Screen and Log Initial Heparin Syringe Pump switch state: Unchecked -# Enable Switch and Verify Enabled state then Click Back Button and Navigate to Main Treatment Screen -# In Main Treatment Screen In HeaderBar Heparin is displayed and Navigate back to Feature Configurations Screen +# Enable Switch and Verify Enabled state then Click Back Button and Navigate to Create Rx Screen and Verify Heparin containers are visible +# Navigate to Main Treatment Screen and Verify that In HeaderBar Heparin is Visible and Navigate back to Feature Configurations Screen # And Log Heparin Syringe Pump switch state and Disable it and Verify Disable state then Click Back Button -# Navigate to Main Treatment Screen In HeaderBar Heparin tab is not displayed +# Navigate to Create Rx Screen and Verify Heparin containers are not Visible, Navigate to Main Treatment Screen and +# Verify that In HeaderBar Heparin tab is not Visible import names -from configuration import config, utility, navigation -from leahi_dialin.ui import utils +from configuration import config, utility, navigation +from leahi_dialin.ui import utils from leahi_dialin.ui.td_messaging import TD_Messaging -from leahi_dialin.common.td_defs import TDOpModes, TDTreatmentStates +from leahi_dialin.common.td_defs import TDOpModes, TDTreatmentStates td_simulator = TD_Messaging() -def verify_integrated_bp_cuff_button_state(expected_state, message): - """Helper function to verify the enabled/disabled state using test.compare.""" - - overlay_container = waitForObject(names.o_Overlay, 2000) - integrated_bp_cuff_button = utility.findChildByText( - overlay_container, "Measure Vitals" - ) - current_state = integrated_bp_cuff_button.enabled - test.compare(current_state, expected_state, message) - - def navigate_to_main_treatment_screen_from_settings(): """Helper function to Navigate to Main Treatment screen from Device Settings""" @@ -53,15 +43,6 @@ td_simulator.td_tx_state( TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) - headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000) - blood_priming_screen = utility.findChildByText(headerbar_container, "Blood Priming") - if blood_priming_screen.visible: - td_simulator.td_tx_state( - TDTreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value,0,0,0,0,0,0,0,0,0, - ) - td_simulator.td_tx_state( - TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0 - ) def feature_configurations_screen(): @@ -133,11 +114,9 @@ # Perform the toggle action mouseClick(integrated_bp_cuff_mode_switch) - # Verify the state - test.compare( + test.verify( integrated_bp_cuff_mode_switch.checked, - config.ENABLED, - f"Verify Integrated BP Cuff switch is Enabled", + "Verify Integrated BP Cuff switch is Enabled", ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) @@ -150,17 +129,21 @@ td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value) navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) - verify_integrated_bp_cuff_button_state( - config.ENABLED, "Comparison of Measure Vitals button Enabled state" + overlay_container = waitForObject(names.o_Overlay, 2000) + integrated_bp_cuff_button = utility.findChildByText( + overlay_container, "Measure Vitals" ) + test.verify( + integrated_bp_cuff_button.enabled, "Verify Measure Vitals button is Enabled" + ) mouseClick(waitForObjectExists(names.o_vitalsPopup_Close_Image, 2000)) + td_simulator.td_operation_mode(TDOpModes.MODE_INIT.value) td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0) grid_container = waitForObject(names.o_DeviceSettingsGrid) feature_configurations_option = utility.findChildByText( grid_container, "Feature Configurations" ) - if feature_configurations_option is not None: mouseClick(feature_configurations_option) @@ -180,13 +163,12 @@ # Perform the toggle action mouseClick(integrated_bp_cuff_mode_switch) - # Verify the state - test.compare( - integrated_bp_cuff_mode_switch.checked, - config.DISABLED, - f"Verify Integrated BP Cuff switch is Disabled", + test.verify( + not integrated_bp_cuff_mode_switch.checked, + "Verify Integrated BP Cuff switch is Disabled", ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) prescriptions_menu_object = utility.findChildByText( main_menu_container, "Prescriptions" @@ -196,10 +178,16 @@ navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) - verify_integrated_bp_cuff_button_state( - config.DISABLED, "Comparison of Measure Vitals button Disabled state" + overlay_container = waitForObject(names.o_Overlay, 2000) + integrated_bp_cuff_button = utility.findChildByText( + overlay_container, "Measure Vitals" ) + test.verify( + not integrated_bp_cuff_button.enabled, + "Verify Measure Vitals button is Disabled", + ) mouseClick(waitForObjectExists(names.o_vitalsPopup_Close_Image, 2000)) + td_simulator.td_operation_mode(TDOpModes.MODE_INIT.value) td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0) test.endSection() @@ -235,11 +223,9 @@ # Perform the toggle action mouseClick(heparin_syringe_pump_mode_switch) - # Verify the state - test.compare( + test.verify( heparin_syringe_pump_mode_switch.checked, - config.ENABLED, - f"Verify Heparin Syringe Pump switch is Enabled", + "Verify Heparin Syringe Pump switch is Enabled", ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) @@ -249,21 +235,52 @@ ) if prescriptions_menu_object is not None: mouseClick(prescriptions_menu_object) - navigate_to_main_treatment_screen_from_settings() + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) + settings_menu_object = utility.findChildByText(main_menu_container, "Treatment") + if settings_menu_object is not None: + mouseClick(settings_menu_object) + + mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) + td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) + navigation.navigation_pageIndicator_step(config.CREATERX) + create_rx_container = waitForObjectExists( + names.o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, 3000 + ) + heparin_bolus_volume_container = utility.findObjectById( + create_rx_container, "_heparinBolusVolume" + ) + test.verify( + heparin_bolus_volume_container.visible, + "Verify Heparin Bolus Volume Container is Visible", + ) + + heparin_dispensing_rate_container = utility.findObjectById( + create_rx_container, "_heparinDispensingRate" + ) + test.verify( + heparin_dispensing_rate_container.visible, + "Verify Heparin Dispensing Rate Container is Visible", + ) + + heparin_delivery_duration_container = utility.findObjectById( + create_rx_container, "_heparinStopTime" + ) + test.verify( + heparin_delivery_duration_container.visible, + "Verify Heparin Delivery Duration Container is Visible", + ) + + td_simulator.td_tx_state( + TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0 + ) headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000) heparin_bar = utility.findChildByText(headerbar_container, "Heparin") + test.verify(heparin_bar.visible, "Verify Heparin Bar in HearderBar is Visible") - if heparin_bar.visible: - test.log("In HeaderBar Heparin displayed and It is enabled") - test.compare( - heparin_bar.visible, - config.ENABLED, - f"Verify Heparin HeaderBar is Enabled and visible in screen", - ) - td_simulator.td_operation_mode(TDOpModes.MODE_INIT.value) td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0) + grid_container = waitForObject(names.o_DeviceSettingsGrid) feature_configurations_option = utility.findChildByText( grid_container, "Feature Configurations" @@ -288,11 +305,9 @@ # Perform the toggle action mouseClick(heparin_syringe_pump_mode_switch) - # Verify the state - test.compare( - heparin_syringe_pump_mode_switch.checked, - config.DISABLED, - f"Verify Heparin Syringe Pump switch is Disabled", + test.verify( + not heparin_syringe_pump_mode_switch.checked, + "Verify Heparin Syringe Pump switch is Disabled", ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) @@ -302,17 +317,52 @@ ) if prescriptions_menu_object is not None: mouseClick(prescriptions_menu_object) - navigate_to_main_treatment_screen_from_settings() + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) + settings_menu_object = utility.findChildByText(main_menu_container, "Treatment") + if settings_menu_object is not None: + mouseClick(settings_menu_object) + + mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) + td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) + navigation.navigation_pageIndicator_step(config.CREATERX) + + create_rx_container = waitForObjectExists( + names.o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, 3000 + ) + heparin_bolus_volume_container = utility.findObjectById( + create_rx_container, "_heparinBolusVolume" + ) + test.verify( + not heparin_bolus_volume_container.visible, + "Verify Heparin Bolus Volume Container is Not Visible", + ) + + heparin_dispensing_rate_container = utility.findObjectById( + create_rx_container, "_heparinDispensingRate" + ) + test.verify( + not heparin_dispensing_rate_container.visible, + "Verify Heparin Dispensing Rate Container is Not Visible", + ) + + heparin_delivery_duration_container = utility.findObjectById( + create_rx_container, "_heparinStopTime" + ) + test.verify( + not heparin_delivery_duration_container.visible, + "Verify Heparin Delivery Duration Container is Not Visible", + ) + + td_simulator.td_tx_state( + TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0 + ) + headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000) heparin_bar = utility.findChildByText(headerbar_container, "Heparin") - if not heparin_bar.visible: - test.log("In HeaderBar Heparin is not displayed") - test.compare( - heparin_bar.visible, - config.DISABLED, - f"Verify Heparin in HeaderBar is not visible", - ) + test.verify( + not heparin_bar.visible, "Verify Heparin Bar in HearderBar is Not Visible" + ) def main():