Index: shared/scripts/configuration/strings.py =================================================================== diff -u -reebae8f239aa742106f38756851cfedaa1223b23 -r51f350d176f9f913b1e63018f5b42e1e65855518 --- shared/scripts/configuration/strings.py (.../strings.py) (revision eebae8f239aa742106f38756851cfedaa1223b23) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 51f350d176f9f913b1e63018f5b42e1e65855518) @@ -10,10 +10,8 @@ #Setting -CLEAR_ALARM_CONDITION_TEXT = "Clear Alarm Condition" -EXPORT_TEXT ="Export" DEVICE_SETTINGS_TEXT = "Device Settings" -DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"] +DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"] SettingsHome_Treatment_Text = "Treatment" SettingsHome_Manager_Text = "Manager" SettingsHome_Settings_Text = "Settings" @@ -22,7 +20,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"] #volume and brightness Index: tst_settings_information/test.py =================================================================== diff -u -r60052e368730f397362b57a0d216da2785fe51c9 -r51f350d176f9f913b1e63018f5b42e1e65855518 --- tst_settings_information/test.py (.../test.py) (revision 60052e368730f397362b57a0d216da2785fe51c9) +++ tst_settings_information/test.py (.../test.py) (revision 51f350d176f9f913b1e63018f5b42e1e65855518) @@ -72,17 +72,7 @@ Method to verify the buttons and parameters of 'Device Settings screen """ - test.startSection("Verify the buttons and parameters of 'Device Settings' screen") - - verify_export_button(config.ENABLED) - mouseClick(waitForObjectExists(settings_text_obj(config.EXPORT_TEXT))) - - eject_btn = waitForObject(names.o_eject_btn) - test.compare(eject_btn.enabled, config.ENABLED, "Eject button should be enabled") - mouseClick(eject_btn) - test.log("Verifying the state of 'Export' button after clicking on Eject button") - verify_export_button(config.DISABLED) - + test.startSection("Verify the buttons and parameters of 'Device Settings' screen") for parameter in config.DEVICE_SETTINGS_SCREEN_PARAMETER: parameter_text = waitForObjectExists(settings_text_obj(parameter)) test.compare(parameter_text.text, parameter, "{} should be available under 'Device Settings' screen".format(parameter)) @@ -189,21 +179,7 @@ else: continue test.endSection() - -def verify_export_button(state): - """ - Method to verify the 'Export' button - @param state - (bool) True/False state of the export button - """ - test.startSection("Verifying Export button") - export_btn = waitForObjectExists(settings_text_obj(config.EXPORT_TEXT)) - test.compare(export_btn.text, config.EXPORT_TEXT, "Export button text should be {}".format(config.EXPORT_TEXT)) - if state == config.ENABLED: - test.compare(export_btn.enabled, config.ENABLED, "Export button should be enabled") - else: - test.compare(export_btn.enabled, config.DISABLED, "Export button should be disabled") - test.endSection() - + def verify_service_date(hd_day, hd_month, hd_year, hd_interval_days, dg_day, dg_month, dg_year, dg_interval_days): """ Method to simulate the 'HD last service date',