Add some tests

Author: ridoo

…pload/handlers/common/metadata_storer.py geonode/resource/metadata_storer.pygeonode/upload/handlers/common/metadata_storer.py renamed to geonode/resource/metadata_storer.py geonode/upload/handlers/common/metadata_storer.py renamed to geonode/resource/metadata_storer.py

@@ -23,12 +23,13 @@
 from unittest.mock import patch
 
 from django.contrib.auth import get_user_model
+from django.test import override_settings
 
 from geonode.groups.models import GroupProfile
 from geonode.base.populate_test_data import create_models
 from geonode.tests.base import GeoNodeBaseTestSupport
 from geonode.resource.manager import ResourceManager
-from geonode.base.models import LinkedResource, ResourceBase
+from geonode.base.models import License, LinkedResource, ResourceBase
 from geonode.layers.models import Dataset
 from geonode.services.models import Service
 from geonode.documents.models import Document
@@ -108,6 +109,22 @@ def test_create(self):
         res = self.rm.create(new_uuid, resource_type=Dataset, defaults=dataset_defaults)
         self.assertEqual(res, Dataset.objects.get(uuid=new_uuid))
 
+    @override_settings(METADATA_STORERS=["geonode.resource.metadata_storer.store_metadata"])
+    def test_create_passing_custom_to_post_save(self):
+        license = License.objects.all().first()
+        public_group, _public_created = GroupProfile.objects.get_or_create(
+            slug="public_group", title="public_group", access="public"
+        )
+        dataset = self.rm.create(
+            None,
+            resource_type=Dataset,
+            defaults=dict(owner=self.user, title="test"),
+            custom=dict(group=public_group.pk, license=license),
+        )
+        self.assertIsNotNone(dataset.license)
+        self.assertIsNotNone(dataset.group)
+        self.assertEqual(public_group.pk, dataset.group.pk)
+
     def test_update(self):
         dt = create_single_dataset("test_update_dataset")
         vals = {"name": "new_name_test_update_dataset"}

geonode/resource/tests.py

@@ -2221,7 +2221,7 @@ def get_geonode_catalogue_service():
 """
 METADATA_STORERS = [
     # "geonode.resource.regions_storer.spatial_predicate_region_assignor",
-    # "geonode.upload.handlers.common.metadata_storer.store_metadata",
+    # "geonode.resource.metadata_storer.store_metadata",
 ]
 
 

geonode/settings.py

@@ -338,7 +338,6 @@ def test_import_shapefile(self):
     @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data"})
     @override_settings(GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data")
     def test_import_shapefile_overwrite(self):
-
         self._cleanup_layers(name="air_Runways")
         payload = {_filename: open(_file, "rb") for _filename, _file in self.valid_shp.items()}
         payload["action"] = "upload"
@@ -353,6 +352,21 @@ def test_import_shapefile_overwrite(self):
         )
         self._cleanup_layers(name="air_Runways")
 
+    @override_settings(
+        METADATA_STORERS=["geonode.resource.metadata_storer.store_metadata"],
+        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data",
+    )
+    def test_import_with_custom_payload(self):
+        self._cleanup_layers(name="air_Runways")
+        payload = {_filename: open(_file, "rb") for _filename, _file in self.valid_shp.items()}
+        payload["action"] = "upload"
+        abstract = "this is a test import"
+        payload["custom"] = {"abstract": abstract}
+        initial_name = "air_Runways"
+        resource = self._assertimport(payload, initial_name, keep_resource=True)
+        self.assertEquals(abstract, resource["abstract"])
+        self._cleanup_layers(name="air_Runways")
+
 
 class ImporterRasterImportTest(BaseImporterEndToEndTest):
     @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data"})