[Fixes #233] fix test

GeoNode · May 2, 2024 · c2aa3f1 · c2aa3f1
1 parent 16cd24c
commit c2aa3f1
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/importer/tests/end2end/test_end2end.py b/importer/tests/end2end/test_end2end.py
@@ -132,49 +132,51 @@ def test_import_geopackage(self):
         if layer:
             self.cat.delete(layer)
 
-    @override_settings(ASYNC_SIGNALS=False)
     @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_geopackage_with_no_crs_table(self):
-        layer = self.cat.get_layer("geonode:mattia_test")
+    def test_import_gpkg_overwrite(self):
+        prev_dataset = create_single_dataset(name="stazioni_metropolitana")
+
+        layer = self.cat.get_layer("geonode:stazioni_metropolitana")
         if layer:
             self.cat.delete(layer)
         payload = {
-            "base_file": open(self.no_crs_gpkg, "rb"),
+            "base_file": open(self.valid_gkpg, "rb"),
         }
-        initial_name = "mattia_test"
-        with self.assertLogs(level="ERROR") as _log:
-            self._assertimport(payload, initial_name)
-
-        self.assertIn(
-            "The following layer layer_styles does not have a Coordinate Reference System (CRS) and will be skipped.",
-            [x.message for x in _log.records],
+        initial_name = "stazioni_metropolitana"
+        payload["overwrite_existing_layer"] = True
+        self._assertimport(
+            payload, initial_name, overwrite=True, last_update=prev_dataset.last_updated
         )
-        layer = self.cat.get_layer("geonode:mattia_test")
+        layer = self.cat.get_layer("geonode:stazioni_metropolitana")
         if layer:
             self.cat.delete(layer)
 
+
+class ImporterNoCRSImportTest(BaseImporterEndToEndTest):
+    @override_settings(ASYNC_SIGNALS=False)
     @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_gpkg_overwrite(self):
-        prev_dataset = create_single_dataset(name="stazioni_metropolitana")
-
-        layer = self.cat.get_layer("geonode:stazioni_metropolitana")
+    def test_import_geopackage_with_no_crs_table(self):
+        layer = self.cat.get_layer("geonode:mattia_test")
         if layer:
             self.cat.delete(layer)
         payload = {
-            "base_file": open(self.valid_gkpg, "rb"),
+            "base_file": open(self.no_crs_gpkg, "rb"),
         }
-        initial_name = "stazioni_metropolitana"
-        payload["overwrite_existing_layer"] = True
-        self._assertimport(
-            payload, initial_name, overwrite=True, last_update=prev_dataset.last_updated
+        initial_name = "mattia_test"
+        with self.assertLogs(level="ERROR") as _log:
+            self._assertimport(payload, initial_name)
+
+        self.assertIn(
+            "The following layer layer_styles does not have a Coordinate Reference System (CRS) and will be skipped.",
+            [x.message for x in _log.records],
         )
-        layer = self.cat.get_layer("geonode:stazioni_metropolitana")
+        layer = self.cat.get_layer("geonode:mattia_test")
         if layer:
             self.cat.delete(layer)