fix: merge conflict fix and add test data

ehrbase · Oct 9, 2024 · 232dc0e · 232dc0e
2 parents dfe382d + 8ed6edb
commit 232dc0e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/tests/robot/AQL_TESTS/FOLDER/MULTIPLE_EHRS/select_by_folder_and_ehr_id.robot b/tests/robot/AQL_TESTS/FOLDER/MULTIPLE_EHRS/select_by_folder_and_ehr_id.robot
@@ -12,12 +12,12 @@ Suite Teardown  Run Keywords    Admin Delete EHR For AQL    ${ehr_id1}      AND
 
 
 *** Test Cases ***
-SELECT e/ehr_id/value, f/name/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '${ehr_id1}' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'
+SELECT e/ehr_id/value, f/name/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '${ehr_id1}' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'
     [Documentation]
     ...     Covers: https://github.com/ehrbase/conformance-testing-documentation/blob/main/FOLDER.md#select-by-folder-and-ehr-id
     Log     Skipped as returns emtpy rows.     console=yes
     ${query}    Set Variable
-    ...     SELECT e/ehr_id/value, f/name/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '${ehr_id1}' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'
+    ...     SELECT e/ehr_id/value, f/name/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '${ehr_id1}' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'
     Set AQL And Execute Ad Hoc Query    ${query}
     Length Should Be    ${resp_body['rows']}     1
     ${temporary_file}     Set Variable  ${EXPECTED_JSON_DATA_SETS}/folder/expected_folder_select_by_folder_and_ehr_id_tmp.json

diff --git a/..._data_sets/aql/fields_and_results/folder/expected_folder_select_by_folder_and_ehr_id.json b/..._data_sets/aql/fields_and_results/folder/expected_folder_select_by_folder_and_ehr_id.json
@@ -2,11 +2,11 @@
 	"meta": {
 		"_type": "RESULTSET",
 		"_schema_version": "1.0.3",
-		"_created": "2024-10-09T11:52:18.7179659+03:00",
-		"_executed_aql": "SELECT e/ehr_id/value, f/name/value FROM EHR e CONTAINS FOLDER f WHERE (e/ehr_id/value = '3d9ef4e4-ddc6-47a1-90f2-cf2918054d80' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151')",
+		"_created": "2024-10-09T11:56:59.6362002+03:00",
+		"_executed_aql": "SELECT e/ehr_id/value, f/name/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE (e/ehr_id/value = '1dbf007a-6b50-4000-a172-cfb5674c3ddf' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151')",
 		"resultsize": 1
 	},
-	"q": "SELECT e/ehr_id/value, f/name/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '3d9ef4e4-ddc6-47a1-90f2-cf2918054d80' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'",
+	"q": "SELECT e/ehr_id/value, f/name/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = '1dbf007a-6b50-4000-a172-cfb5674c3ddf' AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'",
 	"columns": [
 		{
 			"path": "e/ehr_id/value",
@@ -15,12 +15,17 @@
 		{
 			"path": "f/name/value",
 			"name": "#1"
+		},
+		{
+			"path": "f/uid/value",
+			"name": "#2"
 		}
 	],
 	"rows": [
 		[
 			"${ehr_id1}",
-			"subfolder1"
+			"subfolder1",
+			"d936409e-901f-4994-8d33-ed104d460151"
 		]
 	]
 }