Adapt unit-tests to test attribute name instead of alias

Author: manisandro

tests/permissions_tests.py

@@ -110,17 +110,17 @@ def test_public_permissions(self):
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertGreater(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes.`len`").find(perm)[0].value, 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertGreater(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes.`len`").find(perm)[0].value, 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertGreater(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes.`len`").find(perm)[0].value, 1)
 
         # No additional permissions for role admin, as they are public
@@ -154,23 +154,23 @@ def test_restricted_layer_and_attribute(self):
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 0)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 0)
         self.assertGreater(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes.`len`").find(perm)[0].value, 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertGreater(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')].attributes.`len`").find(perm)[0].value, 1)
 
         # Permission for layer edit_points for admin
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertGreater(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes.`len`").find(perm)[0].value, 1)
 
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 1)
         self.assertEqual(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes.`len`").find(perm)[0].value, 1)
 
 
@@ -363,7 +363,7 @@ def test_public_permissions_default_restrict_selected_permissions(self):
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.queryable==false)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.info_template==false)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 0)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 0)
 
         # edit_points is permitted for admin (with all attributes, but not queryable), and Name is permitted for edit_lines
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')]").find(perm)), 1)
@@ -372,7 +372,7 @@ def test_public_permissions_default_restrict_selected_permissions(self):
         self.assertGreater(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes.`len`").find(perm)[0].value, 1)
 
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 1)
 
     def test_public_permissions_default_restrict_selected_permissions_inherit_info_permissions(self):
         """ Test permissions_default_allow=false and inherit_info_permissions=true and selected permissions. """
@@ -411,7 +411,7 @@ def test_public_permissions_default_restrict_selected_permissions_inherit_info_p
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.queryable==true)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines' & @.info_template==true)]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 0)
+        self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 0)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.queryable==false)]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='public')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.info_template==false)]").find(perm)), 1)
@@ -423,7 +423,7 @@ def test_public_permissions_default_restrict_selected_permissions_inherit_info_p
         self.assertGreater(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_points')].attributes.`len`").find(perm)[0].value, 1)
 
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')]").find(perm)), 1)
-        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='Name')]").find(perm)), 1)
+        self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_lines')].attributes[?(@=='name')]").find(perm)), 1)
 
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons')]").find(perm)), 1)
         self.assertEqual(len(parse("$.roles[?(@.role=='admin')].permissions.wms_services[?(@.name=='qwc_demo')].layers[?(@.name=='edit_polygons' & @.queryable==true)]").find(perm)), 1)