From 70146071256e99ba7b796abca48150acf138529c Mon Sep 17 00:00:00 2001 From: vladislavploaia Date: Tue, 29 Apr 2025 11:23:39 +0300 Subject: [PATCH 1/3] fix: CDR-1901 check EHRBase-Template-ID absence in headers for Composition endpoints --- tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot index e063ca1d..40800832 100644 --- a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot +++ b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot @@ -638,6 +638,7 @@ Headers Checks Composition [Arguments] ${compo_uid_version}=1 Dictionary Should Contain Item ${resp.headers} Location ${BASEURL}/ehr/${ehr_id}/composition/${compo_id} Dictionary Should Contain Item ${resp.headers} ETag "${compo_id}::${system_id_with_tenant}::${compo_uid_version}" + Dictionary Should Not Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} Commit Composition OpenEHR [Documentation] Commit Composition using OpenEHR endpoint. Previously EHRSCAPE endpoint was used. From ba4c272a53c1ac4e62292028f47cac46f026e508 Mon Sep 17 00:00:00 2001 From: vladislavploaia Date: Tue, 29 Apr 2025 11:45:22 +0300 Subject: [PATCH 2/3] fix: use 'Dictionary Should Not Contain Key' --- tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot index 40800832..2aaf4ff9 100644 --- a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot +++ b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot @@ -638,7 +638,7 @@ Headers Checks Composition [Arguments] ${compo_uid_version}=1 Dictionary Should Contain Item ${resp.headers} Location ${BASEURL}/ehr/${ehr_id}/composition/${compo_id} Dictionary Should Contain Item ${resp.headers} ETag "${compo_id}::${system_id_with_tenant}::${compo_uid_version}" - Dictionary Should Not Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} + Dictionary Should Not Contain Key ${resp.headers} EHRBase-Template-ID Commit Composition OpenEHR [Documentation] Commit Composition using OpenEHR endpoint. Previously EHRSCAPE endpoint was used. From 5209807d8605b188e306a8c34df348bb1632878d Mon Sep 17 00:00:00 2001 From: vladislavploaia Date: Tue, 29 Apr 2025 12:08:02 +0300 Subject: [PATCH 3/3] fix: use 'Dictionary Should Not Contain Key' for other tests as well --- tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot index 2aaf4ff9..aaf50410 100644 --- a/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot +++ b/tests/robot/SANITY_TESTS/migrated_ehrscape_tests.robot @@ -178,7 +178,7 @@ Suite Setup Precondition Should Be Equal ${compo_uid_splitted}[2] 7 Log ${resp.headers} Dictionary Should Contain Item ${resp.headers} ETag "${compo_uid}" - Dictionary Should Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} + Dictionary Should Not Contain Key ${resp.headers} EHRBase-Template-ID 12. Get Compo JSON EHRSCAPE Migrated Set Test Variable ${compo_uid} ${compo_id}::${system_id_with_tenant}::6 @@ -190,7 +190,7 @@ Suite Setup Precondition Should Be Equal ${compo_uid_splitted}[1] ${system_id_with_tenant} Should Be Equal ${compo_uid_splitted}[2] 6 Dictionary Should Contain Item ${resp.headers} ETag "${compo_uid}" - Dictionary Should Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} + Dictionary Should Not Contain Key ${resp.headers} EHRBase-Template-ID 13. Get Compo XML EHRSCAPE Migrated Set Test Variable ${compo_uid} ${compo_id}::${system_id_with_tenant}::5 @@ -203,7 +203,7 @@ Suite Setup Precondition Should Be Equal ${compo_uid_splitted}[2] 5 Set Test Variable ${compo_id} ${compo_uid_splitted}[0] Dictionary Should Contain Item ${resp.headers} ETag "${compo_uid}" - Dictionary Should Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} + Dictionary Should Not Contain Key ${resp.headers} EHRBase-Template-ID 14. Get Compo STRUCTURED EHRSCAPE Migrated Set Test Variable ${compo_uid} ${compo_id}::${system_id_with_tenant}::4 @@ -215,7 +215,7 @@ Suite Setup Precondition Should Be Equal ${compo_uid_splitted}[1] ${system_id_with_tenant} Should Be Equal ${compo_uid_splitted}[2] 4 Dictionary Should Contain Item ${resp.headers} ETag "${compo_uid}[0]" - Dictionary Should Contain Item ${resp.headers} EHRBase-Template-ID ${template_id} + Dictionary Should Not Contain Key ${resp.headers} EHRBase-Template-ID 15. Delete Compo V1 EHRSCAPE Migrated Commit Composition OpenEHR composition=family_history__.json format=FLAT