Fisheye: Tag 0f0f87cba116542a90079ea43d94393ef628cbb6 refers to a dead (removed) revision in file `config.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: shared/scripts/configuration/config.py =================================================================== diff -u -rfb0cd1adaf0297a23ee5ef06cb9e1663ac7851af -rf43f15f8f6d0268b93bcf63c00c3dce3e60dcfae --- shared/scripts/configuration/config.py (.../config.py) (revision fb0cd1adaf0297a23ee5ef06cb9e1663ac7851af) +++ shared/scripts/configuration/config.py (.../config.py) (revision f43f15f8f6d0268b93bcf63c00c3dce3e60dcfae) @@ -40,6 +40,7 @@ FILTER_FLUSH_TITLE = "Filter Flush" MAXIMUM_COUNTDOWN_TIME = 300 MINIMUM_COUNTDOWN_TIME = 0 +COUNT_DOWN_TIME_100 = 100 SYSTEM_SELF_TEST_TITLE = "System Self Test" #Pre_treatment_water_sample @@ -61,7 +62,7 @@ ENABLED_COLOR = '#fcfcfc' INCOMPLETE_COLOR = '#607a91' -MAXIMUM_COUNTDOWN_TIME = 300 -MINIMUM_COUNTDOWN_TIME = 0 + + Index: shared/scripts/configuration/utility.py =================================================================== diff -u -ra679c30b3c509df89397dce8fcef3e211eb61130 -rf43f15f8f6d0268b93bcf63c00c3dce3e60dcfae --- shared/scripts/configuration/utility.py (.../utility.py) (revision a679c30b3c509df89397dce8fcef3e211eb61130) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision f43f15f8f6d0268b93bcf63c00c3dce3e60dcfae) @@ -17,9 +17,9 @@ import sys import test import squish -from builtins import int as pyInt import time from configuration import config +from builtins import int as pyInt from configuration.config import * from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator @@ -152,7 +152,7 @@ @param screen_title - (str) current title of the screen """ test.startSection("Verify the count down time in application") - for count_down in range(MAXIMUM_COUNTDOWN_TIME, MINIMUM_COUNTDOWN_TIME-1, -1): + for count_down in range(COUNT_DOWN_TIME_100, MINIMUM_COUNTDOWN_TIME-1, -1): if screen_title == BEGIN_PRIME_TITLE: hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(total=300, countdown=count_down) elif screen_title == PRIMING_TITLE: @@ -185,7 +185,7 @@ test.endSection() -def page_step_indicator_verification(screen_obj, pre_treatment_step): +def verify_page_step_indicator(screen_obj, pre_treatment_step): """ Method to verify the Page Step indicators [the object on top of the screen which indicates the steps passed, current, remained] @param pre_treatment_step : indicates the Current pre-treatment step Index: tst_pre_treatment_water_sample/test.py =================================================================== diff -u -ra679c30b3c509df89397dce8fcef3e211eb61130 -rf43f15f8f6d0268b93bcf63c00c3dce3e60dcfae --- tst_pre_treatment_water_sample/test.py (.../test.py) (revision a679c30b3c509df89397dce8fcef3e211eb61130) +++ tst_pre_treatment_water_sample/test.py (.../test.py) (revision f43f15f8f6d0268b93bcf63c00c3dce3e60dcfae) @@ -11,22 +11,24 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility +from dialin.common.hd_defs import HDOpModes,PreTreatmentSampleWaterStates,PreTreatmentSubModes + hd_simulator = HDSimulator() PRE_TREATMENT_STEP= 1 -def verification_of_sample_water_state_screens(): +def verify_sample_water_state_screens(): """ Method to verify the text and current state of the buttons and verify navigation within screen """ - hd_simulator.cmd_set_hd_operation_mode_data(5,0) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) test.log("Navigating to water sample main screen for verification") hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=1, water_sample_state=1,consumables_self_test_state=0, no_cartridge_self_test_state=0,installation_state=0, dry_self_test_state=0, prime_state=0,recirculate_state=0, patient_connection_state=0) - utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_water_sample_button).text), config.WATER_SAMPLE_BUTTON_TEXT,"Water Sample button text should be {}".format(config.WATER_SAMPLE_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_water_sample_button).enabled , True, "Water Sample button should be enabled") mouseClick(waitForObject(names.o_water_sample_button)) @@ -37,7 +39,7 @@ test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled") mouseClick(waitForObject(names.o_next_button)) - utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_pass_button).text), config.PASS_TEXT,"Pass button text should be {}".format(config.PASS_TEXT)) test.compare(waitForObjectExists(names.o_pass_button).enabled , True, "Pass button should be enabled") mouseClick(waitForObject(names.o_pass_button)) @@ -58,7 +60,7 @@ test.compare(waitForObjectExists(names.o_fail_button).enabled , True, "Fail button should be enabled") mouseClick(waitForObject(names.o_fail_button)) - utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_ok_button).text), config.OK_TEXT,"OK button text should be {}".format(config.OK_TEXT)) test.compare(waitForObjectExists(names.o_ok_button).enabled , True, "OK button should be enabled") mouseClick(waitForObject(names.o_ok_button)) @@ -69,10 +71,10 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) test.log("Navigating to Filter Flush screen") - utility.navigate_to_pretreatment_screen(mode=1) - utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) + utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) utility.verify_countdown(config.FILTER_FLUSH_TITLE) - verification_of_sample_water_state_screens() + verify_sample_water_state_screens() utils.tstDone()