Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6 -r3791153311e93da4a8e3401ba149eae23a3c8d10 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 66a52a1a1bae8e3efdd6be96ad8ff5d0d5f7a2a6) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 3791153311e93da4a8e3401ba149eae23a3c8d10) @@ -21,6 +21,12 @@ CLEAR_ALARM_CONDITION_TEXT = "Clear Alarm Condition" EXPORT_TEXT ="Export Logs" DEVICE_SETTINGS_TEXT = "Device Settings" +SHUTDOWN_BUTTON_TEXT = "SHUTDOWN" +BACK_BUTTON_TEXT = "BACK" +EXPORT_LOGS_OPTIONS = ["Application", "Service", "Treatment"] +SD_CARD_DETAILS =["SD-Card (MB)", "Free : 0.000","Total: 0.000"] +USB_DRIVE_DETAILS = ["USB Drive (MB)","Free : 0.000","Total: 0.000"] +EXPORT_BUTTON_TEXT = "Export" DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"] SettingsHome_Treatment_Text = "Treatment" SettingsHome_Manager_Text = "Manager" @@ -35,4 +41,3 @@ #services CONFIRM_TEXT = "CONFIRM" -SHUTDOWN_TEXT = "SHUTDOWN" Index: shared/scripts/names.py =================================================================== diff -u -raabf1b3f92efc95e93c54ef70fe9d2bb374ef6fc -r3791153311e93da4a8e3401ba149eae23a3c8d10 --- shared/scripts/names.py (.../names.py) (revision aabf1b3f92efc95e93c54ef70fe9d2bb374ef6fc) +++ shared/scripts/names.py (.../names.py) (revision 3791153311e93da4a8e3401ba149eae23a3c8d10) @@ -54,12 +54,19 @@ o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True} o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} o_arrow_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} +#shutdown +o_shutdown_btn= {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} + o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} -o_userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True} -o_services_screen_text_obj = {"container": o_userConfirmation_UserConfirmation, "type": "Text", "unnamed": 1, "visible": True} -o_password_text_field = {"container": o_userConfirmation_UserConfirmation, "echoMode": 2, "id": "_input", "passwordCharacter": "•", "type": "TextInput", "unnamed": 1, "visible": True} -o_show_password = {"container": o_userConfirmation_UserConfirmation, "id": "_showPassword", "source": "qrc:/images/iEye", "type": "Image", "unnamed": 1, "visible": True} + +o_back_btn = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +#SD Card Information +o_sd_card_text = {"container": o_SettingsBase_SettingsBase, "text": "SD-Card (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True} +#USB drive Information +o_usb_text = {"container": o_SettingsBase_SettingsBase, "text": "USB Drive (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True} +#Export button +o_export_btn = {"container": o_SettingsBase_SettingsBase, "text": "Export", "type": "Text", "unnamed": 1, "visible": True} #object on keyboard to switch to keypad o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True} o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} Index: tst_service_screen/test.py =================================================================== diff -u -r8c3003ddde4f7fdfe95356a17136e040fa801c0d -r3791153311e93da4a8e3401ba149eae23a3c8d10 --- tst_service_screen/test.py (.../test.py) (revision 8c3003ddde4f7fdfe95356a17136e040fa801c0d) +++ tst_service_screen/test.py (.../test.py) (revision 3791153311e93da4a8e3401ba149eae23a3c8d10) @@ -20,10 +20,8 @@ from dialin.common.hd_defs import HDOpModes, HDOpSubModes from dialin.ui import utils -SERVICES_TITLE_TEXT = "Service Password" -SET_DATE_AND_TIME_TEXT = "Set Date And Time" -INCORRECT_PASSWORD = "abcd" -INCORRECT_PASSWORD_MSG = "Incorrect service password" +EXPORT_LOGS = "EXport Logs" + SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"] hd_simulator = HDSimulator() @@ -44,27 +42,24 @@ hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) utils.waitForGUI(1) mouseClick(waitForObjectExists(names.o_settings_Text)) + test.compare(device_settings_text.text, config.SERIVCES_TITLE, "{} screen is displayed".format(config.SERIVCES_TITLE)) + mouseClick(waitForObjectExists(names.o_shutdown_btn)) + test.compare(device_settings_text.text, config.SHUTDOWN_BUTTON_TEXT, "{} screen is displayed".format(config.SHUTDOWN_BUTTON_TEXT)) device_settings_text = waitForObjectExists(settings_text_obj(config.DEVICE_SETTINGS_TEXT)) test.compare(device_settings_text.text, config.DEVICE_SETTINGS_TEXT, "{} screen is displayed".format(config.DEVICE_SETTINGS_TEXT)) test.endSection() -def verify_incorrect_password_msg(): +def verify_export_logs_screen(): """ - Method to verify the message displayed - upon entering wrong password + Method to verify the export logs screen """ - test.startSection("Verifying the functionalities with Incorrect password") - test.log("Clicking on password entry field") + test.startSection("Verifying the the export logs screen") + test.log("Navigating to service screen to export log screen") utils.waitForGUI(0.3) - mouseClick(waitForObjectExists(names.o_password_text_field)) - utility.enter_keyboard_numeric_value(entry=str(INCORRECT_PASSWORD)) - mouseClick(waitForObjectExists(names.o_show_password)) - test.log("Verifying the entered password") - password = str((waitForObjectExists(names.o_password_text_field)).text) - test.compare(password, INCORRECT_PASSWORD, "Entered password should be {}".format(str(INCORRECT_PASSWORD))) - mouseClick(waitForObjectExists(services_screen_text_obj(config.CONFIRM_TEXT))) - incorrect_password_text = waitForObjectExists(settings_text_obj(INCORRECT_PASSWORD_MSG)) - test.compare(incorrect_password_text.text, INCORRECT_PASSWORD_MSG, "{} message should display upon entering wrong password".format(INCORRECT_PASSWORD_MSG)) + mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS))) + test.compare(services_screen_text_obj.text, config.BACK_BUTTON_TEXT, "{} screen is displayed".format(config.BACK_BUTTON_TEXT)) + test.compare(services_screen_text_obj.text, config.BACK_BUTTON_TEXT, "{} screen is displayed".format(config.BACK_BUTTON_TEXT)) + test.endSection() def navigate_to_services_password_screen_and_enter_password():