From 6490b3be0d610e9591b046439ca04769dbe2edc8 Mon Sep 17 00:00:00 2001 From: joki Date: Fri, 15 Mar 2024 12:40:42 +0100 Subject: [PATCH] Update base.txt, test_csw.json, and 5 more files... --- mrmap/.requirements/base.txt | 2 +- mrmap/registry/fixtures/test_csw.json | 9 ++--- .../fixtures/test_datasetmetadata.json | 6 ++-- mrmap/registry/fixtures/test_wfs.json | 21 ++++-------- mrmap/registry/fixtures/test_wfs_proxy.json | 9 ++--- mrmap/registry/fixtures/test_wms.json | 33 +++++++------------ .../django/registry/tasks/tests_service.py | 5 +++ 7 files changed, 32 insertions(+), 53 deletions(-) diff --git a/mrmap/.requirements/base.txt b/mrmap/.requirements/base.txt index 59d335d97..fddb5b2bd 100644 --- a/mrmap/.requirements/base.txt +++ b/mrmap/.requirements/base.txt @@ -68,7 +68,7 @@ odin==2.9.0 drf-spectacular-jsonapi==0.4.1 -django-ows-lib==0.14.2 +django-ows-lib==0.14.3 camel-converter==3.0.0 diff --git a/mrmap/registry/fixtures/test_csw.json b/mrmap/registry/fixtures/test_csw.json index 86cc4dd53..f61da29ca 100644 --- a/mrmap/registry/fixtures/test_csw.json +++ b/mrmap/registry/fixtures/test_csw.json @@ -145,8 +145,7 @@ "abstract": "abstract1", "service_url": "", "service_contact": "1", - "metadata_contact": "1", - "search_vector": "" + "metadata_contact": "1" } }, { @@ -162,8 +161,7 @@ "service_url": "", "service_contact": "1", "metadata_contact": "1", - "version": "2.0.2", - "search_vector": "" + "version": "2.0.2" } }, { @@ -183,8 +181,7 @@ [ "meteorology" ] - ], - "search_vector": "" + ] } }, { diff --git a/mrmap/registry/fixtures/test_datasetmetadata.json b/mrmap/registry/fixtures/test_datasetmetadata.json index f276d54ce..8dc87462b 100644 --- a/mrmap/registry/fixtures/test_datasetmetadata.json +++ b/mrmap/registry/fixtures/test_datasetmetadata.json @@ -59,8 +59,7 @@ "reference_systems": [], "harvested_through": [ "9cc4889d-0cd4-4c3b-8975-58de6d30db41" - ], - "search_vector": "" + ] } }, { @@ -106,8 +105,7 @@ "reference_systems": [], "harvested_through": [ "9cc4889d-0cd4-4c3b-8975-58de6d30db41" - ], - "search_vector": "" + ] } }, { diff --git a/mrmap/registry/fixtures/test_wfs.json b/mrmap/registry/fixtures/test_wfs.json index 39fe9bc0d..fa377cd2f 100644 --- a/mrmap/registry/fixtures/test_wfs.json +++ b/mrmap/registry/fixtures/test_wfs.json @@ -77,8 +77,7 @@ [ "meteorology" ] - ], - "search_vector": "" + ] } }, { @@ -97,8 +96,7 @@ [ "meteorology" ] - ], - "search_vector": "" + ] } }, { @@ -111,8 +109,7 @@ "bbox_lat_lon": "SRID=4326;POLYGON ((-180 -90, -180 90, 180 90, 180 -90, -180 -90))", "origin": "capabilities", "title": "node2", - "is_active": true, - "search_vector": "" + "is_active": true } }, { @@ -125,8 +122,7 @@ "bbox_lat_lon": "SRID=4326;POLYGON ((-180 -90, -180 90, 180 90, 180 -90, -180 -90))", "origin": "capabilities", "title": "node3", - "is_active": true, - "search_vector": "" + "is_active": true } }, { @@ -139,8 +135,7 @@ "bbox_lat_lon": "SRID=4326;POLYGON ((-180 -90, -180 90, 180 90, 180 -90, -180 -90))", "origin": "capabilities", "title": "node4", - "is_active": false, - "search_vector": "" + "is_active": false } }, { @@ -165,8 +160,7 @@ "abstract": "wfs2 abstract", "service_url": "", "service_contact": "1", - "metadata_contact": "1", - "search_vector": "" + "metadata_contact": "1" } }, { @@ -179,8 +173,7 @@ "bbox_lat_lon": "SRID=4326;POLYGON ((-180 -90, -180 90, 180 90, 180 -90, -180 -90))", "origin": "capabilities", "title": "wfs2-node1", - "abstract": "wfs2-node1", - "search_vector": "" + "abstract": "wfs2-node1" } } ] \ No newline at end of file diff --git a/mrmap/registry/fixtures/test_wfs_proxy.json b/mrmap/registry/fixtures/test_wfs_proxy.json index b3c323b8c..6c34c40e6 100644 --- a/mrmap/registry/fixtures/test_wfs_proxy.json +++ b/mrmap/registry/fixtures/test_wfs_proxy.json @@ -58,8 +58,7 @@ "title": "MapServer countires example", "service_url": "", "service_contact": "1", - "metadata_contact": "1", - "search_vector": "" + "metadata_contact": "1" } }, { @@ -70,8 +69,7 @@ "date_stamp": "2013-03-16T17:41:28+00:00", "identifier": "ms:Countries", "origin": "capabilities", - "title": "Countries", - "search_vector": "" + "title": "Countries" } }, { @@ -82,8 +80,7 @@ "date_stamp": "2013-03-16T17:41:28+00:00", "identifier": "ms:Rivers", "origin": "capabilities", - "title": "Rivers", - "search_vector": "" + "title": "Rivers" } }, { diff --git a/mrmap/registry/fixtures/test_wms.json b/mrmap/registry/fixtures/test_wms.json index 64f8e6fd1..1685390ad 100644 --- a/mrmap/registry/fixtures/test_wms.json +++ b/mrmap/registry/fixtures/test_wms.json @@ -185,8 +185,7 @@ [ "meteorology" ] - ], - "search_vector": "" + ] } }, { @@ -214,8 +213,7 @@ ], "reference_systems": [ 1 - ], - "search_vector": "" + ] } }, { @@ -232,8 +230,7 @@ "mptt_tree": 1, "mptt_depth": 1, "mptt_lft": 2, - "mptt_rgt": 9, - "search_vector": "" + "mptt_rgt": 9 } }, { @@ -250,8 +247,7 @@ "mptt_tree": 1, "mptt_depth": 2, "mptt_lft": 3, - "mptt_rgt": 4, - "search_vector": "" + "mptt_rgt": 4 } }, { @@ -268,8 +264,7 @@ "mptt_tree": 1, "mptt_depth": 2, "mptt_lft": 5, - "mptt_rgt": 6, - "search_vector": "" + "mptt_rgt": 6 } }, { @@ -286,8 +281,7 @@ "mptt_tree": 1, "mptt_depth": 2, "mptt_lft": 7, - "mptt_rgt": 8, - "search_vector": "" + "mptt_rgt": 8 } }, { @@ -304,8 +298,7 @@ "mptt_tree": 1, "mptt_depth": 1, "mptt_lft": 10, - "mptt_rgt": 11, - "search_vector": "" + "mptt_rgt": 11 } }, { @@ -322,8 +315,7 @@ "mptt_tree": 1, "mptt_depth": 1, "mptt_lft": 12, - "mptt_rgt": 15, - "search_vector": "" + "mptt_rgt": 15 } }, { @@ -341,8 +333,7 @@ "mptt_tree": 1, "mptt_depth": 2, "mptt_lft": 13, - "mptt_rgt": 14, - "search_vector": "" + "mptt_rgt": 14 } }, { @@ -372,8 +363,7 @@ "abstract": "wms2 abstract", "service_url": "", "service_contact": "2", - "metadata_contact": "2", - "search_vector": "" + "metadata_contact": "2" } }, { @@ -392,8 +382,7 @@ "mptt_tree": 2, "mptt_depth": 0, "mptt_lft": 1, - "mptt_rgt": 2, - "search_vector": "" + "mptt_rgt": 2 } }, { diff --git a/mrmap/tests/django/registry/tasks/tests_service.py b/mrmap/tests/django/registry/tasks/tests_service.py index b7f48c668..44f6c5940 100644 --- a/mrmap/tests/django/registry/tasks/tests_service.py +++ b/mrmap/tests/django/registry/tasks/tests_service.py @@ -104,6 +104,11 @@ def test_success_with_service_auth(self, mock_response): self.assertDictEqual(d1=result.result, d2=expected_result, msg="Task result does not match expection.") + self.assertEqual( + db_service.version, + "1.3.0" + ) + @override_settings(CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, CELERY_ALWAYS_EAGER=True, BROKER_BACKEND='memory')