More readable test

elpaso · elpaso · commit 99638cfdb6bf · 2018-11-05T10:24:35.000+01:00
diff --git a/tests/src/python/test_qgsprojectbadlayers.py b/tests/src/python/test_qgsprojectbadlayers.py
@@ -46,7 +46,6 @@ def test_project_roundtrip(self):
             copyfile(os.path.join(TEST_DATA_DIR, 'lines.%s' % ext), os.path.join(temp_dir.path(), 'lines.%s' % ext))
         copyfile(os.path.join(TEST_DATA_DIR, 'raster', 'band1_byte_ct_epsg4326.tif'), os.path.join(temp_dir.path(), 'band1_byte_ct_epsg4326.tif'))
         l = QgsVectorLayer(os.path.join(temp_dir.path(), 'lines.shp'), 'lines', 'ogr')
-        wkb_type = l.wkbType()
         self.assertTrue(l.isValid())
 
         rl = QgsRasterLayer(os.path.join(temp_dir.path(), 'band1_byte_ct_epsg4326.tif'), 'raster', 'gdal')
@@ -66,11 +65,13 @@ def test_project_roundtrip(self):
         # Load the bad project
         self.assertTrue(p.read(bad_project_path))
         # Check layer is invalid
-        invalid = list(p.mapLayersByName('lines'))[0]
-        self.assertFalse(invalid.isValid())
+        vector = list(p.mapLayersByName('lines'))[0]
+        raster = list(p.mapLayersByName('raster'))[0]
+        self.assertFalse(vector.isValid())
         # Try a getFeatures
-        self.assertEqual([f for f in invalid.getFeatures()], [])
-        self.assertTrue(list(p.mapLayers().values())[1].isValid())
+        self.assertEqual([f for f in vector.getFeatures()], [])
+        self.assertTrue(raster.isValid())
+        self.assertEqual(vector.providerType(), 'ogr')
 
         # Save the project
         bad_project_path2 = os.path.join(temp_dir.path(), 'project_bad2.qgs')
@@ -84,8 +85,10 @@ def test_project_roundtrip(self):
         # Load the good project
         self.assertTrue(p.read(good_project_path))
         # Check layer is valid
-        self.assertTrue(list(p.mapLayers().values())[0].isValid())
-        self.assertTrue(list(p.mapLayers().values())[1].isValid())
+        vector = list(p.mapLayersByName('lines'))[0]
+        raster = list(p.mapLayersByName('raster'))[0]
+        self.assertTrue(vector.isValid())
+        self.assertTrue(raster.isValid())
 
 
 if __name__ == '__main__':
