Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r8fe5a9ba850a3e98ba082d6bbe110cef84b072fe -r66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 8fe5a9ba850a3e98ba082d6bbe110cef84b072fe) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6) @@ -19,7 +19,7 @@ #Setting CLEAR_ALARM_CONDITION_TEXT = "Clear Alarm Condition" -EXPORT_TEXT ="Export" +EXPORT_TEXT ="Export Logs" DEVICE_SETTINGS_TEXT = "Device Settings" DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"] SettingsHome_Treatment_Text = "Treatment" @@ -30,7 +30,7 @@ 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 = "Services" +SERIVCES_TITLE = "Service" SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"] #services Index: tst_service_screen/test.py =================================================================== diff -u -r3840a7480f702f48ccfab1d624c3700527ec1ab2 -r66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6 --- tst_service_screen/test.py (.../test.py) (revision 3840a7480f702f48ccfab1d624c3700527ec1ab2) +++ tst_service_screen/test.py (.../test.py) (revision 66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6) @@ -20,11 +20,11 @@ from dialin.common.hd_defs import HDOpModes from dialin.ui import utils -SERVICES_TITLE_TEXT = "Please Enter The Service Password" +SERVICES_TITLE_TEXT = "Service Password" SET_DATE_AND_TIME_TEXT = "Set Date And Time" INCORRECT_PASSWORD = "abcd" INCORRECT_PASSWORD_MSG = "Incorrect service password" -SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Set Date And Time", "Set Language", "Software Update", "Factory Reset", "Calibration ", ] +SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"] hd_simulator = HDSimulator() @@ -102,13 +102,6 @@ test.compare(password, str(services_password), "Entered password should be {}".format(str(services_password))) mouseClick(waitForObjectExists(services_screen_text_obj(config.CONFIRM_TEXT))) utils.waitForGUI(0.5) - test.log("Verifying the 'Export' button") - test.compare(str(waitForObjectExists(settings_text_obj(config.EXPORT_TEXT)).text), config.EXPORT_TEXT,"'Export' button text should be {}".format(config.EXPORT_TEXT)) - utils.waitForGUI(0.1) - test.compare(waitForObjectExists(settings_text_obj(config.EXPORT_TEXT)).enabled , True, "'Export' button should be enabled") - test.log("Verifying the 'Shutdown' button enabled") - test.compare(str(waitForObjectExists(names.o_shutdown_text).text), config.SHUTDOWN_TEXT,"'SHUTDOWN' button text should be {}".format(config.SHUTDOWN_TEXT)) - test.compare(waitForObjectExists(names.o_shutdown_text).enabled , True, "'SHUTDOWN' button should be enabled") for option in SERVICE_SCREEN_OPTIONS: option_text = waitForObjectExists(settings_text_obj(option)) test.compare(option_text.text, option, "{} should be available under services screen".format(option))