c2cgeoportal-admin 2.8.1.181__py3-none-any.whl → 2.9rc2__py3-none-any.whl

tests/test_layers_cog.py

@@ -0,0 +1,243 @@
+# pylint: disable=no-self-use
+
+import re
+from typing import Any
+
+import pytest
+from sqlalchemy.orm import Session, SessionTransaction
+from webtest import TestApp as WebTestApp  # Avoid warning with pytest
+
+from . import AbstractViewsTests, factory_build_layers, get_test_default_layers
+
+
+@pytest.fixture(scope="function")
+@pytest.mark.usefixtures("dbsession", "transact")
+def layer_cog_test_data(dbsession: Session, transact: SessionTransaction) -> dict[str, Any]:
+    del transact
+
+    from c2cgeoportal_commons.models.main import LayerCOG
+
+    def layer_builder(i: int) -> LayerCOG:
+        name = f"layer_cog_{i}"
+        layer = LayerCOG(name=name)
+        layer.public = 1 == i % 2
+        layer.url = "https://example.com/image.tiff"
+        return layer
+
+    data = factory_build_layers(layer_builder, dbsession, add_dimension=False)
+    data["default"] = get_test_default_layers(dbsession, None)
+
+    dbsession.flush()
+
+    yield data
+
+
+@pytest.mark.usefixtures("layer_cog_test_data", "test_app")
+class TestLayerVectortiles(AbstractViewsTests):
+    _prefix = "/admin/layers_cog"
+
+    def test_index_rendering(self, test_app: WebTestApp) -> None:
+        resp = self.get(test_app)
+
+        self.check_left_menu(resp, "COG Layers")
+
+        expected = [
+            ("actions", "", "false"),
+            ("id", "id", "true"),
+            ("name", "Name"),
+            ("description", "Description"),
+            ("public", "Public"),
+            ("geo_table", "Geo table"),
+            ("exclude_properties", "Exclude properties"),
+            ("url", "URL"),
+            ("interfaces", "Interfaces"),
+            ("restrictionareas", "Restriction areas", "false"),
+            ("parents_relation", "Parents", "false"),
+            ("metadatas", "Metadatas", "false"),
+        ]
+        self.check_grid_headers(resp, expected)
+
+    def test_grid_complex_column_val(self, test_app: WebTestApp, layer_cog_test_data: dict[str, Any]) -> None:
+        json = self.check_search(test_app, search="layer", sort="name")
+
+        row = json["rows"][0]
+        layer = layer_cog_test_data["layers"][0]
+
+        assert layer.name == row["name"]
+        assert layer.id == int(row["_id_"])
+
+    def test_new(self, test_app: WebTestApp, layer_cog_test_data: dict[str, Any], dbsession: Session) -> None:
+        default_cog = layer_cog_test_data["default"]["cog"]
+        default_cog.name = "so can I not be found"
+        dbsession.flush()
+
+        form = self.get_item(test_app, "new").form
+
+        assert "" == self.get_first_field_named(form, "name").value
+        assert "" == self.get_first_field_named(form, "id").value
+        assert "" == self.get_first_field_named(form, "url").value
+
+    def test_grid_search(self, test_app: WebTestApp) -> None:
+        self.check_search(test_app, "layer_cog_10", total=1)
+
+    def test_base_edit(self, test_app: WebTestApp, layer_cog_test_data: dict[str, Any]) -> None:
+        layer = layer_cog_test_data["layers"][10]
+
+        form = self.get_item(test_app, layer.id).form
+
+        assert "layer_cog_10" == self.get_first_field_named(form, "name").value
+        assert "" == self.get_first_field_named(form, "description").value
+
+    def test_public_checkbox_edit(self, test_app: WebTestApp, layer_cog_test_data: dict[str, Any]) -> None:
+        layer = layer_cog_test_data["layers"][10]
+        form = self.get_item(test_app, layer.id).form
+        assert not form["public"].checked
+
+        layer = layer_cog_test_data["layers"][11]
+        form = self.get_item(test_app, layer.id).form
+        assert form["public"].checked
+
+    def test_edit(
+        self, test_app: WebTestApp, layer_cog_test_data: dict[str, Any], dbsession: Session
+    ) -> None:
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
+        layer = layer_cog_test_data["layers"][0]
+
+        form = self.get_item(test_app, layer.id).form
+
+        assert str(layer.id) == self.get_first_field_named(form, "id").value
+        assert "hidden" == self.get_first_field_named(form, "id").attrs["type"]
+        assert layer.name == self.get_first_field_named(form, "name").value
+        assert str(layer.description or "") == self.get_first_field_named(form, "description").value
+        assert layer.public is False
+        assert layer.public == form["public"].checked
+        assert str(layer.geo_table or "") == form["geo_table"].value
+        assert str(layer.exclude_properties or "") == form["exclude_properties"].value
+        # assert str(layer.url or "") == form["url"].value
+
+        interfaces = layer_cog_test_data["interfaces"]
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
+        self._check_interfaces(form, interfaces, layer)
+
+        ras = layer_cog_test_data["restrictionareas"]
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
+        self._check_restrictionsareas(form, ras, layer)
+
+        new_values = {
+            "name": "new_name",
+            "description": "new description",
+            "public": True,
+            "geo_table": "new_geo_table",
+            "exclude_properties": "property1,property2",
+            "url": "https://example.com/image.tiff",
+        }
+
+        for key, value in new_values.items():
+            self.set_first_field_named(form, key, value)
+        form["interfaces"] = [interfaces[1].id, interfaces[3].id]
+        form["restrictionareas"] = [ras[1].id, ras[3].id]
+
+        resp = form.submit("submit")
+        assert str(layer.id) == re.match(
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
+        ).group(1)
+
+        dbsession.expire(layer)
+        for key, value in new_values.items():
+            if isinstance(value, bool):
+                assert value == getattr(layer, key)
+            else:
+                assert str(value or "") == str(getattr(layer, key) or "")
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in layer.interfaces}
+        assert {ras[1].id, ras[3].id} == {ra.id for ra in layer.restrictionareas}
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "layer_cog"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
+
+    def test_submit_new(
+        self, dbsession: Session, test_app: WebTestApp, layer_cog_test_data: dict[str, Any]
+    ) -> None:
+        from c2cgeoportal_commons.models.main import LayerCOG, Log, LogAction
+
+        resp = test_app.post(
+            "/admin/layers_cog/new",
+            {
+                "name": "new_name",
+                "description": "new description",
+                "public": True,
+                "url": "https://example.com/image.tiff",
+            },
+            status=302,
+        )
+
+        layer = dbsession.query(LayerCOG).filter(LayerCOG.name == "new_name").one()
+        assert str(layer.id) == re.match(
+            r"http://localhost/admin/layers_cog/(.*)\?msg_col=submit_ok", resp.location
+        ).group(1)
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "layer_cog"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
+
+    def test_duplicate(
+        self, layer_cog_test_data: dict[str, Any], test_app: WebTestApp, dbsession: Session
+    ) -> None:
+        from c2cgeoportal_commons.models.main import LayerCOG
+
+        layer = layer_cog_test_data["layers"][3]
+
+        resp = test_app.get(f"/admin/layers_cog/{layer.id}/duplicate", status=200)
+        form = resp.form
+
+        assert "" == self.get_first_field_named(form, "id").value
+        assert layer.name == self.get_first_field_named(form, "name").value
+        assert str(layer.description or "") == self.get_first_field_named(form, "description").value
+        assert layer.public is True
+        assert layer.public == form["public"].checked
+        assert str(layer.geo_table or "") == form["geo_table"].value
+        assert str(layer.exclude_properties or "") == form["exclude_properties"].value
+        # assert str(layer.url or "") == form["url"].value
+        interfaces = layer_cog_test_data["interfaces"]
+        assert {interfaces[3].id, interfaces[1].id} == {i.id for i in layer.interfaces}
+        self._check_interfaces(form, interfaces, layer)
+
+        self.set_first_field_named(form, "name", "clone")
+        resp = form.submit("submit")
+
+        layer = dbsession.query(LayerCOG).filter(LayerCOG.name == "clone").one()
+        assert str(layer.id) == re.match(
+            r"http://localhost/admin/layers_cog/(.*)\?msg_col=submit_ok", resp.location
+        ).group(1)
+
+        assert layer.id == layer.metadatas[0].item_id
+        assert layer_cog_test_data["layers"][3].metadatas[0].name == layer.metadatas[0].name
+        assert layer_cog_test_data["layers"][3].metadatas[1].name == layer.metadatas[1].name
+
+    def test_delete(self, test_app: WebTestApp, dbsession: Session) -> None:
+        from c2cgeoportal_commons.models.main import Layer, LayerCOG, Log, LogAction, TreeItem
+
+        layer = dbsession.query(LayerCOG).first()
+
+        test_app.delete(f"/admin/layers_cog/{layer.id}", status=200)
+
+        assert dbsession.query(LayerCOG).get(layer.id) is None
+        assert dbsession.query(Layer).get(layer.id) is None
+        assert dbsession.query(TreeItem).get(layer.id) is None
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "layer_cog"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"

tests/test_layers_vectortiles.py

@@ -12,12 +12,7 @@ from . import AbstractViewsTests, factory_build_layers, get_test_default_layers
 def layer_vectortiles_test_data(dbsession, transact):
     del transact
 
-    from c2cgeoportal_commons.models.main import LayerVectorTiles, OGCServer
-
-    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
-    for i, server in enumerate(servers):
-        server.url = f"http://wms.geo.admin.ch_{i}"
-        server.image_type = "image/jpeg" if i % 2 == 0 else "image/png"
+    from c2cgeoportal_commons.models.main import LayerVectorTiles
 
     def layer_builder(i):
         name = f"layer_vectortiles_{i}"
@@ -29,7 +24,7 @@ def layer_vectortiles_test_data(dbsession, transact):
         return layer
 
     data = factory_build_layers(layer_builder, dbsession)
-    data["default"] = get_test_default_layers(dbsession, server)
+    data["default"] = get_test_default_layers(dbsession, None)
 
     dbsession.flush()
 

tests/{test_lingua_extractor_config.py → test_lingva_extractor_config.py}

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, Camptocamp SA
+# Copyright (c) 2022-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ import pytest
 import yaml
 from c2c.template.config import config as configuration
 
-from c2cgeoportal_admin.lib.lingua_extractor import GeomapfishConfigExtractor
+from c2cgeoportal_admin.lib.lingva_extractor import GeomapfishConfigExtractor
 
 GMF_CONFIG = """
 vars:
@@ -50,7 +50,7 @@ vars:
 
 class TestGeomapfishConfigExtractor:
     @patch(
-        "c2cgeoportal_admin.lib.lingua_extractor.open",
+        "c2cgeoportal_admin.lib.lingva_extractor.open",
         mock_open(read_data=GMF_CONFIG),
     )
     def test_extract_config(self):

tests/test_logs.py

@@ -1,10 +1,9 @@
 # pylint: disable=no-self-use,unsubscriptable-object
 
 import datetime
+from datetime import timezone
 
 import pytest
-import pytz
-from pyramid.testing import DummyRequest
 
 from . import AbstractViewsTests
 
@@ -22,7 +21,7 @@ def logs_test_data(dbsession, transact):
     logs = []
     for i in range(0, 5):
         log = MainLog(
-            date=datetime.datetime.now(pytz.utc),
+            date=datetime.datetime.now(timezone.utc),
             action=[LogAction.INSERT, LogAction.UPDATE, LogAction.DELETE][i % 3],
             element_type="role",
             element_id=i,
@@ -34,7 +33,7 @@ def logs_test_data(dbsession, transact):
         logs.append(log)
 
         log = StaticLog(
-            date=datetime.datetime.now(pytz.utc),
+            date=datetime.datetime.now(timezone.utc),
             action=[LogAction.INSERT, LogAction.UPDATE, LogAction.DELETE][i % 3],
             element_type="user",
             element_id=i,

tests/test_oauth2_clients.py

@@ -3,6 +3,7 @@
 import re
 from uuid import uuid4
 
+import pyramid.httpexceptions
 import pytest
 from pyramid.testing import DummyRequest
 
@@ -181,5 +182,5 @@ class TestOAuth2Client(TestTreeGroup):
         from c2cgeoportal_admin.views.oauth2_clients import OAuth2ClientViews
 
         request = DummyRequest(dbsession=dbsession, params={"offset": 0, "limit": 10})
-        info = OAuth2ClientViews(request).grid()
-        assert info.status_int == 500, "Expected 500 status when db error"
+        with pytest.raises(pyramid.httpexceptions.HTTPInternalServerError):
+            OAuth2ClientViews(request).grid()

tests/test_role.py

@@ -3,6 +3,7 @@
 import json
 import re
 
+import pyramid.httpexceptions
 import pytest
 from geoalchemy2.shape import from_shape, to_shape
 from pyramid.testing import DummyRequest
@@ -341,5 +342,5 @@ class TestRole(TestTreeGroup):
         from c2cgeoportal_admin.views.roles import RoleViews
 
         request = DummyRequest(dbsession=dbsession, params={"offset": 0, "limit": 10})
-        info = RoleViews(request).grid()
-        assert info.status_int == 500, "Expected 500 status when db error"
+        with pytest.raises(pyramid.httpexceptions.HTTPInternalServerError):
+            RoleViews(request).grid()

tests/test_user.py

@@ -4,6 +4,7 @@ import email
 import re
 from unittest.mock import MagicMock, patch
 
+import pyramid.httpexceptions
 import pytest
 from pyramid.testing import DummyRequest
 
@@ -59,6 +60,7 @@ class TestUser(AbstractViewsTests):
             ("actions", "", "false"),
             ("id", "id", "true"),
             ("username", "Username"),
+            ("display_name", "Display name", "true"),
             ("email", "Email"),
             ("last_login", "Last login"),
             ("expire_on", "Expiration date"),
@@ -165,6 +167,7 @@ class TestUser(AbstractViewsTests):
                 ("item_type", "user"),
                 ("id", user.id),
                 ("username", "new_name_withéàô"),
+                ("display_name", "New name withéàô"),
                 ("email", "new_mail@valid.net"),
                 ("settings_role_id", roles[2].id),
                 ("__start__", "roles:sequence"),
@@ -270,6 +273,7 @@ class TestUser(AbstractViewsTests):
                 ("item_type", "user"),
                 ("id", ""),
                 ("username", "new_user"),
+                ("display_name", "New user"),
                 ("email", "valid@email.net"),
                 ("settings_role_id", roles[2].id),
             ),
@@ -283,6 +287,7 @@ class TestUser(AbstractViewsTests):
         ).group(1)
 
         assert user.username == "new_user"
+        assert user.display_name == "New user"
         assert user.email == "valid@email.net"
         assert user.settings_role_id == roles[2].id
         assert user.password is not None and len(user.password)
@@ -314,6 +319,7 @@ class TestUser(AbstractViewsTests):
                 "item_type": "user",
                 "id": "",
                 "username": "invalid_email",
+                "display_name": "Invalid email",
                 "email": "new_mail",
                 "role_name": "secretary_2",
                 "is_password_changed": "false",
@@ -329,8 +335,8 @@ class TestUser(AbstractViewsTests):
         from c2cgeoportal_admin.views.users import UserViews
 
         request = DummyRequest(dbsession=dbsession, params={"offset": 0, "limit": 10})
-        info = UserViews(request).grid()
-        assert info.status_int == 500, "Expected 500 status when db error"
+        with pytest.raises(pyramid.httpexceptions.HTTPInternalServerError):
+            UserViews(request).grid()
 
     def test_grid_settings_role_none(self, dbsession, test_app):
         """

c2cgeoportal_admin-2.8.1.181.dist-info/entry_points.txt

@@ -1,6 +0,0 @@
-[lingua.extractors]
-geomapfish-admin-config = c2cgeoportal_admin.lib.lingua_extractor:GeomapfishConfigExtractor
-
-[paste.app_factory]
-main = c2cgeoportal_admin:main
-