Merge pull request #44361 from qgis/backport-44111-to-release-3_16

[Backport release-3_16] [Server][Tests] Extend WMS dimension tests
qgis · Aug 18, 2021 · c6cdb2e · c6cdb2e
2 parents ce9eef8 + 5e06460
commit c6cdb2e
Show file tree

Hide file tree

Showing 11 changed files with 874 additions and 359 deletions.
diff --git a/tests/src/python/test_qgsserver_wms_dimension.py b/tests/src/python/test_qgsserver_wms_dimension.py
@@ -66,7 +66,7 @@ def test_wms_getmap_default(self):
             "SERVICE": "WMS",
             "VERSION": "1.3.0",
             "REQUEST": "GetMap",
-            "LAYERS": "dem,Slopes,Contours",
+            "LAYERS": "dem,Slopes,Contours,Datetime_dim",
             "STYLES": "",
             "FORMAT": "image/png",
             "BBOX": "-1219081,4281848,172260,5673189",
@@ -116,6 +116,42 @@ def test_wms_getmap_simple_value(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetMap_Dimension_RangeElevation_Value")
 
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "TIME": "2021-05-31T17:00:00"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Time_Value")
+
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "DIM_DATE": "2021-05-31"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Date_Value")
+
         # multi dimension with value
         qs = "?" + "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectPath),
@@ -174,6 +210,42 @@ def test_wms_getmap_range_value(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetMap_Dimension_RangeElevation_RangeValue")
 
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "TIME": "2021-05-31T09:00:00/2021-06-30T09:00:00"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Time_RangeValue")
+
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "DIM_DATE": "2021-05-31/2021-06-30"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Date_RangeValue")
+
     def test_wms_getmap_multi_values(self):
         # dimension with multi values
         qs = "?" + "&".join(["%s=%s" % i for i in list({
@@ -212,6 +284,42 @@ def test_wms_getmap_multi_values(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetMap_Dimension_RangeElevation_MultiValues")
 
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "TIME": "2021-05-31T10:00:00,2021-05-31T17:00:00"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Time_MultiValues")
+
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "LAYERS": "dem,Datetime_dim",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-1219081,4281848,172260,5673189",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "DIM_DATE": "2021-05-31,2021-06-30"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Dimension_Date_MultiValues")
+
     def test_wms_getmap_mix_values(self):
         # dimension with mix values
         qs = "?" + "&".join(["%s=%s" % i for i in list({

diff --git a/...is_server/WMS_GetMap_Dimension_All_NoValue/WMS_GetMap_Dimension_All_NoValue.png b/...is_server/WMS_GetMap_Dimension_All_NoValue/WMS_GetMap_Dimension_All_NoValue.png
diff --git a/...WMS_GetMap_Dimension_Date_MultiValues/WMS_GetMap_Dimension_Date_MultiValues.png b/...WMS_GetMap_Dimension_Date_MultiValues/WMS_GetMap_Dimension_Date_MultiValues.png
diff --git a/...r/WMS_GetMap_Dimension_Date_RangeValue/WMS_GetMap_Dimension_Date_RangeValue.png b/...r/WMS_GetMap_Dimension_Date_RangeValue/WMS_GetMap_Dimension_Date_RangeValue.png
diff --git a/...qgis_server/WMS_GetMap_Dimension_Date_Value/WMS_GetMap_Dimension_Date_Value.png b/...qgis_server/WMS_GetMap_Dimension_Date_Value/WMS_GetMap_Dimension_Date_Value.png
diff --git a/...WMS_GetMap_Dimension_Time_MultiValues/WMS_GetMap_Dimension_Time_MultiValues.png b/...WMS_GetMap_Dimension_Time_MultiValues/WMS_GetMap_Dimension_Time_MultiValues.png
diff --git a/...r/WMS_GetMap_Dimension_Time_RangeValue/WMS_GetMap_Dimension_Time_RangeValue.png b/...r/WMS_GetMap_Dimension_Time_RangeValue/WMS_GetMap_Dimension_Time_RangeValue.png
diff --git a/...qgis_server/WMS_GetMap_Dimension_Time_Value/WMS_GetMap_Dimension_Time_Value.png b/...qgis_server/WMS_GetMap_Dimension_Time_Value/WMS_GetMap_Dimension_Time_Value.png
diff --git a/tests/testdata/qgis_server_accesscontrol/dimensions.gpkg b/tests/testdata/qgis_server_accesscontrol/dimensions.gpkg