Add/update tests

tests/src/python/test_qgsserver.py

@@ -55,6 +55,7 @@
 
 
 class QgsServerTestBase(unittest.TestCase):
+
     """Base class for QGIS server tests"""
 
     # Set to True in child classes to re-generate reference files for this class
@@ -97,6 +98,9 @@ def setUp(self):
 
         d = unitTestDataPath('qgis_server_accesscontrol') + '/'
         self.projectPath = os.path.join(d, "project.qgs")
+        self.projectAnnotationPath = os.path.join(d, "project_with_annotations.qgs")
+        self.projectStatePath = os.path.join(d, "project_state.qgs")
+        self.projectUseLayerIdsPath = os.path.join(d, "project_use_layerids.qgs")
 
         # Clean env just to be sure
         env_vars = ['QUERY_STRING', 'QGIS_PROJECT_FILE']
@@ -187,14 +191,14 @@ def _execute_request(self, qs, requestMethod=QgsServerRequest.GetMethod, data=No
         self.server.handleRequest(request, response)
         headers = []
         rh = response.headers()
-        rk = list(rh.keys())
-        rk.sort()
+        rk = sorted(rh.keys())
         for k in rk:
             headers.append(("%s: %s" % (k, rh[k])).encode('utf-8'))
         return b"\n".join(headers) + b"\n\n", bytes(response.body())
 
 
 class TestQgsServer(QgsServerTestBase):
+
     """Tests container"""
 
     # Set to True to re-generate reference files for this class

tests/src/python/test_qgsserver_accesscontrol.py

@@ -142,8 +142,8 @@ def authorizedLayerAttributes(self, layer, attributes):
         if not self._active:
             return super(RestrictedAccessControl, self).authorizedLayerAttributes(layer, attributes)
 
-        if "colour" in attributes:  # spellok
-            attributes.remove("colour")  # spellok
+        if "color" in attributes:  # spellok
+            attributes.remove("color")  # spellok
         return attributes
 
     def allowToEdit(self, layer, feature):
@@ -169,8 +169,7 @@ def _execute_request(cls, qs, requestMethod=QgsServerRequest.GetMethod, data=Non
         cls._server.handleRequest(request, response)
         headers = []
         rh = response.headers()
-        rk = list(rh.keys())
-        rk.sort()
+        rk = sorted(rh.keys())
         for k in rk:
             headers.append(("%s: %s" % (k, rh[k])).encode('utf-8'))
         return b"\n".join(headers) + b"\n\n", bytes(response.body())
@@ -250,7 +249,7 @@ def test_wms_getprojectsettings(self):
             str(response).find("<TreeName>Country</TreeName>") != -1,
             "No Country layer in GetProjectSettings\n%s" % response)
         self.assertTrue(
-            str(response).find("<LayerDrawingOrder>Country_Labels,Country,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>") != -1,
+            str(response).find("<LayerDrawingOrder>Country_Diagrams,Country_Labels,Country,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>") != -1,
             "LayerDrawingOrder in GetProjectSettings\n%s" % response)
 
         response, headers = self._get_restricted(query_string)
@@ -261,7 +260,7 @@ def test_wms_getprojectsettings(self):
             str(response).find("<TreeName>Country</TreeName>") != -1,
             "Country layer in GetProjectSettings\n%s" % response)
         self.assertTrue(
-            str(response).find("<LayerDrawingOrder>Country_Labels,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>") != -1,
+            str(response).find("<LayerDrawingOrder>Country_Diagrams,Country_Labels,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>") != -1,
             "LayerDrawingOrder in GetProjectSettings\n%s" % response)
 
     def test_wms_getprojectsettings(self):
@@ -451,18 +450,18 @@ def test_wms_getfeatureinfo_hello(self):
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
             "No result in GetFeatureInfo\n%s" % response)
         self.assertTrue(
-            str(response).find("<qgs:colour>red</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>red</qgs:color>") != -1,  # spellok
             "No color in result of GetFeatureInfo\n%s" % response)
 
         response, headers = self._get_restricted(query_string)
         self.assertTrue(
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
             "No result in GetFeatureInfo\n%s" % response)
         self.assertFalse(
-            str(response).find("<qgs:colour>red</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>red</qgs:color>") != -1,  # spellok
             "Unexpected color in result of GetFeatureInfo\n%s" % response)
         self.assertFalse(
-            str(response).find("<qgs:colour>NULL</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>NULL</qgs:color>") != -1,  # spellok
             "Unexpected color NULL in result of GetFeatureInfo\n%s" % response)
 
     def test_wms_getfeatureinfo_hello2(self):
@@ -603,18 +602,18 @@ def test_wfs_getfeature_hello(self):
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
             "No result in GetFeature\n%s" % response)
         self.assertTrue(
-            str(response).find("<qgs:colour>red</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>red</qgs:color>") != -1,  # spellok
             "No color in result of GetFeature\n%s" % response)
 
         response, headers = self._post_restricted(data)
         self.assertTrue(
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
             "No result in GetFeature\n%s" % response)
         self.assertFalse(
-            str(response).find("<qgs:colour>red</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>red</qgs:color>") != -1,  # spellok
             "Unexpected color in result of GetFeature\n%s" % response)
         self.assertFalse(
-            str(response).find("<qgs:colour>NULL</qgs:colour>") != -1,  # spellok
+            str(response).find("<qgs:color>NULL</qgs:color>") != -1,  # spellok
             "Unexpected color NULL in result of GetFeature\n%s" % response)
 
     def test_wfs_getfeature_hello2(self):

tests/src/python/test_qgsserver_projectutils.py

@@ -27,9 +27,12 @@ def setUp(self):
         self.testdata_path = unitTestDataPath('qgis_server_project') + '/'
 
         self.prj = QgsProject()
-        prjPath = os.path.join(self.testdata_path, "project.qgs")
-        self.prj.setFileName(prjPath)
-        self.prj.read()
+        self.prjPath = os.path.join(self.testdata_path, "project.qgs")
+        self.prj.read(self.prjPath)
+
+        self.prj2 = QgsProject()
+        self.prj2Path = os.path.join(self.testdata_path, "project2.qgs")
+        self.prj2.read(self.prj2Path)
 
     def tearDown(self):
         pass
@@ -43,6 +46,40 @@ def test_url(self):
         self.assertEqual(QgsServerProjectUtils.wcsServiceUrl(self.prj), "my_wcs_advertised_url")
         self.assertEqual(QgsServerProjectUtils.wfsServiceUrl(self.prj), "my_wfs_advertised_url")
 
+    def test_wmsuselayerids(self):
+        self.assertEqual(QgsServerProjectUtils.wmsUseLayerIds(self.prj), False)
+        self.assertEqual(QgsServerProjectUtils.wmsUseLayerIds(self.prj2), True)
+
+    def test_wmsrestrictedlayers(self):
+        # retrieve entry from project
+        result = QgsServerProjectUtils.wmsRestrictedLayers(self.prj)
+        expected = []
+        expected.append('points')  # layer
+        expected.append('group1')  # local group
+        expected.append('groupEmbedded')  # embedded group
+
+        self.assertListEqual(sorted(expected), sorted(result))
+
+    def test_wfslayersids(self):
+        # retrieve entry from project
+        result = QgsServerProjectUtils.wfsLayerIds(self.prj)
+
+        expected = []
+        expected.append('multipoint20170309173637804')  # from embedded group
+        expected.append('points20170309173738552')  # local layer
+        expected.append('polys20170309173913723')  # from local group
+
+        self.assertEqual(expected, result)
+
+    def test_wcslayersids(self):
+        # retrieve entry from project
+        result = QgsServerProjectUtils.wcsLayerIds(self.prj)
+
+        expected = []
+        expected.append('landsat20170313142548073')
+
+        self.assertEqual(expected, result)
+
 
 if __name__ == '__main__':
     unittest.main()