Index: shared/scripts/configuration/config.py =================================================================== diff -u -rad324b2834285a29c4458b100317f76eaf64fc6a -reeeeccc9e75d0c7c894e744aa44b82e1e174d345 --- shared/scripts/configuration/config.py (.../config.py) (revision ad324b2834285a29c4458b100317f76eaf64fc6a) +++ shared/scripts/configuration/config.py (.../config.py) (revision eeeeccc9e75d0c7c894e744aa44b82e1e174d345) @@ -32,7 +32,6 @@ BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" - RESET_BINARY = "0" SET_BINARY = "1" #Message binaries appending with for easy identification ACK_REQ_STATUS = 'Ack Req' @@ -58,8 +57,20 @@ ENABLED = True DISABLED = False +##volume and brightness +VOLUME_AND_BRIGHTNESS_TEXT = "Volume And Brightness" +BRIGHTNESS_TEXT = "Brightness" +ALARM_VOLUME_TEXT = "Alarm Volume" +BACK_TEXT = "BACK" +#Dictionary for brightness and alarm volume slider values +VOLUME_AND_BRIGHTNESS_SLIDER_VALUES = { + + "Brightness": [20, 40, 60, 80, 100], + "Alarm Volume": [20, 40, 60, 80, 100] + + } @@ -69,3 +80,6 @@ + + + Index: shared/scripts/names.py =================================================================== diff -u -r0d3ed535ddc839d8f7678dda6318685f98927264 -reeeeccc9e75d0c7c894e744aa44b82e1e174d345 --- shared/scripts/names.py (.../names.py) (revision 0d3ed535ddc839d8f7678dda6318685f98927264) +++ shared/scripts/names.py (.../names.py) (revision eeeeccc9e75d0c7c894e744aa44b82e1e174d345) @@ -60,3 +60,6 @@ o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_service_date_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} +#volume and brightness +o_SettingsBase_SettingsVolumeBrightness = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsVolumeBrightness", "visible": True} +o_SettingsBase_Volume_And_Brightness_Text = {"container": o_SettingsBase_SettingsVolumeBrightness, "type": "Text", "unnamed": 1, "visible": True} \ No newline at end of file Index: tst_settings_information/test.py =================================================================== diff -u -r0d3ed535ddc839d8f7678dda6318685f98927264 -reeeeccc9e75d0c7c894e744aa44b82e1e174d345 --- tst_settings_information/test.py (.../test.py) (revision 0d3ed535ddc839d8f7678dda6318685f98927264) +++ tst_settings_information/test.py (.../test.py) (revision eeeeccc9e75d0c7c894e744aa44b82e1e174d345) @@ -43,6 +43,11 @@ INTERVAL_DAYS_1_YEARS = 365 INTERVAL_DAYS_6_MONTHS = 180 INTERVAL_DAYS_10_MONTHS = 304 +TOUCH_GRID_ITEM_NUMBER_5 = 5 +GRID_ITEM_0 = 0 +FIRST_PARAMETER_OBJECT_ITEM_POSITION_2 = 2 +TITLE_ITEM_OBJECT_POSIITON_1 = 1 +VERSION_ITEM_OBJECT_POSTION_3 = 3 def settings_text_obj(text): names.o_settings_home_text_obj["text"] = text @@ -56,11 +61,9 @@ names.o_service_date_obj["text"] = text return names.o_service_date_obj -TOUCH_GRID_ITEM_NUMBER_5 = 5 -GRID_ITEM_0 = 0 -FIRST_PARAMETER_OBJECT_ITEM_POSITION_2 = 2 -TITLE_ITEM_OBJECT_POSIITON_1 = 1 -VERSION_ITEM_OBJECT_POSTION_3 = 3 +def volume_and_brightness_text_obj(text): + names.o_SettingsBase_Volume_And_Brightness_Text["text"] = text + return names.o_SettingsBase_Volume_And_Brightness_Text def verify_settings_parameters(): """ @@ -240,6 +243,36 @@ test.compare(dg_next_service_date_text.text, dg_next_service_date, "'DG last service date' should be {}".format(dg_next_service_date)) test.endSection() +def verify_volume_and_brightness_section(): + """ + Method to verify "Volume and Brightness" screen + """ + test.startSection("Verifying volume and brightness screen") + test.log("Verifying the title text of 'Volume And Brightness' screen") + volume_and_brightness_text = waitForObjectExists(volume_and_brightness_text_obj(config.VOLUME_AND_BRIGHTNESS_TEXT)) + test.compare(volume_and_brightness_text.text, config.VOLUME_AND_BRIGHTNESS_TEXT, "{} screen is displayed".format(config.VOLUME_AND_BRIGHTNESS_TEXT)) + brightness_text = waitForObjectExists(volume_and_brightness_text_obj(config.BRIGHTNESS_TEXT)) + test.compare(brightness_text.text, config.BRIGHTNESS_TEXT,"Brightness title text should be {}".format(config.BRIGHTNESS_TEXT)) + alarm_volume_text = waitForObjectExists(volume_and_brightness_text_obj(config.ALARM_VOLUME_TEXT)) + test.compare(alarm_volume_text.text, config.ALARM_VOLUME_TEXT,"Alarm Volume text should be {}".format(config.ALARM_VOLUME_TEXT)) + back_btn = waitForObjectExists(volume_and_brightness_text_obj(config.BACK_TEXT)) + test.compare(back_btn.enabled , True, "Back button should be enabled") + mouseClick(back_btn) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(settings_text_obj(config.VOLUME_AND_BRIGHTNESS_TEXT))) + test.endSection() + +def verify_brightness_and_alarm_volume_values(): + """ + Method to verify "Alarm Volume and Brightness slider values" on screen + """ + test.startSection("Verifying brightness and alarm volume slider values") + utils.waitForGUI(1) + for brightness in config.CREATE_TREATMENT_PARAMETER_RANGE[config.BRIGHTNESS_TEXT]: + test_custom_treatment_slider(names.o_PreTreatmentCreate_bloodFlowRateSlider_Slider, brightness, config.VOLUME_AND_BRIGHTNESS_SLIDER_VALUES["Brightness"], config.BRIGHTNESS_TEXT) + test.endSection() + + def main(): utils.tstStart(__file__) @@ -284,5 +317,11 @@ utils.waitForGUI(0.5) verify_service_date(hd_day=DAY_30, hd_month=MONTH_AUGUST, hd_year=YEAR_2045, hd_interval_days=INTERVAL_DAYS_10_MONTHS, dg_day=DAY_3, dg_month=MONTH_NOVEMBER, dg_year=YEAR_2022, dg_interval_days=INTERVAL_DAYS_2_YEARS) + test.log("Navigating to 'Settings' screen") + mouseClick(waitForObjectExists(service_date_obj(config.BACK_TEXT))) + utils.waitForGUI(0.5) + test.log("Navigating to 'Volume and Brightness' screen") + mouseClick(waitForObjectExists(settings_text_obj(config.VOLUME_AND_BRIGHTNESS_TEXT))) + verify_volume_and_brightness_section() utils.tstDone() \ No newline at end of file