c2cgeoportal-geoportal 2.5.0.100__py2.py3-none-any.whl → 2.7.1.83__py2.py3-none-any.whl

tests/test_caching.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2015-2019, Camptocamp SA
 # All rights reserved.
 
@@ -32,16 +30,12 @@
 
 from unittest import TestCase
 
-from c2cgeoportal_geoportal.lib.cacheversion import get_cache_version
-from c2cgeoportal_geoportal.lib.caching import (
-    CORS_METHODS,
-    NO_CACHE,
-    init_region,
-    invalidate_region,
-    set_common_headers,
-)
 from tests import DummyRequest
 
+from c2cgeoportal_geoportal.lib.cacheversion import get_cache_version
+from c2cgeoportal_geoportal.lib.caching import init_region, invalidate_region
+from c2cgeoportal_geoportal.lib.common_headers import CORS_METHODS, Cache, set_common_headers
+
 
 class TestSetCorsHeaders(TestCase):
     ORIGIN1 = "http://www.example.com"
@@ -56,31 +50,31 @@ class TestSetCorsHeaders(TestCase):
             request.registry.settings = {"headers": {"foo": settings}}
         else:
             request.registry.settings = {"headers": {}}
-        set_common_headers(request, "foo", NO_CACHE, credentials=credentials)
+        set_common_headers(request, "foo", Cache.PRIVATE_NO, credentials=credentials)
 
         return dict(request.response.headers)
 
     def test_simple(self):
         """
-        Tests specified in http://www.w3.org/TR/cors/#resource-requests
+        Tests specified in http://www.w3.org/TR/cors/#resource-requests.
         """
         # 1. If the Origin header is not present terminate this set of steps.
         #    The request is outside the scope of this specification.
         assert self._do("POST", {}) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
         # 2. If the value of the Origin header is not a case-sensitive match for
         #    any of the values in list of origins, do not set any additional
         #    headers and terminate this set of steps.
         assert self._do("POST", {"Origin": "http://foe.com"}) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
         # 3. If the resource supports credentials add a single
@@ -88,10 +82,10 @@ class TestSetCorsHeaders(TestCase):
         #    header as value, and add a single Access-Control-Allow-Credentials
         #    header with the case-sensitive string "true" as value.
         assert self._do("POST", {"Origin": self.ORIGIN2}, credentials=True) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN2,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -109,8 +103,7 @@ class TestSetCorsHeaders(TestCase):
 
     def test_preflight(self):
         """
-        Tests specified in
-        http://www.w3.org/TR/cors/#resource-preflight-requests
+        Tests specified in http://www.w3.org/TR/cors/#resource-preflight-requests.
         """
         # 1. If the Origin header is not present terminate this set of steps.
         #    The request is outside the scope of this specification.
@@ -209,10 +202,10 @@ class TestSetCorsHeaders(TestCase):
     def test_not_configured(self):
         # If the service is not configured, then no CORS head.
         assert self._do("GET", {"Origin": self.ORIGIN1}, settings=None) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
     def test_match_all(self):
@@ -224,10 +217,10 @@ class TestSetCorsHeaders(TestCase):
         # An origin included in the access_control_allow_origin list is OK with
         # credentials
         assert self._do("POST", {"Origin": self.ORIGIN1}, credentials=True, settings=settings) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -237,10 +230,10 @@ class TestSetCorsHeaders(TestCase):
         # 3. Otherwise, add a single Access-Control-Allow-Origin header, with
         #    either the value of the Origin header or the string "*" as value.
         assert self._do("POST", {"Origin": "http://www.guest.com"}, settings=settings) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": CORS_METHODS,

tests/test_checker.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2013-2019, Camptocamp SA
 # All rights reserved.
 
@@ -32,9 +30,10 @@
 
 from unittest import TestCase
 
-from c2cgeoportal_geoportal.lib.checker import build_url
 from tests import DummyRequest
 
+from c2cgeoportal_geoportal.lib.checker import build_url
+
 
 class TestExportCSVView(TestCase):
     def test_build_url_docker(self):

tests/test_decimaljson.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2011-2019, Camptocamp SA
 # All rights reserved.
 
@@ -34,14 +32,16 @@ import decimal
 import json
 from unittest import TestCase
 
-from c2cwsgiutils.pretty_json import fast_dumps
+from c2cwsgiutils.pretty_json import _FastDumps as FastDumps
 
 
 class TestDecimalJSON(TestCase):
     def test_decimal(self):
         value = {"str": "an str", "int": 1, "dec": decimal.Decimal("1.2")}
+        fast_dumps = FastDumps(False, False)
         result = fast_dumps(value)
         self.assertEqual(json.loads(result), {"int": 1, "dec": 1.2, "str": "an str"})
 
     def test_decimal_json(self):
-        self.assertEqual(fast_dumps({"a": decimal.Decimal("3.3")}), '{\n  "a": 3.3\n}')
+        fast_dumps = FastDumps(False, False)
+        assert fast_dumps({"a": decimal.Decimal("3.3")}) == '{"a":3.3}'

tests/test_headerstween.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2018-2019, Camptocamp SA
 # All rights reserved.
 
@@ -33,7 +31,6 @@
 from unittest import TestCase
 
 import pyramid.registry
-
 from tests import DummyRequest
 
 

tests/test_i18n.py

@@ -0,0 +1,31 @@
+from unittest import TestCase
+from unittest.mock import patch
+
+from c2cgeoportal_geoportal.lib.i18n import available_locale_names
+
+example_locale_content = {
+    ("de", True),
+    ("en", True),
+    ("fr", True),
+    (".emptyfolder", False),
+    ("geomapfish_geoportal-client.pot", False),
+}
+
+
+class TestI18n(TestCase):
+    @patch("c2cgeoportal_geoportal.lib.i18n.os.path.exists", return_value=True)
+    @patch(
+        "c2cgeoportal_geoportal.lib.i18n.os.listdir",
+        return_value=[locale[0] for locale in example_locale_content],
+    )
+    @patch(
+        "c2cgeoportal_geoportal.lib.i18n.os.path.isdir",
+        side_effect=[locale[1] for locale in example_locale_content],
+    )
+    def test_available_locale_names(self, isdir_mock, listdir_mock, exists_mock):
+        locales = available_locale_names()
+        self.assertEqual(set(locales), {"de", "en", "fr"})
+
+    def test_available_locale_names_no_dir(self):
+        locales = available_locale_names()
+        self.assertEqual(locales, [])

tests/test_init.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2012-2019, Camptocamp SA
 # All rights reserved.
 
@@ -31,19 +29,20 @@
 
 
 from unittest import TestCase
+from unittest.mock import patch
 
 from c2c.template.config import config
 from pyramid import testing
+from tests import DummyRequest
 
 import c2cgeoportal_geoportal
 from c2cgeoportal_geoportal import (
     call_hook,
     create_get_user_from_request,
     default_user_validator,
-    is_valid_referer,
+    is_valid_referrer,
     set_user_validator,
 )
-from tests import DummyRequest
 
 
 class TestIncludeme(TestCase):
@@ -60,7 +59,6 @@ class TestIncludeme(TestCase):
                 "schema": "main",
                 "schema_static": "main_static",
                 "default_max_age": 86400,
-                "app.cfg": "/opt/c2cgeoportal/geoportal/tests/config.yaml",
                 "package": "c2cgeoportal",
                 "enable_admin_interface": False,
                 "getitfixed": {"enabled": False},
@@ -74,6 +72,12 @@ class TestIncludeme(TestCase):
                 },
             }
         )
+        config.init("/opt/c2cgeoportal/geoportal/tests/config.yaml")
+
+    @patch("c2cgeoportal_geoportal.available_locale_names", return_value=["de", "en", "fr"])
+    def test_available_locale_names(self, locales_mock):
+        self.config.include(c2cgeoportal_geoportal.includeme)
+        self.assertEqual(self.config.registry.settings["available_locale_names"], ["de", "en", "fr"])
 
     def test_set_user_validator_directive(self):
         self.config.include(c2cgeoportal_geoportal.includeme)
@@ -89,7 +93,7 @@ class TestIncludeme(TestCase):
         def custom_validator(username, password):
             del username  # Unused
             del password  # Unused
-            return False  # pragma: no cover
+            return False
 
         self.config.set_user_validator(custom_validator)
         self.assertEqual(self.config.registry.validate_user, custom_validator)
@@ -97,8 +101,7 @@ class TestIncludeme(TestCase):
 
 class TestReferer(TestCase):
     """
-    Check that accessing something with a bad HTTP referer is equivalent to a
-    not authenticated query.
+    Check that accessing something with a bad HTTP referer is equivalent to a not authenticated query.
     """
 
     BASE1 = "http://example.com/app"
@@ -122,7 +125,7 @@ class TestReferer(TestCase):
         def match(reference, value, expected):
             r = DummyRequest()
             r.referer = value
-            self.assertEqual(is_valid_referer(r, {"authorized_referers": [reference]}), expected)
+            self.assertEqual(is_valid_referrer(r, {"authorized_referers": [reference]}), expected)
 
         match("http://example.com/app/", "http://example.com/app?k=v", True)
         match("http://example.com/app/", "http://example.com/app?k=v#link", True)
@@ -173,21 +176,3 @@ class TestHooks(TestCase):
 
     def test_bad_hook(self):
         self.assertRaises(AttributeError, call_hook, self.settings, "bad")
-
-
-class TestInit(TestCase):
-    def test_add_url_params(self):
-        from c2cgeoportal_geoportal.lib import add_url_params
-        from urllib.parse import urlparse, parse_qs
-
-        params = {"Name": "Bob", "Age": 18, "Nationality": "Việt Nam"}
-        result = add_url_params("http://test/", params)
-        presult = urlparse(result)
-        self.assertEqual(presult.scheme, "http")
-        self.assertEqual(presult.netloc, "test")
-        self.assertEqual(presult.path, "/")
-        self.assertEqual(presult.params, "")
-        self.assertEqual(presult.fragment, "")
-        self.assertEqual(
-            parse_qs(presult.query), {"Name": ["Bob"], "Age": ["18"], "Nationality": ["Việt Nam"]}
-        )

tests/test_locale_negociator.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2013-2019, Camptocamp SA
 # All rights reserved.
 
@@ -44,9 +42,10 @@ class TestLocalNegociator(TestCase):
         self.assertEqual(lang, "fr")
 
     def test_lang_is_not_available(self):
-        from c2cgeoportal_geoportal import locale_negotiator
-        from pyramid.threadlocal import get_current_registry
         from pyramid.request import Request
+        from pyramid.threadlocal import get_current_registry
+
+        from c2cgeoportal_geoportal import locale_negotiator
 
         request = Request.blank("/")
         request.registry = get_current_registry()
@@ -57,9 +56,10 @@ class TestLocalNegociator(TestCase):
         self.assertEqual(lang, "de")
 
     def test_lang_is_available(self):
-        from c2cgeoportal_geoportal import locale_negotiator
-        from pyramid.threadlocal import get_current_registry
         from pyramid.request import Request
+        from pyramid.threadlocal import get_current_registry
+
+        from c2cgeoportal_geoportal import locale_negotiator
 
         request = Request.blank("/")
         request.registry = get_current_registry()

tests/test_mapserverproxy_route_predicate.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2013-2019, Camptocamp SA
 # All rights reserved.
 

tests/test_raster.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -36,8 +34,10 @@ from unittest import TestCase
 class TestRasterViews(TestCase):
     def test_raster(self):
         from decimal import Decimal
-        from tests import DummyRequest
+
         from pyramid.httpexceptions import HTTPNotFound
+        from tests import DummyRequest
+
         from c2cgeoportal_geoportal.views.raster import Raster
 
         request = DummyRequest()
@@ -76,7 +76,9 @@ class TestRasterViews(TestCase):
 
     def test_raster_angle(self):
         from decimal import Decimal
+
         from tests import DummyRequest
+
         from c2cgeoportal_geoportal.views.raster import Raster
 
         request = DummyRequest()
@@ -119,7 +121,9 @@ class TestRasterViews(TestCase):
 
     def test_raster_vrt(self):
         from decimal import Decimal
+
         from tests import DummyRequest
+
         from c2cgeoportal_geoportal.views.raster import Raster
 
         request = DummyRequest()
@@ -153,8 +157,10 @@ class TestRasterViews(TestCase):
 
     def test_profile_json(self):
         from decimal import Decimal
-        from tests import DummyRequest
+
         from pyramid.httpexceptions import HTTPNotFound
+        from tests import DummyRequest
+
         from c2cgeoportal_geoportal.views.profile import Profile
 
         request = DummyRequest()
@@ -252,3 +258,10 @@ class TestRasterViews(TestCase):
         # test wrong layer name
         request.params["layers"] = "wrong"
         self.assertRaises(HTTPNotFound, profile.json)
+
+    def test_round_bigvalue(self):
+        from decimal import Decimal
+
+        from c2cgeoportal_geoportal.views.raster import Raster
+
+        assert Raster._round(-5.4775915e29, 1) == Decimal("-5.4775915E+29")

tests/test_wmstparsing.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2013-2019, Camptocamp SA
 # All rights reserved.
 
@@ -38,13 +36,13 @@ import isodate
 
 class TestExtent(TestCase):
     def test_parse_values(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import parse_extent, TimeExtentValue
+        from c2cgeoportal_geoportal.lib.wmstparsing import TimeExtentValue, parse_extent
 
         extent = parse_extent(["2005", "2006"], "2005")
         self.assertTrue(isinstance(extent, TimeExtentValue))
 
     def test_parse_interval(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import parse_extent, TimeExtentInterval
+        from c2cgeoportal_geoportal.lib.wmstparsing import TimeExtentInterval, parse_extent
 
         extent = parse_extent(["2000/2005/P1Y"], "2002")
         self.assertTrue(isinstance(extent, TimeExtentInterval))
@@ -56,7 +54,7 @@ class TestExtent(TestCase):
         self.assertRaises(ValueError, parse_extent, [], "2002")
 
     def test_merge_values(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import parse_extent, TimeExtentValue
+        from c2cgeoportal_geoportal.lib.wmstparsing import TimeExtentValue, parse_extent
 
         e1 = parse_extent(["2000", "2005"], "2000/2005")
         e2 = parse_extent(["2001", "2003"], "2001/2003")
@@ -82,7 +80,7 @@ class TestExtent(TestCase):
         )
 
     def test_merge_interval(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import parse_extent, TimeExtentInterval
+        from c2cgeoportal_geoportal.lib.wmstparsing import TimeExtentInterval, parse_extent
 
         e1 = parse_extent(["2000/2005/P1Y"], "2000/2005")
         e2 = parse_extent(["2006/2010/P1Y"], "2006/2010")
@@ -168,7 +166,7 @@ class TestFormat(TestCase):
         self.assertEqual("2010-02-01T00:00:00Z", _format_date(dt))
 
     def test_format_tz(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date, _format_date
+        from c2cgeoportal_geoportal.lib.wmstparsing import _format_date, _parse_date
 
         dt = _parse_date("2010-02-03T12:34:00+01:00")
         self.assertEqual("2010-02-03T12:34:00+01:00", _format_date(dt[1]))
@@ -206,9 +204,10 @@ class TestParseDuration(TestCase):
         self.assertEqual((0, 0, 0, 10), _parse_duration("PT10S"))
 
     def test_invalid(self):
-        from c2cgeoportal_geoportal.lib.wmstparsing import _parse_duration
         from isodate import ISO8601Error
 
+        from c2cgeoportal_geoportal.lib.wmstparsing import _parse_duration
+
         self.assertRaises(ISO8601Error, _parse_duration, "10S")