feat: CDR-1550 add expected test data for implemented cases and remov…

…e not-ready tag from passed tests
ehrbase · Sep 23, 2024 · e6d4a42 · e6d4a42
1 parent 7c3be32
commit e6d4a42
Show file tree

Hide file tree

Showing 11 changed files with 309 additions and 4 deletions.
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
@@ -12,7 +12,6 @@ Suite Teardown  Admin Delete EHR For AQL
 
 *** Test Cases ***
 Find All: SELECT f1/uid/value, f1/name/value, f2/uid/value, f2/name/value FROM FOLDER f1 CONTAINS FOLDER f2
-    [Tags]      not-ready
     ${query}    Set Variable    SELECT f1/uid/value, f1/name/value, f2/uid/value, f2/name/value FROM FOLDER f1 CONTAINS FOLDER f2
     Set AQL And Execute Ad Hoc Query    ${query}
     Length Should Be    ${resp_body['rows']}     10

diff --git a/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_by.robot b/tests/robot/AQL_TESTS/FOLDER/FROM_FOLDER_CONTAINS_FOLDER/find_by.robot
@@ -15,7 +15,6 @@ Suite Teardown  Admin Delete EHR For AQL    ${ehr_id}
 
 *** Test Cases ***
 ${query_nr} SELECT f2/uid/value, f2/name/value FROM FOLDER f1[${predicate1}] CONTAINS FOLDER f2[${predicate2}]
-    [Tags]      not-ready
     [Template]      Execute Query
     ${predicate1}    ${predicate2}      ${expected_file}    ${nr_of_results}
 

diff --git a/tests/robot/AQL_TESTS/FOLDER/SELECT_PATHS_IN_FOLDER/paths_in_folder.robot b/tests/robot/AQL_TESTS/FOLDER/SELECT_PATHS_IN_FOLDER/paths_in_folder.robot
@@ -17,7 +17,6 @@ Suite Teardown  Admin Delete EHR For AQL
 
 *** Test Cases ***
 ${query_nr} SELECT ${path} FROM FOLDER f
-    [Tags]      not-ready
     [Template]      Execute Query
     ${path}    ${expected_file}    ${nr_of_results}
 

diff --git a/...rces/test_data_sets/aql/fields_and_results/folder/combinations/select_paths_in_folder.csv b/...rces/test_data_sets/aql/fields_and_results/folder/combinations/select_paths_in_folder.csv
@@ -3,4 +3,4 @@ ${query_nr},${path},${expected_file},${nr_of_results}
 2.,f/items/id/value,expected_select_paths_in_folder_items_id_value.json,3
 3.,f/items,expected_select_paths_in_folder_f_items.json,3
 4.,f/details,expected_select_paths_in_folder_f_details.json,2
-5.,f/details[at0003]/items[at0004]/value,expected_select_paths_in_folder_f_details_at4_val.json,2
+5.,f/details[at0003]/items[at0004]/value/value,expected_select_paths_in_folder_f_details_at4_val.json,2
diff --git a/...est_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_all.json b/...est_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_all.json
@@ -0,0 +1,90 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:20:39.3052084+03:00",
+		"_executed_aql": "SELECT f1/uid/value, f1/name/value, f2/uid/value, f2/name/value FROM FOLDER f1 CONTAINS FOLDER f2",
+		"resultsize": 10
+	},
+	"q": "SELECT f1/uid/value, f1/name/value, f2/uid/value, f2/name/value FROM FOLDER f1 CONTAINS FOLDER f2",
+	"columns": [
+		{
+			"path": "f1/uid/value",
+			"name": "#0"
+		},
+		{
+			"path": "f1/name/value",
+			"name": "#1"
+		},
+		{
+			"path": "f2/uid/value",
+			"name": "#2"
+		},
+		{
+			"path": "f2/name/value",
+			"name": "#3"
+		}
+	],
+	"rows": [
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"e9ae5700-d969-430a-b4f2-445e3091a901",
+			"subsubfolder2"
+		],
+		[
+			"ac1e12cb-b9db-4f15-a8aa-4e62a9d97231",
+			"subfolder2",
+			"e9ae5700-d969-430a-b4f2-445e3091a901",
+			"subsubfolder2"
+		],
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"13661fe2-1e16-4c75-a10d-9b8040487a72",
+			"subsubfolder1"
+		],
+		[
+			"ac1e12cb-b9db-4f15-a8aa-4e62a9d97231",
+			"subfolder2",
+			"13661fe2-1e16-4c75-a10d-9b8040487a72",
+			"subsubfolder1"
+		],
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"ac1e12cb-b9db-4f15-a8aa-4e62a9d97231",
+			"subfolder2"
+		],
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"3cb9efa5-fe71-49e9-a02f-d38835c27d1b",
+			"subsubfolder2"
+		],
+		[
+			"d936409e-901f-4994-8d33-ed104d460151",
+			"subfolder1",
+			"3cb9efa5-fe71-49e9-a02f-d38835c27d1b",
+			"subsubfolder2"
+		],
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3",
+			"subsubfolder1"
+		],
+		[
+			"d936409e-901f-4994-8d33-ed104d460151",
+			"subfolder1",
+			"0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3",
+			"subsubfolder1"
+		],
+		[
+			"10e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"root1",
+			"d936409e-901f-4994-8d33-ed104d460151",
+			"subfolder1"
+		]
+	]
+}
diff --git a/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_1.json b/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_1.json
@@ -0,0 +1,38 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:27:24.7116624+03:00",
+		"_executed_aql": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1, 'root1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+		"resultsize": 4
+	},
+	"q": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1,'root1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+	"columns": [
+		{
+			"path": "f2/uid/value",
+			"name": "#0"
+		},
+		{
+			"path": "f2/name/value",
+			"name": "#1"
+		}
+	],
+	"rows": [
+		[
+			"3cb9efa5-fe71-49e9-a02f-d38835c27d1b",
+			"subsubfolder2"
+		],
+		[
+			"13661fe2-1e16-4c75-a10d-9b8040487a72",
+			"subsubfolder1"
+		],
+		[
+			"e9ae5700-d969-430a-b4f2-445e3091a901",
+			"subsubfolder2"
+		],
+		[
+			"0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3",
+			"subsubfolder1"
+		]
+	]
+}
diff --git a/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_2.json b/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_2.json
@@ -0,0 +1,30 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:27:24.762151+03:00",
+		"_executed_aql": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1, 'subfolder1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+		"resultsize": 2
+	},
+	"q": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1,'subfolder1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+	"columns": [
+		{
+			"path": "f2/uid/value",
+			"name": "#0"
+		},
+		{
+			"path": "f2/name/value",
+			"name": "#1"
+		}
+	],
+	"rows": [
+		[
+			"3cb9efa5-fe71-49e9-a02f-d38835c27d1b",
+			"subsubfolder2"
+		],
+		[
+			"0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3",
+			"subsubfolder1"
+		]
+	]
+}
diff --git a/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_3.json b/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_3.json
@@ -0,0 +1,30 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:27:24.7993439+03:00",
+		"_executed_aql": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1, 'subfolder2'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+		"resultsize": 2
+	},
+	"q": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1,'subfolder2'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1]",
+	"columns": [
+		{
+			"path": "f2/uid/value",
+			"name": "#0"
+		},
+		{
+			"path": "f2/name/value",
+			"name": "#1"
+		}
+	],
+	"rows": [
+		[
+			"13661fe2-1e16-4c75-a10d-9b8040487a72",
+			"subsubfolder1"
+		],
+		[
+			"e9ae5700-d969-430a-b4f2-445e3091a901",
+			"subsubfolder2"
+		]
+	]
+}
diff --git a/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_4.json b/...st_data_sets/aql/fields_and_results/folder/expected_folder_contains_folder_find_by_4.json
@@ -0,0 +1,30 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:27:24.8370776+03:00",
+		"_executed_aql": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1, 'root1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1, 'subsubfolder1']",
+		"resultsize": 2
+	},
+	"q": "SELECT f2/uid/value, f2/name/value FROM FOLDER f1[openEHR-EHR-FOLDER.generic.v1,'root1'] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1,'subsubfolder1']",
+	"columns": [
+		{
+			"path": "f2/uid/value",
+			"name": "#0"
+		},
+		{
+			"path": "f2/name/value",
+			"name": "#1"
+		}
+	],
+	"rows": [
+		[
+			"13661fe2-1e16-4c75-a10d-9b8040487a72",
+			"subsubfolder1"
+		],
+		[
+			"0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3",
+			"subsubfolder1"
+		]
+	]
+}
diff --git a/...st_data_sets/aql/fields_and_results/folder/expected_select_paths_in_folder_f_details.json b/...st_data_sets/aql/fields_and_results/folder/expected_select_paths_in_folder_f_details.json
@@ -0,0 +1,66 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:27:25.4942934+03:00",
+		"_executed_aql": "SELECT f/details FROM FOLDER f",
+		"resultsize": 2
+	},
+	"q": "SELECT f/details FROM FOLDER f",
+	"columns": [
+		{
+			"path": "f/details",
+			"name": "#0"
+		}
+	],
+	"rows": [
+		[
+			{
+				"_type": "ITEM_TREE",
+				"name": {
+					"_type": "DV_TEXT",
+					"value": "Tree"
+				},
+				"items": [
+					{
+						"_type": "ELEMENT",
+						"name": {
+							"_type": "DV_TEXT",
+							"value": "text"
+						},
+						"value": {
+							"_type": "DV_TEXT",
+							"value": "value2"
+						},
+						"archetype_node_id": "at0004"
+					}
+				],
+				"archetype_node_id": "at0003"
+			}
+		],
+		[
+			{
+				"_type": "ITEM_TREE",
+				"name": {
+					"_type": "DV_TEXT",
+					"value": "Tree"
+				},
+				"items": [
+					{
+						"_type": "ELEMENT",
+						"name": {
+							"_type": "DV_TEXT",
+							"value": "text"
+						},
+						"value": {
+							"_type": "DV_TEXT",
+							"value": "value1"
+						},
+						"archetype_node_id": "at0004"
+					}
+				],
+				"archetype_node_id": "at0003"
+			}
+		]
+	]
+}
diff --git a/...sets/aql/fields_and_results/folder/expected_select_paths_in_folder_f_details_at4_val.json b/...sets/aql/fields_and_results/folder/expected_select_paths_in_folder_f_details_at4_val.json
@@ -0,0 +1,24 @@
+{
+	"meta": {
+		"_type": "RESULTSET",
+		"_schema_version": "1.0.3",
+		"_created": "2024-09-23T16:42:12.446094+03:00",
+		"_executed_aql": "SELECT f/details[at0003]/items[at0004]/value/value FROM FOLDER f",
+		"resultsize": 2
+	},
+	"q": "SELECT f/details[at0003]/items[at0004]/value/value FROM FOLDER f",
+	"columns": [
+		{
+			"path": "f/details[at0003]/items[at0004]/value/value",
+			"name": "#0"
+		}
+	],
+	"rows": [
+		[
+			"value2"
+		],
+		[
+			"value1"
+		]
+	]
+}