Index: shared/scripts/configuration/config.py =================================================================== diff -u -rffa29812cc49397be901378d94e5ac7dadd24d0c -r79c10476a6ccb22f3faf9b37be90463c8e28fe46 --- shared/scripts/configuration/config.py (.../config.py) (revision ffa29812cc49397be901378d94e5ac7dadd24d0c) +++ shared/scripts/configuration/config.py (.../config.py) (revision 79c10476a6ccb22f3faf9b37be90463c8e28fe46) @@ -31,10 +31,7 @@ BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" - - #post-treatment CURRENT_COLOR = '#000000' @@ -47,7 +44,6 @@ TREATMENT_LOG_LOCATION = '/home/denali/Desktop/sd-card/treatment/*.log' VISIBLE = True - #dictionary consist of review parameters values of post treatment POST_TREATMENT_REVIEW_PARAMETER_RANGE = { "Patient ID": ["abcd", "xyz"], Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r8977e6f10ea8a1b5807f963a1b98dc11ea2d181f -r79c10476a6ccb22f3faf9b37be90463c8e28fe46 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 8977e6f10ea8a1b5807f963a1b98dc11ea2d181f) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 79c10476a6ccb22f3faf9b37be90463c8e28fe46) @@ -13,6 +13,9 @@ # ############################################################################ +BLOOD_PRIMING_UNIT = "mL" +BLOOD_PRIMING_VALUE_0 = "0" +BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + " " + BLOOD_PRIMING_UNIT #post-treatment @@ -32,7 +35,6 @@ ACID_CONCENTRATE = ["Fres. Naturalyte", "08-1251-1", "08-2251-0", "08-3251-9", "08-3251-9"] BICARBONATE_CONCENTRATE = "Fres. Centrisol" DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe"] - TREATMENT_REVIEW_TITLE_TEXT = "Treatment Review" POST_TREATMENT_REVIEW_SCREEN_UNITS = { @@ -75,5 +77,3 @@ } - - Index: shared/scripts/configuration/utility.py =================================================================== diff -u -ref6b58164d66c831ffaba8b71c57472cffac6c55 -r79c10476a6ccb22f3faf9b37be90463c8e28fe46 --- shared/scripts/configuration/utility.py (.../utility.py) (revision ef6b58164d66c831ffaba8b71c57472cffac6c55) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 79c10476a6ccb22f3faf9b37be90463c8e28fe46) @@ -15,10 +15,8 @@ import builtins import names import os -import csv import glob import object -import sys import test import time import squish Index: tst_post_treatment/test.py =================================================================== diff -u -ref6b58164d66c831ffaba8b71c57472cffac6c55 -r79c10476a6ccb22f3faf9b37be90463c8e28fe46 --- tst_post_treatment/test.py (.../test.py) (revision ef6b58164d66c831ffaba8b71c57472cffac6c55) +++ tst_post_treatment/test.py (.../test.py) (revision 79c10476a6ccb22f3faf9b37be90463c8e28fe46) @@ -16,11 +16,10 @@ # NOTE: # This test contradicts verification of post treatment section. -import builtins + import names import csv import test -import time import builtins from dialin.ui import utils from datetime import * @@ -31,16 +30,10 @@ hd_simulator = HDSimulator() -NUM_OF_POSTTREATMENT_BULLETS = len(config.POST_TREATMENT_SCREENS) + SCREEN_OBJ1 = names.o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase -SCREEN_OBJ2 = names.o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview SCREEN_OBJ3 = names.o_PostTreatmentStack_disposablesRemovalConfirm_TreatmentFlowBase num_of_instructionss = 0 -NUM_OF_PATIENT_DISCONNECTION_SCREENS = 2 -NUM_OF_DISPOSABLE_INSTALLATION_SCREENS = 7 -DISPOSABLES_STEP = 2 -PATIENT_DISCONNECTION_STEP = 0 -REVIEW_TREATMENT_STEP = 1 rightarrow_obj_names = [names.o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase] leftarrow_obj_names = [names.o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase] @@ -169,6 +162,7 @@ """ test.startSection("instruction bullet verification for screens") for instruction in range(1, num_of_instructions): + NUM_OF_POSTTREATMENT_BULLETS = len(config.POST_TREATMENT_SCREENS) bullet_children = object.children(waitForObjectExists(utility.get_bullet_object(screen_obj,(NUM_OF_POSTTREATMENT_BULLETS + instruction) - 1))) bullet_circle_color = bullet_children[0].color.name bullet_border_color = bullet_children[0].border.color.name @@ -188,7 +182,9 @@ Method to verify parameters under 'Patient Disconnection Screens' """ test.startSection("verifying Patient Disconnection screen") + PATIENT_DISCONNECTION_STEP = 0 utility.verify_page_step_indicator(SCREEN_OBJ1, PATIENT_DISCONNECTION_STEP, config.POST_TREATMENT_SCREENS) + NUM_OF_PATIENT_DISCONNECTION_SCREENS = 2 verify_right_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS) verify_left_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS) verify_right_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS) @@ -203,6 +199,8 @@ Method to verify parameters under 'Treatment Review Screens' """ test.startSection("Verifying Treatment Review Screen") + SCREEN_OBJ2 = names.o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview + REVIEW_TREATMENT_STEP = 1 utility.verify_page_step_indicator(SCREEN_OBJ2, REVIEW_TREATMENT_STEP, config.POST_TREATMENT_SCREENS) test.compare(waitForObject(names.o_treatment_review_next_text).text, config.NEXT_TEXT, "NEXT button text must be NEXT") test.verify(not waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).enabled, " Export button should not be active") @@ -223,8 +221,10 @@ mouseClick(waitForObjectExists(names.o_disposablesRemovalConfirm_BACK_Text)) utils.waitForGUI(0.3) #Delay given for screen navigation mouseClick(waitForObject(names.o_treatment_review_next_button)) + DISPOSABLES_STEP = 2 utility.verify_page_step_indicator(SCREEN_OBJ3, DISPOSABLES_STEP, config.POST_TREATMENT_SCREENS) names.o_bullet_object.pop("occurrence") + NUM_OF_DISPOSABLE_INSTALLATION_SCREENS = 7 verify_right_instruction_navigation_disposables(NUM_OF_DISPOSABLE_INSTALLATION_SCREENS) test.verify(waitForObjectExists(names.o_disposables_removal_confirm_button).enabled, " confirm button must be active") verify_left_instruction_navigation_disposables(NUM_OF_DISPOSABLE_INSTALLATION_SCREENS) @@ -260,7 +260,7 @@ Method to fetch patient ID from create custom treatment in post treatment review """ test.startSection("Method for navigate to create custom treatment to set all parameters ") - hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_TPAR.value , sub_mode = HDOpSubModes.SUBMODE_START.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode = HDOpSubModes.SUBMODE_START.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), patient_id) mouseClick(waitForObject(names.o_confirm_button))