c2cgeoportal-admin 2.5.0.100__py3-none-any.whl → 2.9rc44__py3-none-any.whl

tests/test_layers_vectortiles.py

@@ -12,15 +12,10 @@ 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="server_{}".format(i)) for i in range(0, 4)]
-    for i, server in enumerate(servers):
-        server.url = "http://wms.geo.admin.ch_{}".format(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 = "layer_vectortiles_{}".format(i)
+        name = f"layer_vectortiles_{i}"
         layer = LayerVectorTiles(name=name)
         layer.layer = name
         layer.public = 1 == i % 2
@@ -28,17 +23,16 @@ def layer_vectortiles_test_data(dbsession, transact):
         layer.xyz = "https://vectortiles-staging.geoportail.lu/styles/roadmap/{z}/{x}/{y}.png"
         return layer
 
-    datas = factory_build_layers(layer_builder, dbsession)
-    datas["default"] = get_test_default_layers(dbsession, server)
+    data = factory_build_layers(layer_builder, dbsession)
+    data["default"] = get_test_default_layers(dbsession, None)
 
     dbsession.flush()
 
-    yield datas
+    yield data
 
 
 @pytest.mark.usefixtures("layer_vectortiles_test_data", "test_app")
 class TestLayerVectortiles(AbstractViewsTests):
-
     _prefix = "/admin/layers_vectortiles"
 
     def test_index_rendering(self, test_app):
@@ -85,10 +79,8 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert "" == self.get_first_field_named(form, "style").value
         assert "" == self.get_first_field_named(form, "xyz").value
 
-    @pytest.mark.skip(reason="Not working now")
     def test_grid_search(self, test_app):
-        # check search on name
-        self.check_search(test_app, "layer_vectortiles_1", total=1)
+        self.check_search(test_app, "layer_vectortiles_10", total=1)
 
     def test_base_edit(self, test_app, layer_vectortiles_test_data):
         layer = layer_vectortiles_test_data["layers"][10]
@@ -108,6 +100,8 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert form["public"].checked
 
     def test_edit(self, test_app, layer_vectortiles_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         layer = layer_vectortiles_test_data["layers"][0]
 
         form = self.get_item(test_app, layer.id).form
@@ -124,11 +118,11 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert str(layer.xyz or "") == form["xyz"].value
 
         interfaces = layer_vectortiles_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_vectortiles_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -148,7 +142,7 @@ class TestLayerVectortiles(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
         dbsession.expire(layer)
@@ -157,13 +151,19 @@ class TestLayerVectortiles(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        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_vectortiles"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_submit_new(self, dbsession, test_app, layer_vectortiles_test_data):
-        from c2cgeoportal_commons.models.main import LayerVectorTiles
+        from c2cgeoportal_commons.models.main import LayerVectorTiles, Log, LogAction
 
         resp = test_app.post(
             "/admin/layers_vectortiles/new",
@@ -182,12 +182,20 @@ class TestLayerVectortiles(AbstractViewsTests):
             r"http://localhost/admin/layers_vectortiles/(.*)\?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_vectortiles"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
+
     def test_duplicate(self, layer_vectortiles_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerVectorTiles
 
         layer = layer_vectortiles_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_vectortiles/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_vectortiles/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -200,7 +208,7 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert str(layer.style or "") == form["style"].value
         assert str(layer.xyz or "") == form["xyz"].value
         interfaces = layer_vectortiles_test_data["interfaces"]
-        assert set((interfaces[3].id, interfaces[1].id)) == set(i.id for i in layer.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")
@@ -216,12 +224,20 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert layer_vectortiles_test_data["layers"][3].metadatas[1].name == layer.metadatas[1].name
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerVectorTiles, Layer, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerVectorTiles, Log, LogAction, TreeItem
+
+        layer = dbsession.query(LayerVectorTiles).first()
 
-        layer_id = dbsession.query(LayerVectorTiles.id).first().id
+        test_app.delete(f"/admin/layers_vectortiles/{layer.id}", status=200)
 
-        test_app.delete("/admin/layers_vectortiles/{}".format(layer_id), status=200)
+        assert dbsession.query(LayerVectorTiles).get(layer.id) is None
+        assert dbsession.query(Layer).get(layer.id) is None
+        assert dbsession.query(TreeItem).get(layer.id) is None
 
-        assert dbsession.query(LayerVectorTiles).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_vectortiles"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"

tests/test_layers_wms.py

@@ -3,10 +3,8 @@
 import re
 
 import pytest
-from selenium.webdriver.common.by import By
 
-from . import AbstractViewsTests, factory_build_layers, get_test_default_layers, skip_if_ci
-from .selenium.page import IndexPage
+from . import AbstractViewsTests, factory_build_layers, get_test_default_layers
 
 
 @pytest.fixture(scope="function")
@@ -16,32 +14,31 @@ def layer_wms_test_data(dbsession, transact):
 
     from c2cgeoportal_commons.models.main import LayerWMS, OGCServer
 
-    servers = [OGCServer(name="server_{}".format(i)) for i in range(0, 4)]
+    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
     for i, server in enumerate(servers):
-        server.url = "http://wms.geo.admin.ch_{}".format(i)
+        server.url = f"http://wms.geo.admin.ch_{i}"
         server.image_type = "image/jpeg" if i % 2 == 0 else "image/png"
 
     def layer_builder(i):
-        layer = LayerWMS(name="layer_wms_{}".format(i))
-        layer.layer = "layer_{}".format(i)
+        layer = LayerWMS(name=f"layer_wms_{i}")
+        layer.layer = f"layer_{i}"
         layer.public = 1 == i % 2
-        layer.geo_table = "geotable_{}".format(i)
+        layer.geo_table = f"geotable_{i}"
         layer.ogc_server = servers[i % 4]
         layer.style = "décontrasté"
         return layer
 
-    datas = factory_build_layers(layer_builder, dbsession)
-    datas["servers"] = servers
-    datas["default"] = get_test_default_layers(dbsession, servers[1])
+    data = factory_build_layers(layer_builder, dbsession)
+    data["servers"] = servers
+    data["default"] = get_test_default_layers(dbsession, servers[1])
 
     dbsession.flush()
 
-    yield datas
+    yield data
 
 
 @pytest.mark.usefixtures("layer_wms_test_data", "test_app")
 class TestLayerWMSViews(AbstractViewsTests):
-
     _prefix = "/admin/layers_wms"
 
     def test_index_rendering(self, test_app):
@@ -57,11 +54,13 @@ class TestLayerWMSViews(AbstractViewsTests):
             ("public", "Public"),
             ("geo_table", "Geo table"),
             ("exclude_properties", "Exclude properties"),
+            ("ogc_server", "OGC server"),
             ("layer", "WMS layer name"),
             ("style", "Style"),
+            ("valid", "Valid"),
+            ("invalid_reason", "Reason why I am not valid"),
             ("time_mode", "Time mode"),
             ("time_widget", "Time widget"),
-            ("ogc_server", "OGC server"),
             ("dimensions", "Dimensions", "false"),
             ("interfaces", "Interfaces"),
             ("restrictionareas", "Restriction areas", "false"),
@@ -154,6 +153,8 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert form["public"].checked
 
     def test_edit(self, test_app, layer_wms_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         layer = layer_wms_test_data["layers"][0]
 
         form = self.get_item(test_app, layer.id).form
@@ -173,11 +174,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_widget) == form["time_widget"].value
 
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -200,7 +201,7 @@ class TestLayerWMSViews(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
         dbsession.expire(layer)
@@ -209,13 +210,19 @@ class TestLayerWMSViews(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        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_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_submit_new(self, dbsession, test_app, layer_wms_test_data):
-        from c2cgeoportal_commons.models.main import LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, Log, LogAction
 
         resp = test_app.post(
             "/admin/layers_wms/new",
@@ -239,12 +246,20 @@ class TestLayerWMSViews(AbstractViewsTests):
             r"http://localhost/admin/layers_wms/(.*)\?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_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
+
     def test_duplicate(self, layer_wms_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMS
 
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -260,11 +275,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_mode) == form["time_mode"].value
         assert str(layer.time_widget) == form["time_widget"].value
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[3].id, interfaces[1].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[3].id, interfaces[1].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[3].id, ras[0].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[3].id, ras[0].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         self._check_dimensions(resp.html, layer.dimensions, duplicated=True)
@@ -282,19 +297,16 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert layer_wms_test_data["layers"][3].metadatas[1].name == layer.metadatas[1].name
 
     def test_convert_common_fields_copied(self, layer_wms_test_data, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS, LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, LayerWMTS
 
         layer = layer_wms_test_data["layers"][3]
 
         assert 0 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 1 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         assert 1 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 0 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
@@ -328,51 +340,53 @@ class TestLayerWMSViews(AbstractViewsTests):
     def test_convert_image_type_from_ogcserver(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/png" == resp.form["image_type"].value
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/jpeg" == resp.form["image_type"].value
 
     def test_convert_without_wmts_defaults(self, test_app, layer_wms_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS
+        from c2cgeoportal_commons.models.main import LayerWMTS, Log, LogAction
 
         dbsession.delete(LayerWMTS.get_default(dbsession))
         layer = layer_wms_test_data["layers"][3]
-        test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.CONVERT_TO_WMTS
+        assert log.element_type == "layer_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(layer.name))
+        self._check_submission_problem(resp, f"{layer.name} is already used.")
 
     def test_unicity_validator_does_not_matter_amongst_cousin(self, layer_wms_test_data, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS, LayerGroup
+        from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS
 
         assert 1 == dbsession.query(LayerGroup).filter(LayerGroup.name == "layer_group_0").count()
 
         assert dbsession.query(LayerWMS).filter(LayerWMS.name == "layer_group_0").one_or_none() is None
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         self.set_first_field_named(resp.form, "name", "layer_group_0")
         resp = resp.form.submit("submit")
 
@@ -382,18 +396,25 @@ class TestLayerWMSViews(AbstractViewsTests):
         # assert str(layer.id) == re.match('http://localhost/admin/layers_wms/(.*)', resp.location).group(1)
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS, Layer, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerWMS, Log, LogAction, TreeItem
+
+        layer = dbsession.query(LayerWMS).first()
 
-        layer_id = dbsession.query(LayerWMS.id).first().id
+        test_app.delete(f"/admin/layers_wms/{layer.id}", status=200)
 
-        test_app.delete("/admin/layers_wms/{}".format(layer_id), status=200)
+        assert dbsession.query(LayerWMS).get(layer.id) is None
+        assert dbsession.query(Layer).get(layer.id) is None
+        assert dbsession.query(TreeItem).get(layer.id) is None
 
-        assert dbsession.query(LayerWMS).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_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
-    @pytest.mark.skip(reason="Contraint has to be added at model side, alambiced")
-    def test_submit_new_no_layer_name(self, test_app):
+    def test_submit_new_no_layer_name(self, test_app, layer_wms_test_data, dbsession):
         resp = test_app.post(
             "/admin/layers_wms/new",
             {
@@ -418,31 +439,5 @@ class TestLayerWMSViews(AbstractViewsTests):
             "Errors have been highlighted below" == resp.html.select_one('div[class="error-msg-detail"]').text
         )
         assert ["WMS layer name"] == sorted(
-            [(x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")]
-        )
-
-
-@skip_if_ci
-@pytest.mark.selenium
-@pytest.mark.usefixtures("selenium", "selenium_app", "layer_wms_test_data")
-class TestLayerWMSSelenium:
-
-    _prefix = "/admin/layers_wms"
-
-    def test_index(self, selenium, selenium_app, layer_wms_test_data):
-        selenium.get(selenium_app + self._prefix)
-
-        layer = layer_wms_test_data["layers"][5]
-        index_page = IndexPage(selenium)
-        index_page.select_language("en")
-        index_page.check_pagination_info("Showing 1 to 25 of 26 rows", 10)
-        index_page.select_page_size(10)
-        index_page.check_pagination_info("Showing 1 to 10 of 26 rows", 10)
-        index_page.wait_jquery_to_be_active()
-
-        el = index_page.find_element(
-            By.XPATH, '//td[contains(text(),"{}")]'.format(layer.geo_table), timeout=5
+            (x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")
         )
-        index_page.dbl_click(el)
-
-        assert selenium.current_url.endswith("/admin/layers_wms/{}".format(layer.id))

tests/test_layers_wmts.py

@@ -19,27 +19,26 @@ def layer_wmts_test_data(dbsession, transact):
     server.image_type = "image/png"
 
     def layer_builder(i):
-        name = "layer_wmts_{}".format(i)
+        name = f"layer_wmts_{i}"
         layer = LayerWMTS(name=name)
         layer.layer = name
-        layer.url = "https:///wms.geo.admin.ch_{}.org?service=wms&request=GetCapabilities".format(i)
+        layer.url = f"https:///wms.geo.admin.ch_{i}.org?service=wms&request=GetCapabilities"
         layer.public = 1 == i % 2
-        layer.geo_table = "geotable_{}".format(i)
+        layer.geo_table = f"geotable_{i}"
         layer.image_type = "image/jpeg"
         layer.style = "décontrasté"
         return layer
 
-    datas = factory_build_layers(layer_builder, dbsession)
-    datas["default"] = get_test_default_layers(dbsession, server)
+    data = factory_build_layers(layer_builder, dbsession)
+    data["default"] = get_test_default_layers(dbsession, server)
 
     dbsession.flush()
 
-    yield datas
+    yield data
 
 
 @pytest.mark.usefixtures("layer_wmts_test_data", "test_app")
 class TestLayerWMTS(AbstractViewsTests):
-
     _prefix = "/admin/layers_wmts"
 
     def test_index_rendering(self, test_app):
@@ -102,6 +101,8 @@ class TestLayerWMTS(AbstractViewsTests):
         assert default_wmts.matrix_set == self.get_first_field_named(form, "matrix_set").value
 
     def test_edit(self, test_app, layer_wmts_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         layer = layer_wmts_test_data["layers"][0]
 
         form = self.get_item(test_app, layer.id).form
@@ -121,11 +122,11 @@ class TestLayerWMTS(AbstractViewsTests):
         assert str(layer.image_type or "") == form["image_type"].value
 
         interfaces = layer_wmts_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wmts_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -148,7 +149,7 @@ class TestLayerWMTS(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
         dbsession.expire(layer)
@@ -157,17 +158,23 @@ class TestLayerWMTS(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        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_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_duplicate(self, layer_wmts_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMTS
 
         layer = layer_wmts_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_wmts/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wmts/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -192,36 +199,42 @@ class TestLayerWMTS(AbstractViewsTests):
         ).group(1)
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS, Layer, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerWMTS, Log, LogAction, TreeItem
 
-        layer_id = dbsession.query(LayerWMTS.id).first().id
+        layer = dbsession.query(LayerWMTS).first()
 
-        test_app.delete("/admin/layers_wmts/{}".format(layer_id), status=200)
+        test_app.delete(f"/admin/layers_wmts/{layer.id}", status=200)
 
-        assert dbsession.query(LayerWMTS).get(layer_id) is None
-        assert dbsession.query(Layer).get(layer_id) is None
-        assert dbsession.query(TreeItem).get(layer_id) is None
+        assert dbsession.query(LayerWMTS).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_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, layer_wmts_test_data, test_app):
         layer = layer_wmts_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wmts/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wmts/{layer.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(layer.name))
+        self._check_submission_problem(resp, f"{layer.name} is already used.")
 
     def test_convert_common_fields_copied(self, layer_wmts_test_data, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS, LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, LayerWMTS
 
         layer = layer_wmts_test_data["layers"][3]
 
         assert 0 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
         assert 1 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
 
-        resp = test_app.post("/admin/layers_wmts/{}/convert_to_wms".format(layer.id), status=200)
-        assert (
-            "http://localhost/admin/layers_wms/{}?msg_col=submit_ok".format(layer.id) == resp.json["redirect"]
-        )
+        resp = test_app.post(f"/admin/layers_wmts/{layer.id}/convert_to_wms", status=200)
+        assert f"http://localhost/admin/layers_wms/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         assert 1 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
         assert 0 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
@@ -252,8 +265,16 @@ class TestLayerWMTS(AbstractViewsTests):
         )
 
     def test_convert_without_wms_defaults(self, test_app, layer_wmts_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, Log, LogAction
 
         dbsession.delete(LayerWMS.get_default(dbsession))
         layer = layer_wmts_test_data["layers"][3]
-        test_app.post("/admin/layers_wmts/{}/convert_to_wms".format(layer.id), status=200)
+        test_app.post(f"/admin/layers_wmts/{layer.id}/convert_to_wms", status=200)
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.CONVERT_TO_WMS
+        assert log.element_type == "layer_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"