From 218881dbdc1fc62bb90f394dc94d3bab1acc8c53 Mon Sep 17 00:00:00 2001 From: dinhlongviolin1 Date: Sun, 15 Sep 2024 16:35:43 +0700 Subject: [PATCH] per Fabien + test fixes --- taipy/gui/custom/utils.py | 4 +++- tests/gui/helpers.py | 12 ++++++++---- tests/gui/server/ws/test_a.py | 4 ++-- tests/gui/server/ws/test_ru.py | 9 +++++++-- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/taipy/gui/custom/utils.py b/taipy/gui/custom/utils.py index 61da1ddf33..4018a5c3f1 100644 --- a/taipy/gui/custom/utils.py +++ b/taipy/gui/custom/utils.py @@ -19,7 +19,8 @@ from ._page import ResourceHandler, _ExternalResourceHandlerManager -def is_in_custom_page_context(): +def is_in_custom_page_context() -> bool: + "NOT DOCUMENTED" resource_handler_id = None with contextlib.suppress(Exception): if has_request_context(): @@ -28,6 +29,7 @@ def is_in_custom_page_context(): def get_current_resource_handler() -> t.Optional[ResourceHandler]: + "NOT DOCUMENTED" resource_handler_id = None with contextlib.suppress(Exception): if has_request_context(): diff --git a/tests/gui/helpers.py b/tests/gui/helpers.py index a84a8e7520..96ec5be709 100644 --- a/tests/gui/helpers.py +++ b/tests/gui/helpers.py @@ -70,10 +70,14 @@ def assert_outward_ws_message(received_message, type, varname, value): args = received_message["args"] assert "type" in args and args["type"] == type assert "payload" in args - payload = args["payload"][0] - assert "name" in payload and varname in payload["name"] - assert "payload" in payload and "value" in payload["payload"] and payload["payload"]["value"] == value - logging.getLogger().debug(payload["payload"]["value"]) + payload_arr = args["payload"] + found_payload = False + for payload in payload_arr: + if "name" in payload and varname in payload["name"]: + assert "payload" in payload and "value" in payload["payload"] and payload["payload"]["value"] == value + found_payload = True + logging.getLogger().debug(payload["payload"]["value"]) + assert found_payload @staticmethod def assert_outward_simple_ws_message(received_message, type, varname, value): diff --git a/tests/gui/server/ws/test_a.py b/tests/gui/server/ws/test_a.py index 513367ad51..c33914fa3d 100644 --- a/tests/gui/server/ws/test_a.py +++ b/tests/gui/server/ws/test_a.py @@ -41,5 +41,5 @@ def do_something(state, id): assert gui._bindings()._get_all_scopes()[sid].x == 20 # type: ignore # assert for received message (message that would be sent to the front-end client) received_messages = ws_client.get_received() - helpers.assert_outward_ws_message(received_messages[0], "MU", "x", 20) - helpers.assert_outward_ws_message(received_messages[1], "MU", "text", "a random text") + helpers.assert_outward_ws_message(received_messages[0], "MU", "tpec_TpExPr_x_TPMDL_0", 20) + helpers.assert_outward_ws_message(received_messages[1], "MU", "tpec_TpExPr_text_TPMDL_0", "a random text") diff --git a/tests/gui/server/ws/test_ru.py b/tests/gui/server/ws/test_ru.py index 1add066411..9913c97f63 100644 --- a/tests/gui/server/ws/test_ru.py +++ b/tests/gui/server/ws/test_ru.py @@ -33,8 +33,13 @@ def test_ru_selector(gui: Gui, helpers, csvdata): sid = helpers.create_scope_and_get_sid(gui) # Get the jsx once so that the page will be evaluated -> variable will be registered flask_client.get(f"/taipy-jsx/test?client_id={sid}") - ws_client.emit("message", {"client_id": sid, "type": "RU", "name": "", "payload": {"names": ["selected_val"]}}) + ws_client.emit( + "message", + {"client_id": sid, "type": "RU", "name": "", "payload": {"names": ["_TpLv_tpec_TpExPr_selected_val_TPMDL_0"]}}, + ) # assert for received message (message that would be sent to the front-end client) received_messages = ws_client.get_received() assert len(received_messages) - helpers.assert_outward_ws_message(received_messages[0], "MU", "selected_val", ["value1", "value2"]) + helpers.assert_outward_ws_message( + received_messages[0], "MU", "_TpLv_tpec_TpExPr_selected_val_TPMDL_0", ["value1", "value2"] + )