Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_FlowsSection(): @@ -35,14 +35,14 @@ gotoScreenNtest_Contains_FlowsSection() utils.waitForGUI(1) - HDSimulator.cmd_set_treatment_blood_flow_rate(175, 0, 0, 0, 0, 0, 0) - HDSimulator.cmd_set_treatment_dialysate_flow_rate(250, 1, 1, 1, 1, 1, 1) + hd_sim.cmd_set_treatment_blood_flow_rate(175, 0, 0, 0, 0, 0, 0) + hd_sim.cmd_set_treatment_dialysate_flow_rate(250, 1, 1, 1, 1, 1, 1) gotoScreenNTest_Adjustment() utils.waitForGUI(1) - HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) - HDSimulator.cmd_send_acknowledge_ui() + hd_sim.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) + hd_sim.cmd_send_acknowledge_ui() mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) @@ -52,17 +52,17 @@ # sendTreatmentAdjustBloodDialysateRequest mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.wait_for_message_to_be_sent() + hd_sim.wait_for_message_to_be_sent() utils.waitForGUI(7) # wait for ack timeout 5 is the timeout added +2 Sec for safe range. # sendTreatmentAdjustBloodDialysateRequest again mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.wait_for_message_to_be_sent() - HDSimulator.cmd_send_acknowledge_hd() + hd_sim.wait_for_message_to_be_sent() + hd_sim.cmd_send_acknowledge_hd() - HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage - HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage - HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 175, 250) + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 175, 250) utils.waitForGUI(2) mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) @@ -71,12 +71,12 @@ test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).value, 200) - HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(1, 0, + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(1, 0, waitForObjectExists(names.o_bloodFlowSlider_Slider).value, waitForObjectExists(names.o_dialysateFlowSlider_Slider).value ) - HDSimulator.cmd_set_treatment_blood_flow_rate(225, 1, 1, 1, 1, 1, 1) - HDSimulator.cmd_set_treatment_dialysate_flow_rate(200, 0, 0, 0, 0, 0, 0) + hd_sim.cmd_set_treatment_blood_flow_rate(225, 1, 1, 1, 1, 1, 1) + hd_sim.cmd_set_treatment_dialysate_flow_rate(200, 0, 0, 0, 0, 0, 0) test.compare(str(waitForObjectExists(names.o_treatmentStart_225_Text).text), "225") test.compare(str(waitForObjectExists(names.o_treatmentStart_200_Text).text), "200")