From c61a2db93fc61165059f022288047195eecce9b1 Mon Sep 17 00:00:00 2001 From: vladislavploaia Date: Wed, 27 Nov 2024 11:51:14 +0200 Subject: [PATCH] fix: CDR-1615 modify subfolder generated uid and change checks for 409 Conflict on Create Directory --- .../E.1__2_EHRs_with_same_folder_id.robot | 16 ++++++++-------- .../folder/folder_complex_hierarchy2.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/robot/DIRECTORY_TESTS/CREATE_DIRECTORY/E.1__2_EHRs_with_same_folder_id.robot b/tests/robot/DIRECTORY_TESTS/CREATE_DIRECTORY/E.1__2_EHRs_with_same_folder_id.robot index 16fea57a..63b94e3a 100644 --- a/tests/robot/DIRECTORY_TESTS/CREATE_DIRECTORY/E.1__2_EHRs_with_same_folder_id.robot +++ b/tests/robot/DIRECTORY_TESTS/CREATE_DIRECTORY/E.1__2_EHRs_with_same_folder_id.robot @@ -26,20 +26,20 @@ Force Tags *** Test Cases *** Alternative flow: create directory with the same existing uid under another EHR - [Tags] not-ready CDR-1615 - [Documentation] Fails due to https://vitagroup-ag.atlassian.net/browse/CDR-1615 - ... \nMarked as skipped, as bug ticket not fixed yet. + [Tags] not-ready + [Documentation] Previously failing due to https://vitagroup-ag.atlassian.net/browse/CDR-1615 + ## remove not-ready tag + ## when branch https://github.com/ehrbase/ehrbase/tree/refs/heads/feature/CDR-1615-Fix-dublicate-folder-vo_id is merged create EHR Set Test Variable ${ehr_id1} ${ehr_id} create DIRECTORY (JSON) empty_directory_with_defined_uid.json isModifiable=${TRUE} Status Should Be 201 create EHR Set Test Variable ${ehr_id2} ${ehr_id} - create DIRECTORY (JSON) empty_directory_with_defined_uid.json isModifiable=${TRUE} - Should Not Be Equal As Strings ${response.status_code} 201 - ... Bug ticket https://vitagroup-ag.atlassian.net/browse/CDR-1615 - #Status Should Be 409 - #Should Contain ${response.text} does not allow modification + Run Keyword And Return Status create DIRECTORY (JSON) empty_directory_with_defined_uid.json isModifiable=${TRUE} + Should Be Equal As Strings ${response.status_code} 409 + Should Be Equal As Strings ${response.json()['error']} Conflict + Should Be Equal As Strings ${response.json()['message']} FOLDER with uid e5ee0249-60c6-47b0-80cc-f5cef3172015 already exist. [Teardown] Delete EHRs diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_complex_hierarchy2.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_complex_hierarchy2.json index 49ccda71..96e77212 100644 --- a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_complex_hierarchy2.json +++ b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_complex_hierarchy2.json @@ -14,7 +14,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "d936409e-901f-4994-8d33-ed104d460151" + "value": "f5aed2c5-2341-46ea-9c55-304d724609db" }, "name": { "_type": "DV_TEXT",