Index: suite_leahi/tst_feature_options/test.py =================================================================== diff -u -r81c7919125877a08a7e54f3f4de9375a2e25bbaa -r6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb --- suite_leahi/tst_feature_options/test.py (.../test.py) (revision 81c7919125877a08a7e54f3f4de9375a2e25bbaa) +++ suite_leahi/tst_feature_options/test.py (.../test.py) (revision 6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb) @@ -33,9 +33,7 @@ """Helper function to Navigate to Main Treatment screen from Device 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(utility.findChildByText(main_menu_container, config.TREATMENT)) mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 3000)) @@ -53,17 +51,12 @@ """Navigating to 'Feature Configurations' screen, Verifying Parameters, and Enable & Disable Integrated BP Cuff switch & Verifying it in Main Treatment Screen """ ) - grid_container = waitForObject(names.o_DeviceSettingsGrid) - feature_configurations_option = utility.findChildByText( - grid_container, "Feature Configurations" - ) + device_settings_grid = waitForObject(names.o_DeviceSettingsGrid) + mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS)) - if feature_configurations_option is not None: - mouseClick(feature_configurations_option) - headerbar_container = waitForObject(names.o_headerBar_HeaderBar) feature_configurations_title_text = utility.findChildByText( - headerbar_container, "Feature Configurations" + headerbar_container, config.FEATURE_CONFIGURATIONS_SCREEN_TITLE_TEXT ) if feature_configurations_title_text is not None: test.compare( @@ -75,7 +68,7 @@ ) # Wait for the main grid/container - grid_container = waitForObject(names.o_SettingsBase_SettingsFeatureConfigurations) + feature_configuration_grid = waitForObject(names.o_SettingsBase_SettingsFeatureConfigurations) # Iterate through the list of expected texts from config for ( @@ -84,7 +77,7 @@ # Finding any child within the container that matches this text found_elements = utility.findAllObjectsByText( - grid_container, feature_configurations_parameter + feature_configuration_grid, feature_configurations_parameter ) # Verify that at least one such element was found @@ -122,18 +115,14 @@ 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" - ) - if prescriptions_menu_object is not None: - mouseClick(prescriptions_menu_object) + mouseClick(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS)) td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value) navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) overlay_container = waitForObject(names.o_Overlay, 2000) integrated_bp_cuff_button = utility.findChildByText( - overlay_container, "Measure Vitals" + overlay_container, config.MEASURE_VITALS ) test.verify( integrated_bp_cuff_button.enabled, "Verify Measure Vitals button is Enabled" @@ -142,12 +131,7 @@ 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) + mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS)) # Wait for the toggle Integrated BP Cuff switch object integrated_bp_cuff_mode_switch = waitForObject( @@ -171,19 +155,14 @@ ) 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" - ) - if prescriptions_menu_object is not None: - mouseClick(prescriptions_menu_object) + mouseClick(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS)) navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) overlay_container = waitForObject(names.o_Overlay, 2000) integrated_bp_cuff_button = utility.findChildByText( - overlay_container, "Measure Vitals" + overlay_container, config.MEASURE_VITALS ) test.verify( not integrated_bp_cuff_button.enabled, @@ -203,20 +182,13 @@ ) td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0) headerbar_container = waitForObject(names.o_mainMenu_MainMenu, 3000) - settings_menu_object = utility.findChildByText( - headerbar_container, "Settings" - ) - if settings_menu_object is not None: - mouseClick(settings_menu_object) + mouseClick(utility.findChildByText(headerbar_container, config.SETTINGS)) + td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0) - grid_container = waitForObject(names.o_DeviceSettingsGrid, 3000) - feature_configurations_option = utility.findChildByText( - grid_container, "Feature Configurations" - ) + device_settings_grid = waitForObject(names.o_DeviceSettingsGrid, 3000) + mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS)) - if feature_configurations_option is not None: - mouseClick(feature_configurations_option) # Wait for the toggle Heparin Syringe Pump switch object heparin_syringe_pump_mode_switch = waitForObject( @@ -242,14 +214,9 @@ 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" - ) - if prescriptions_menu_object is not None: - mouseClick(prescriptions_menu_object) + mouseClick(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS)) - main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) - mouseClick(utility.findChildByText(main_menu_container, "Treatment")) + mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT)) mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) @@ -285,20 +252,14 @@ 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") + heparin_bar = utility.findChildByText(headerbar_container, config.HEPARIN) test.verify(heparin_bar.visible, "Verify Heparin Bar in HearderBar is Visible") 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" - ) + mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS)) - if feature_configurations_option is not None: - mouseClick(feature_configurations_option) - # Wait for the toggle Heparin Syringe Pump switch object heparin_syringe_pump_mode_switch = waitForObject( names.o_SettingsBase_heparinSyringePumpSwitch_BaseSwitch, 3000 @@ -320,20 +281,10 @@ "Verify Heparin Syringe Pump 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" - ) - if prescriptions_menu_object is not None: - mouseClick(prescriptions_menu_object) + mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) + mouseClick(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS)) + mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT)) - 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) @@ -370,7 +321,7 @@ ) headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000) - heparin_bar = utility.findChildByText(headerbar_container, "Heparin") + heparin_bar = utility.findChildByText(headerbar_container, config.HEPARIN) test.verify( not heparin_bar.visible, "Verify Heparin Bar in HearderBar is Not Visible" )