c2cgeoportal-admin 2.5.0.100__py3-none-any.whl → 2.7.1.156__py3-none-any.whl

tests/test_layers_wmts.py

@@ -19,22 +19,22 @@ 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")
@@ -121,11 +121,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 +148,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 +157,15 @@ 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}
 
     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,11 +190,11 @@ 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, TreeItem
 
         layer_id = dbsession.query(LayerWMTS.id).first().id
 
-        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
@@ -204,24 +202,22 @@ class TestLayerWMTS(AbstractViewsTests):
 
     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()
@@ -256,4 +252,4 @@ class TestLayerWMTS(AbstractViewsTests):
 
         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)

tests/test_layertree.py

@@ -3,10 +3,8 @@
 from unittest.mock import patch
 
 import pytest
-from selenium.common.exceptions import NoSuchElementException
 
-from . import AbstractViewsTests, skip_if_ci
-from .selenium.page import LayertreePage
+from . import AbstractViewsTests
 
 
 @pytest.fixture(scope="function")
@@ -15,6 +13,7 @@ def layertree_test_data(dbsession, transact):
     del transact
 
     from c2cgeoportal_commons.models.main import (
+        Interface,
         LayerGroup,
         LayergroupTreeitem,
         LayerWMS,
@@ -23,26 +22,39 @@ def layertree_test_data(dbsession, transact):
         Theme,
     )
 
+    interface1 = Interface("interface1")
+    dbsession.add(interface1)
+    interface2 = Interface("interface2")
+    dbsession.add(interface2)
+
     layers_wms = []
     ogc_server = OGCServer(name="ogc_server")
     dbsession.add(ogc_server)
-    for i in range(0, 10):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
+    for i in range(10):
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        if i == 1:
+            layer_wms.interfaces = [interface1]
+        elif i > 1:
+            layer_wms.interfaces = [interface1, interface2]
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
 
     layers_wmts = []
-    for i in range(0, 10):
-        layer_wmts = LayerWMTS(name="layer_wmts_{}".format(i))
+    for i in range(10):
+        layer_wmts = LayerWMTS(name=f"layer_wmts_{i}")
+        if i == 1:
+            layer_wmts.interfaces = [interface1]
+        elif i > 1:
+            layer_wmts.interfaces = [interface1, interface2]
         layer_wmts.url = "http://localhost/wmts"
         layer_wmts.layer = layer_wmts.name
         layers_wmts.append(layer_wmts)
         dbsession.add(layer_wmts)
 
     groups = []
-    for i in range(0, 10):
-        group = LayerGroup(name="layer_group_{}".format(i))
+    for i in range(10):
+        group = LayerGroup(name=f"layer_group_{i}")
         groups.append(group)
         dbsession.add(group)
 
@@ -53,10 +65,14 @@ def layertree_test_data(dbsession, transact):
     dbsession.add(LayergroupTreeitem(group=groups[9], item=groups[8], ordering=3))
 
     themes = []
-    for i in range(0, 5):
-        theme = Theme(name="theme_{}".format(i))
+    for i in range(5):
+        theme = Theme(name=f"theme_{i}")
         themes.append(theme)
         dbsession.add(theme)
+        if i == 1:
+            theme.interfaces = [interface1]
+        elif i > 1:
+            theme.interfaces = [interface1, interface2]
 
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i], ordering=0))
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i + 5], ordering=1))
@@ -76,6 +92,7 @@ def layertree_test_data(dbsession, transact):
             "layers_wms": layers_wms,
             "layers_wmts": layers_wmts,
             "ogc_servers": [ogc_server],
+            "interfaces": [interface1, interface2],
         }
     )
 
@@ -95,13 +112,13 @@ class TestLayerTreeView(AbstractViewsTests):
     def check_edit_action(self, test_app, nodes, table, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "edit")
-        assert "http://localhost/admin/{}/{}".format(table, item_id) == action["url"]
+        assert f"http://localhost/admin/{table}/{item_id}" == action["url"]
         test_app.get(action["url"], status=200)
 
     def check_unlink_action(self, test_app, nodes, group_id, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "unlink")
-        assert "http://localhost/admin/layertree/unlink/{}/{}".format(group_id, item_id) == action["url"]
+        assert f"http://localhost/admin/layertree/unlink/{group_id}/{item_id}" == action["url"]
         test_app.delete(action["url"], status=200)
 
     def check_translation(self, nodes, item):
@@ -113,7 +130,7 @@ class TestLayerTreeView(AbstractViewsTests):
         node = next(n for n in nodes if n["id"] == parent_id)
         action = next(a for a in node["actions"] if a["name"] == action_name)
         assert label == action["label"]
-        assert "http://localhost/admin/{}/new?parent_id={}".format(route_table, parent_id) == action["url"]
+        assert f"http://localhost/admin/{route_table}/new?parent_id={parent_id}" == action["url"]
 
         form = test_app.get(action["url"], status=200).form
         assert form["parent_id"].value == str(parent_id)
@@ -152,12 +169,26 @@ class TestLayerTreeView(AbstractViewsTests):
             {"name": "new_name_from_layer_group"},
         )
 
-    def test_groups(self, test_app, layertree_test_data):
+    def test_groups(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
+
+        # Invert children order (to test ordering)
+        theme.children_relation[0].ordering = 1
+        theme.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(test_app, "/children?group_id={0}&path=_{0}".format(theme.id), status=200)
         nodes = resp.json
         assert 2 == len(nodes)
 
+        # check groups are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(theme.children_relation, key=lambda relation: relation.ordering)
+        ]
+        group_names = [node["name"] for node in nodes]
+        assert expected == group_names
+
         group = layertree_test_data["groups"][0]
         self.check_edit_action(test_app, nodes, "layer_groups", group.id)
         self.check_unlink_action(test_app, nodes, theme.id, group.id)
@@ -188,15 +219,29 @@ class TestLayerTreeView(AbstractViewsTests):
             },
         )
 
-    def test_layers(self, test_app, layertree_test_data):
+    def test_layers(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
         group = layertree_test_data["groups"][0]
+
+        # Invert children order (to test ordering)
+        group.children_relation[0].ordering = 1
+        group.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(
             test_app, "/children?group_id={0}&path=_{1}_{0}".format(group.id, theme.id), status=200
         )
         nodes = resp.json
         assert len(nodes) == 2
 
+        # check layers are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(group.children_relation, key=lambda relation: relation.ordering)
+        ]
+        layer_names = [node["name"] for node in nodes]
+        assert expected == layer_names
+
         layer_wms = layertree_test_data["layers_wms"][0]
         layer_wmts = layertree_test_data["layers_wmts"][0]
 
@@ -212,96 +257,58 @@ class TestLayerTreeView(AbstractViewsTests):
     def test_unlink(self, test_app, layertree_test_data, dbsession):
         group = layertree_test_data["groups"][0]
         item = layertree_test_data["layers_wms"][0]
-        test_app.delete("/admin/layertree/unlink/{}/{}".format(group.id, item.id), status=200)
+        test_app.delete(f"/admin/layertree/unlink/{group.id}/{item.id}", status=200)
         dbsession.expire_all()
         assert item not in group.children
 
+    def test_delete(self, test_app, layertree_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS, LayerWMTS
 
-@skip_if_ci
-@pytest.mark.selenium
-@pytest.mark.usefixtures("selenium", "selenium_app", "layertree_test_data")
-class TestLayerTreeSelenium:
-
-    _prefix = "/layertree"
-
-    def test_unlink(self, dbsession, selenium, selenium_app, layertree_test_data):
-        from c2cgeoportal_commons.models.main import LayergroupTreeitem
-
-        themes = layertree_test_data["themes"]
-        groups = layertree_test_data["groups"]
-        layers_wms = layertree_test_data["layers_wms"]
-        layers_wmts = layertree_test_data["layers_wmts"]
-
-        selenium.get(selenium_app + self._prefix)
-        page = LayertreePage(selenium)
-        page.expand()
-
-        for group_id, item_id, path in (
-            (
-                groups[0].id,
-                layers_wmts[0].id,
-                "_{}_{}_{}".format(themes[0].id, groups[0].id, layers_wmts[0].id),
-            ),
-            (
-                groups[0].id,
-                layers_wms[0].id,
-                "_{}_{}_{}".format(themes[0].id, groups[0].id, layers_wms[0].id),
-            ),
-            (themes[0].id, groups[0].id, "_{}_{}".format(themes[0].id, groups[0].id)),
-        ):
-            action_el = page.find_item_action(path, "unlink", 10)
-            expected_url = "{}/layertree/unlink/{}/{}".format(selenium_app, group_id, item_id)
-            assert expected_url == action_el.get_attribute("data-url")
-            page.click_and_confirm(action_el)
-
-            dbsession.expire_all()
-            link = (
-                dbsession.query(LayergroupTreeitem)
-                .filter(LayergroupTreeitem.treegroup_id == group_id)
-                .filter(LayergroupTreeitem.treeitem_id == item_id)
-                .one_or_none()
-            )
-            assert link is None
-
-            selenium.refresh()
-            page.wait_jquery_to_be_active()
-            page.find_item("_{}_{}_{}".format(themes[0].id, groups[5].id, layers_wmts[5].id), 10)
-            with pytest.raises(NoSuchElementException):
-                page.find_item(path)
-
-    @skip_if_ci
-    @pytest.mark.selenium
-    @pytest.mark.usefixtures("selenium", "selenium_app")
-    def test_delete(self, dbsession, selenium, selenium_app, layertree_test_data):
-        from c2cgeoportal_commons.models.main import LayerWMS, LayerWMTS, LayerGroup
-
-        themes = layertree_test_data["themes"]
         groups = layertree_test_data["groups"]
         layers_wms = layertree_test_data["layers_wms"]
         layers_wmts = layertree_test_data["layers_wmts"]
 
-        selenium.get(selenium_app + self._prefix)
-        page = LayertreePage(selenium)
-        page.expand()
-
-        for item_id, path, model in (
-            (layers_wmts[1].id, "_{}_{}_{}".format(themes[1].id, groups[1].id, layers_wmts[1].id), LayerWMTS),
-            (layers_wms[1].id, "_{}_{}_{}".format(themes[1].id, groups[1].id, layers_wms[1].id), LayerWMS),
-            (groups[1].id, "_{}_{}".format(themes[1].id, groups[1].id), LayerGroup),
+        for item_id, model in (
+            (layers_wmts[1].id, LayerWMTS),
+            (layers_wms[1].id, LayerWMS),
+            (groups[1].id, LayerGroup),
         ):
-            action_el = page.find_item_action(path, "delete", 10)
-            expected_url = "{}/admin/layertree/delete/{}".format(selenium_app, item_id)
-            assert expected_url == action_el.get_attribute("data-url")
-            page.click_and_confirm(action_el)
-            page.wait_jquery_to_be_active()
-
-            deleted = dbsession.query(model).filter(model.id == item_id).one_or_none()
-            assert deleted is None
-
-            dbsession.expire_all()
-            selenium.refresh()
-            page.wait_jquery_to_be_active()
-
-            page.find_item("_{}_{}_{}".format(themes[1].id, groups[6].id, layers_wmts[6].id), 10)
-            with pytest.raises(NoSuchElementException):
-                page.find_item(path)
+            test_app.delete(f"/admin/layertree/delete/{item_id}", status=200)
+            assert dbsession.query(model).get(item_id) is None
+
+    @pytest.mark.parametrize(
+        "params,expected",
+        [
+            ({}, ["theme_0", "theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface1"}, ["theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface2"}, ["theme_3", "theme_2", "theme_4"]),
+        ],
+    )
+    def test_themes_interfaces(self, test_app, layertree_test_data, params, expected):
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert expected == [node["name"] for node in nodes if node["item_type"] == "theme"]
+
+    @pytest.mark.parametrize(
+        "interface,index,length",
+        [
+            (None, 0, 2),
+            (None, 1, 2),
+            (None, 2, 2),
+            ("interface1", 0, 0),
+            ("interface1", 1, 2),
+            ("interface1", 2, 2),
+            ("interface2", 0, 0),
+            ("interface2", 1, 0),
+            ("interface2", 2, 2),
+        ],
+    )
+    def test_layers_interface(self, test_app, layertree_test_data, interface, index, length):
+        theme = layertree_test_data["themes"][index]
+        group = layertree_test_data["groups"][index]
+        params = {"group_id": group.id, "path": f"_{theme.id}_{group.id}"}
+        if interface:
+            params["interface"] = interface
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert length == len(nodes)

tests/test_learn.py

@@ -1,7 +1,7 @@
 # pylint: disable=no-self-use
 
-from pyramid.view import view_config
 import pytest
+from pyramid.view import view_config
 
 
 @pytest.fixture(scope="class")

tests/test_lingua_extractor_config.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022, Camptocamp SA
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of the FreeBSD Project.
+
+# pylint: disable=missing-docstring
+
+from unittest.mock import Mock, mock_open, patch
+
+import pytest
+import yaml
+from c2c.template.config import config as configuration
+
+from c2cgeoportal_admin.lib.lingua_extractor import GeomapfishConfigExtractor
+
+GMF_CONFIG = """
+vars:
+  admin_interface:
+    available_metadata:
+      - name: metadata1
+        description: description1
+        translate: true
+    available_functionalities:
+      - name: functionality1
+        description: description2
+"""
+
+
+class TestGeomapfishConfigExtractor:
+    @patch(
+        "c2cgeoportal_admin.lib.lingua_extractor.open",
+        mock_open(read_data=GMF_CONFIG),
+    )
+    def test_extract_config(self):
+        extractor = GeomapfishConfigExtractor()
+
+        options = Mock()
+        options.keywords = []
+
+        messages = list(extractor("config.yaml", options))
+
+        assert {msg.msgid for msg in messages} == {"description1", "description2"}

tests/test_main.py

@@ -1,11 +1,13 @@
-from pyramid import testing
 import pytest
+from pyramid import testing
 from webtest import TestApp as WebTestApp
 
 
 @pytest.mark.usefixtures("app_env")
 def test_main(app_env):
-    """Test dev environment"""
+    """
+    Test dev environment.
+    """
     config = testing.setUp(registry=app_env["registry"])
     app = config.make_wsgi_app()
     testapp = WebTestApp(app)