Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rac91770cea28ba13a1bb1c8799e170ff69b2131a -r43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision ac91770cea28ba13a1bb1c8799e170ff69b2131a) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3) @@ -297,10 +297,22 @@ o_SettingsAdvancedInstitutional_max_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_max", "type": "ValueAdjuster", "unnamed": 1 } o_SettingsAdvancedInstitutional_def_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_def", "type": "ValueAdjuster", "unnamed": 1 } o_PreTreatmentCreate_rightArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightArrow", "type": "IconButton", "unnamed": 1 } - o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } +o_PreTreatmentCreate_leftArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } - -o_PreTreatmentCreate_leftArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } \ No newline at end of file +#General Aesthetics +o_HeaderBar_SettingsButton = {"container": o_Gui_MainView, "id": "_settingsButton", "type": "IconButton", "unnamed": 1 } +o_HeaderBar_Settings_iconImage = {"container": o_Gui_MainView, "id": "_iconImage", "source": "qrc:/images/iSettings", "type": "Image", "unnamed": 1 } +o_HeaderBar_Settings_Popup = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1 } +o_Settings_Popup_BrightnessImage = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iBrightness", "type": "Image", "unnamed": 1 } +o_Settings_Popup_VolumeImage = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iVolume", "type": "Image", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1 } +o_view_SwipeView = {"container": o_Overlay, "id": "_view", "type": "SwipeView", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup_TDOpModeColumn = {"container": o_view_SwipeView, "id": "_TDOpModeColumn", "type": "DebugDataColumn", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup_TDOpmodeData_Value = {"container": o_view_SwipeView, "objectName": "_TDOpmodeData0", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Text = {"container": o_view_SwipeView, "objectName": "_TDOpmodeDataL0", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value = {"container": o_view_SwipeView, "objectName": "_TDOpmodeData1", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Text = {"container": o_view_SwipeView, "objectName": "_TDOpmodeDataL1", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDTXStatesColumn = {"container": o_view_SwipeView, "id": "_TDTXStatesColumn", "type": "DebugDataColumn", "unnamed": 1 } Index: suite_leahi/suite.conf =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3 --- suite_leahi/suite.conf (.../suite.conf) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/suite.conf (.../suite.conf) (revision 43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional +TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional tst_settings_service tst_general_aesthetics VERSION=3 WRAPPERS=Qt Index: suite_leahi/tst_general_aesthetics/test.py =================================================================== diff -u -rada517030c3f6f20ce2df4a60c3adbf60fa144ee -r43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3 --- suite_leahi/tst_general_aesthetics/test.py (.../test.py) (revision ada517030c3f6f20ce2df4a60c3adbf60fa144ee) +++ suite_leahi/tst_general_aesthetics/test.py (.../test.py) (revision 43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3) @@ -87,6 +87,7 @@ content, f"Comparison of Information Pop-up SD Card Section Contents: {content}", ) + test.endSection() @@ -95,7 +96,6 @@ Method to verify Diagnostics Pop-up TD Op Mode """ test.startSection("Verifying Diagnostics pop-up TD Op Mode") - # Click the Settings button headerbar_diagnostics = waitForObjectExists(names.o_headerBar_HeaderBar, 3000) doubleClick(headerbar_diagnostics) @@ -129,6 +129,10 @@ for mode in TDOpModes: td_simulator.td_operation_mode(mode.value, 0) + + headerbar_diagnostics = waitForObjectExists(names.o_headerBar_HeaderBar, 3000) + doubleClick(headerbar_diagnostics) + mouseClick(utility.get_object_from_names(names.o_HeaderBar_Diagnostics_Popup_TDOpModeColumn)) td_opmode_value = waitForObject( utility.setObjectText( names.o_HeaderBar_Diagnostics_Popup_TDOpmodeData_Value, mode.value @@ -150,9 +154,10 @@ config.SUBMODE, f"Comparison of Diagnostics Pop-up TD Op Sub Mode Text", ) - + + mouseClick(utility.get_object_from_names(names.o_HeaderBar_Diagnostics_Popup_TDOpModeColumn)) for submode in TDStandbyStates: - td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, submode.value) + td_simulator.td_operation_mode(TDOpModes.NUM_OF_TD_MODES.value, submode.value) td_submode_value = waitForObject( utility.setObjectText( names.o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value, @@ -166,6 +171,7 @@ str(submode.value), f"Comparing TD Op Submode Value: {submode.name}", ) + test.endSection()