From ac3fe1614bae318bc70e140a85394eef49ecee2c Mon Sep 17 00:00:00 2001 From: vladislavploaia Date: Wed, 18 Sep 2024 10:37:34 +0300 Subject: [PATCH] fix: change from uuid to uid in AQL statements --- .../FOLDER/FROM_FOLDER/find_all_and_by.robot | 20 +++++++++---------- .../find_all.robot | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER/find_all_and_by.robot b/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER/find_all_and_by.robot index 03292c6a..1a5fe0e2 100644 --- a/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER/find_all_and_by.robot +++ b/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER/find_all_and_by.robot @@ -12,11 +12,11 @@ Suite Teardown Admin Delete EHR For AQL #enable this keyword if AQL check *** Test Cases *** -Find All: SELECT f/uuid/value, f/name/value, f/name/value, f/archetype_node_id FROM FOLDER f +Find All: SELECT f/uid/value, f/name/value, f/name/value, f/archetype_node_id FROM FOLDER f [Tags] not-ready [Documentation] ... Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#find-all - ${query} Set Variable SELECT f/uuid/value, f/name/value, f/name/value, f/archetype_node_id FROM FOLDER f + ${query} Set Variable SELECT f/uid/value, f/name/value, f/name/value, f/archetype_node_id FROM FOLDER f Set AQL And Execute Ad Hoc Query ${query} ${expected_result} Set Variable ${EXPECTED_JSON_DATA_SETS}/folder/expected_find_all.json ${exclude_paths} Create List root['meta'] root['q'] @@ -26,11 +26,11 @@ Find All: SELECT f/uuid/value, f/name/value, f/name/value, f/archetype_node_id F ... ignore_string_case=${TRUE} Should Be Empty ${diff} msg=DIFF DETECTED! -Find By Archetype: SELECT f/uuid/value FROM FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1] +Find By Archetype: SELECT f/uid/value FROM FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1] [Tags] not-ready [Documentation] ... Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#find-by-archetype - ${query} Set Variable SELECT f/uuid/value FROM FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1] + ${query} Set Variable SELECT f/uid/value FROM FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1] Set AQL And Execute Ad Hoc Query ${query} Length Should Be ${resp_body['rows']} 1 ${expected_result} Set Variable ${EXPECTED_JSON_DATA_SETS}/folder/expected_find_by_archetype.json @@ -39,11 +39,11 @@ Find By Archetype: SELECT f/uuid/value FROM FOLDER f[openEHR-EHR-FOLDER.episode_ ... ${resp_body_actual} ${expected_result} exclude_paths=${exclude_paths} Should Be Empty ${diff} msg=DIFF DETECTED! -Find By Name: SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'root1' +Find By Name: SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'root1' [Tags] not-ready [Documentation] ... Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#find-by-name - ${query} Set Variable SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'root1' + ${query} Set Variable SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'root1' Set AQL And Execute Ad Hoc Query ${query} Length Should Be ${resp_body['rows']} 1 ${expected_result} Set Variable ${EXPECTED_JSON_DATA_SETS}/folder/expected_find_by_name_root1.json @@ -52,11 +52,11 @@ Find By Name: SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'root1' ... ${resp_body_actual} ${expected_result} exclude_paths=${exclude_paths} Should Be Empty ${diff} msg=DIFF DETECTED! -Find By Name: SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'subfolder1' +Find By Name: SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'subfolder1' [Tags] not-ready [Documentation] ... Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#find-by-name - ${query} Set Variable SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'subfolder1' + ${query} Set Variable SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'subfolder1' Set AQL And Execute Ad Hoc Query ${query} Length Should Be ${resp_body['rows']} 1 ${expected_result} Set Variable ${EXPECTED_JSON_DATA_SETS}/folder/expected_find_by_name_subfolder1.json @@ -65,11 +65,11 @@ Find By Name: SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'subfolder1 ... ${resp_body_actual} ${expected_result} exclude_paths=${exclude_paths} Should Be Empty ${diff} msg=DIFF DETECTED! -Find By Name: SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'subsubfolder1' +Find By Name: SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'subsubfolder1' [Tags] not-ready [Documentation] ... Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#find-by-name - ${query} Set Variable SELECT f/uuid/value FROM FOLDER f WHERE f/name/value = 'subsubfolder1' + ${query} Set Variable SELECT f/uid/value FROM FOLDER f WHERE f/name/value = 'subsubfolder1' Set AQL And Execute Ad Hoc Query ${query} Length Should Be ${resp_body['rows']} 1 ${expected_result} Set Variable ${EXPECTED_JSON_DATA_SETS}/folder/expected_find_by_name_subsubfolder1.json diff --git a/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_all.robot b/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_all.robot index e69de29b..04cdc7f3 100644 --- a/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_all.robot +++ b/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_all.robot @@ -0,0 +1 @@ +##TODO: Implementation to be continued from https://github.com/ehrbase/conformance-testing-documentation/blob/cc2de61cd54975d1cf40be066afd88616e294aa1/FOLDER.md#folder-contains-folder \ No newline at end of file