Index: shared/scripts/configuration/config.py =================================================================== diff -u -r62ec06529482b0dfe06ad258433390927707a56b -r09dad4f4fbf30637c5e2967a793ba2ea48615b74 --- shared/scripts/configuration/config.py (.../config.py) (revision 62ec06529482b0dfe06ad258433390927707a56b) +++ shared/scripts/configuration/config.py (.../config.py) (revision 09dad4f4fbf30637c5e2967a793ba2ea48615b74) @@ -16,6 +16,7 @@ from pathlib import Path from configuration.strings import * + # -S, --disable-sd-card-fail-log-stop disable-sd-card-fail-log-stop # -k, --enable-check-in-log Enables Check-In Log # -K, --enable-acknow-log Enables Acknowledgment Log @@ -490,4 +491,3 @@ HEAT_DISINFECTION_TIME_HOUR = {"valid" : "23","invalid" : "24"} HEAT_DISINFECTION_TIME_MINUTE = {"valid" : "59","invalid" : "60"} HEAT_DISINFECTION_CYCLE = {"valid" : "7", "invalid" : "61"} - Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r602a0fa53978e3d7a44180fd13a83db2b480b83c -r09dad4f4fbf30637c5e2967a793ba2ea48615b74 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 602a0fa53978e3d7a44180fd13a83db2b480b83c) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 09dad4f4fbf30637c5e2967a793ba2ea48615b74) @@ -349,7 +349,6 @@ SERVICE_TEXT = "Service" SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"] - #volume and brightness VOLUME_AND_BRIGHTNESS_TEXT = "Volume And Brightness" BRIGHTNESS_TEXT = "Brightness" @@ -1049,8 +1048,7 @@ # dictionary of rejection reason from application source code. # message location -> denali-> Headers-> common-> MsgDefs.h -#create custom treatment -TREATMENT_TITLE = "Create a Custom Treatment" +#create custom treatment HEPARIN_TYPE = "UFH 1,000 IU/mL" ACID_CONCENTRATE = ["08-1251-1", "08-2251-0", "08-3251-9"] BICARBONATE_CONCENTRATE = "Fres. Centrisol" Index: shared/scripts/names.py =================================================================== diff -u -r602a0fa53978e3d7a44180fd13a83db2b480b83c -r09dad4f4fbf30637c5e2967a793ba2ea48615b74 --- shared/scripts/names.py (.../names.py) (revision 602a0fa53978e3d7a44180fd13a83db2b480b83c) +++ shared/scripts/names.py (.../names.py) (revision 09dad4f4fbf30637c5e2967a793ba2ea48615b74) @@ -1079,5 +1079,3 @@ o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase", "visible": True} o_confirm_button_text = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Scan_Finished_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Scan Finished", "type": "Text", "unnamed": 1, "visible": True} - - Index: tst_service_screen/test.py =================================================================== diff -u -r401f9693ca709b00517cf213decbfe5e22e1f96b -r09dad4f4fbf30637c5e2967a793ba2ea48615b74 --- tst_service_screen/test.py (.../test.py) (revision 401f9693ca709b00517cf213decbfe5e22e1f96b) +++ tst_service_screen/test.py (.../test.py) (revision 09dad4f4fbf30637c5e2967a793ba2ea48615b74) @@ -35,6 +35,7 @@ names.o_option_combo_box["text"] = text return names.o_option_combo_box + def settings_text_obj(text): """ Method to set custom object property for settings screen. @@ -81,10 +82,9 @@ mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS))) test.compare(waitForObjectExists(names.o_export_logs_text).text,config.EXPORT_LOG_TEXT,"{} should be under export logs screen ".format(config.EXPORT_LOG_TEXT)) log_status = get_storage_data_status(names.o_usb_folder_slider) - test.verify(log_status == True, "export data rectangles should be filled with contents under USB drive.") + test.verify(log_status == False, "export data rectangles should not be filled with contents under USB drive.") log_status = get_storage_data_status(names.o_SettingsBase_sdcFolderView_ListView) - test.verify(log_status == True, "export data rectangles should be filled with contents under SD card.") - + test.verify(log_status == False, "export data rectangles should be not filled with contents under SD card.") for option in range(len(config.EXPORT_LOGS_OPTIONS)): utils.waitForGUI(1) @@ -120,7 +120,8 @@ test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle).color.name, config.RED_COLOR,"{} color progress bar is displayed for sd-card".format(config.RED_COLOR)) test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle_2).color.name, config.GREEN_COLOR,"{} color progress bar is displayed for usb-drive".format(config.GREEN_COLOR)) mouseClick(waitForObjectExists(names.o_SettingsBase_image_Image )) - test.compare(waitForObjectExists(names.o_export_btn).text, config.EXPORT_BUTTON_TEXT,"{} screen is displayed".format(config.EXPORT_BUTTON_TEXT)) + test.compare(waitForObjectExists(names.o_export_btn).text, config.EXPORT_BUTTON_TEXT,"Export button text should be {}".format(config.EXPORT_BUTTON_TEXT)) + test.compare(waitForObjectExists(names.o_export_btn).enabled, False, "Export button should be disabled") test.log("verification of progress bar color after exporting data") test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle).color.name, config.RED_COLOR,"{} color progress bar is displayed for sd-card".format(config.RED_COLOR))