Index: shared/scripts/names.py =================================================================== diff -u -ra0ffac330f006351c100b1c75937eeaa32d70369 -r065c01e344820dacaf1cee612e95f345d3424382 --- shared/scripts/names.py (.../names.py) (revision a0ffac330f006351c100b1c75937eeaa32d70369) +++ shared/scripts/names.py (.../names.py) (revision 065c01e344820dacaf1cee612e95f345d3424382) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denaliSquish" # Squish +AUT_NAME = "denali" # Squish # KEPT THE START AT LINE 20 SO ANY (MESSAGE LINE NUMBER - 20) IS THE INDEX AlarmTextMap = [ @@ -488,13 +488,13 @@ o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"} # Confirm + Priming + Begin Treatment -o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"} -o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"} +o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_PreTreatmentConfirmFlickable", "type": "Flickable"} +o_priming_container = {"container": o_qquickview_alarm, "objectName": "_PreTreatmentPrime", "type": "PreTreatmentPrime"} o_priming_back_button = {"container": o_priming_container, "objectName": "_backButton", "type": "BackButton"} -o_priming_flickable = {"container": o_priming_container, "objectName": "_treatmentPrimeFlickable", "type": "Flickable"} o_priming_continue_button = {"container": o_priming_container, "objectName": "_treatmentPrimeContinueButton", "type": "TouchRect"} -o_treatment_begin_container = {"container": o_qquickview_alarm, "objectName": "_treatmentBegin", "type": "TreatmentBegin"} +o_treatment_begin_container = {"container": o_qquickview_alarm, "objectName": "_PreTreatmentUltrafiltration", "type": "PreTreatmentUltrafiltration"} o_treatment_begin_flickable = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginFlickable", "type": "TreatmentBegin"} -o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginStart", "type": "TouchRect"} +o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_startButton", "type": "TouchRect"} o_treatment_begin_back_button = {"container": o_treatment_begin_container, "objectName": "_backButton", "type": "BackButton"} +o_PreTreatmentUltrafiltration_volumeSlider_Slider = {"container": o_treatment_begin_container, "objectName": "_volumeSlider", "type": "Slider"} Index: tst_ConfirmPrimingBegin/test.py =================================================================== diff -u -rf29743f1a3b34472a3df5eaa4f8861fbc425f9ee -r065c01e344820dacaf1cee612e95f345d3424382 --- tst_ConfirmPrimingBegin/test.py (.../test.py) (revision f29743f1a3b34472a3df5eaa4f8861fbc425f9ee) +++ tst_ConfirmPrimingBegin/test.py (.../test.py) (revision 065c01e344820dacaf1cee612e95f345d3424382) @@ -40,9 +40,6 @@ utils.waitForGUI(7) # advance to start the treatment - test.compare(waitForObject(names.o_priming_flickable).visible, True, "Found priming flickable") - flick(waitForObject(names.o_priming_flickable), 0, 123) - test.compare(waitForObject(names.o_priming_continue_button).visible, True, "Found priming continue button") mouseClick(waitForObject(names.o_priming_continue_button)) utils.waitForGUI(0.5) # object not ready @@ -75,11 +72,11 @@ test_ultrafiltration_slider(hd_simulator) test.compare(waitForObject(names.o_treatment_begin_start_button).visible, True, "Found treatment start button") mouseClick(waitForObject(names.o_treatment_begin_start_button)) - utils.waitForGUI(0.1) - mouseClick(waitForObject(names.o_treatmentStart_back)) - mouseClick(waitForObject(names.o_mainMenu_settings)) - mouseClick(waitForObject(names.o_settings_end_treatment)) - utils.waitForGUI(3) +# utils.waitForGUI(0.1) +# mouseClick(waitForObject(names.o_treatmentStart_back)) +# mouseClick(waitForObject(names.o_mainMenu_settings)) +# mouseClick(waitForObject(names.o_settings_end_treatment)) +# utils.waitForGUI(3) def test_ultrafiltration_slider(hd_simulator: HDSimulator): """ @@ -88,29 +85,18 @@ @param hd_siulator: The HDSimulator object @return: None """ - slider_name = "_ultrafiltration" - slider_object_name = slider_name + "Slider" - # test.log("Slider Under Test", slider_object_name) - slider_selected_value_object_name = slider_name + "Value" - slider_object = {"container": names.o_treatment_begin_container, - "objectName": slider_object_name, - "type": "Slider" } +# test.compare(waitForObjectExists(selected_value_object).visible, True) +# mouseClick(waitForObject(slider_object), 0, 0, Qt.LeftButton) - selected_value_object = { - "container": names.o_treatment_begin_container, - "objectName": slider_selected_value_object_name, - "type": "Text" - } - - test.compare(waitForObjectExists(selected_value_object).visible, True) - mouseClick(waitForObject(slider_object), 0, 0, Qt.LeftButton) +# test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(0, "mL")) +# mouseClick(waitForObject(slider_object), waitForObject(slider_object).width, 0, Qt.LeftButton) - test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(0, "mL")) - - mouseClick(waitForObject(slider_object), waitForObject(slider_object).width, 0, Qt.LeftButton) +# test.compare(waitForObject(selected_value_object).visible, True) +# test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(8, "mL")) + utils.waitForGUI(1) + mouseClick(waitForObject(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider), 48, 4, Qt.LeftButton) - test.compare(waitForObject(selected_value_object).visible, True) - test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(8, "mL")) + print("") def main(): utils.tstStart(__file__)