Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r2d57ccb6d19e9fda0a30ee78e25a4aea0414ff97 -r8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 2d57ccb6d19e9fda0a30ee78e25a4aea0414ff97) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f) @@ -35,3 +35,5 @@ dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "text": "Dialysate Flow", "type": "Text", } dialyste_tmp_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "text": "Dialysate Temp." , "type": "Text", } dialyste_cond_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "text": "Dialysate Cond." , "type": "Text", } +Treatment_Complete_Text = {"container": mainTreatmentScreen, "text": "Treatment Complete", "type": "Text", "unnamed": 1 } +Treatment_Paused_Text = {"container": mainTreatmentScreen, "text": "Treatment Paused", "type": "Text", "unnamed": 1 } Index: suite_leahi/suite.conf =================================================================== diff -u -r0d29820546bc5f7cc598ac13ca5b20c8ea29926c -r8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f --- suite_leahi/suite.conf (.../suite.conf) (revision 0d29820546bc5f7cc598ac13ca5b20c8ea29926c) +++ suite_leahi/suite.conf (.../suite.conf) (revision 8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion +TEST_CASES=tst_solution_infusion tst_main_treatment VERSION=3 WRAPPERS=Qt Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -rc179ffdcc150165eeeda0749891b99b5b19fc6b8 -r8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision c179ffdcc150165eeeda0749891b99b5b19fc6b8) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 8bbe28832f6ddbac6a506f6a9db42d2cad5cca9f) @@ -319,6 +319,22 @@ #Calculating total seconds into minutes and passing to treatment time verification for value in total_time_list: treatment_time_verification(value) + #Check the treatment complete text message + test.compare(waitForObjectExists(names.Treatment_Complete_Text).text, "Treatment Complete", "Tx time completed text should be :" + str("Treatment Complete")) + td.td_treatment_time( tx_duration_s = 51 , + tx_elapsed_s = 5 , + tx_remaining_s = 6 ) + td.td_tx_state(TDTreatmentStates.TREATMENT_PAUSED_STATE.value , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 ) + test.compare(waitForObjectExists(names.Treatment_Paused_Text).text, "Treatment Paused", "Tx time paused text should be :" + str("Treatment Paused")) #TX Parameter Set Points verify_setPoints_from_main_treatement()