Index: shared/scripts/configuration/config.py =================================================================== diff -u -ra58d7af64baf37c4bc405ca01052bf066da7b892 -rd1f77a43896c36aeb59d454b37040d699bc8c902 --- shared/scripts/configuration/config.py (.../config.py) (revision a58d7af64baf37c4bc405ca01052bf066da7b892) +++ shared/scripts/configuration/config.py (.../config.py) (revision d1f77a43896c36aeb59d454b37040d699bc8c902) @@ -16,7 +16,7 @@ import os from configuration.strings import * -AUT_NAME = "denaliSquish" +AUT_NAME = "denaliSquish -k -K -S" COMMON_PATH = os.environ['HOME']+"/Projects" SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" @@ -37,14 +37,3 @@ INVALID = False NOT_VISIBLE = False VISIBLE = True - - - - - - - - - - - Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r713d91e75e2c2b041040d7b04f415f0e5eb0a490 -rd1f77a43896c36aeb59d454b37040d699bc8c902 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 713d91e75e2c2b041040d7b04f415f0e5eb0a490) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision d1f77a43896c36aeb59d454b37040d699bc8c902) @@ -35,17 +35,13 @@ SERVICE_SCREEN_TITLE_TEXT = "Service" SERVICE_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"] - #Information INFORMATION_TITLES = ["Information", "Versions"] INFORMATION_PARAMETERS = ["Information", "UI Version", "HD Version", "HD FPGA Version", "HD Serial Number", "DG Version", "DG FPGA Version", "DG Serial Number"] SERIVCES_TITLE = "Service" SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"] - #service BACK_TEXT = "BACK" CONFIRM_TEXT = "CONFIRM" SHUTDOWN_TEXT = "SHUTDOWN" - - Index: shared/scripts/names.py =================================================================== diff -u -r086fe275f058d57c4ce7e17631a39f668048767a -rd1f77a43896c36aeb59d454b37040d699bc8c902 --- shared/scripts/names.py (.../names.py) (revision 086fe275f058d57c4ce7e17631a39f668048767a) +++ shared/scripts/names.py (.../names.py) (revision d1f77a43896c36aeb59d454b37040d699bc8c902) @@ -91,5 +91,3 @@ o_SettingsBase_usbFolderRectangle_Rectangle = {"container": o_SettingsBase_SettingsBase, "gradient": 0, "id": "_usbFolderRectangle", "type": "Rectangle", "unnamed": 1, "visible": True} o_SettingsBase_progressCircle_ProgressCircle_2 = {"container": o_SettingsBase_SettingsBase, "id": "_progressCircle", "occurrence": 2, "type": "ProgressCircle", "unnamed": 1, "visible": True} o_SettingsBase_image_Image = {"container": o_SettingsBase_SettingsBase, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} - - Index: tst_service_screen/test.py =================================================================== diff -u -r713d91e75e2c2b041040d7b04f415f0e5eb0a490 -rd1f77a43896c36aeb59d454b37040d699bc8c902 --- tst_service_screen/test.py (.../test.py) (revision 713d91e75e2c2b041040d7b04f415f0e5eb0a490) +++ tst_service_screen/test.py (.../test.py) (revision d1f77a43896c36aeb59d454b37040d699bc8c902) @@ -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,9 +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) @@ -119,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))