Add a couple more tests for QgsVectorLayerSelectedFeatureSource

nyalldawson · nyalldawson · commit 6fed80b1e9d3 · 2017-06-05T13:36:19.000+10:00
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -1026,7 +1026,7 @@ QgsFeatureIterator QgsVectorLayerSelectedFeatureSource::getFeatures( const QgsFe
 {
   QgsFeatureRequest req( request );
 
-  if ( req.filterFids().isEmpty() && req.filterType() != QgsFeatureRequest::FilterFids )
+  if ( req.filterFids().isEmpty() && req.filterType() != QgsFeatureRequest::FilterFid )
   {
     req.setFilterFids( mSelectedFeatureIds );
   }
diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -2343,6 +2343,16 @@ def testQgsVectorLayerSelectedFeatureSource(self):
         ids = set([f.id() for f in source.getFeatures()])
         self.assertEqual(ids, {f1.id(), f3.id(), f5.id()})
 
+        # test that requesting subset of ids intersects this request with the selected ids
+        ids = set([f.id() for f in source.getFeatures(QgsFeatureRequest().setFilterFids([f1.id(), f2.id(), f5.id()]))])
+        self.assertEqual(ids, {f1.id(), f5.id()})
+
+        # test that requesting id works
+        ids = set([f.id() for f in source.getFeatures(QgsFeatureRequest().setFilterFid(f1.id()))])
+        self.assertEqual(ids, {f1.id()})
+        ids = set([f.id() for f in source.getFeatures(QgsFeatureRequest().setFilterFid(f5.id()))])
+        self.assertEqual(ids, {f5.id()})
+
         # test that source has stored snapshot of selected features
         layer.selectByIds([f2.id(), f4.id()])
         self.assertEqual(source.featureCount(), 3)

Original file line number	Diff line number	Diff line change
`@@ -1026,7 +1026,7 @@ QgsFeatureIterator QgsVectorLayerSelectedFeatureSource::getFeatures( const QgsFe`
`1026`	`1026`	`{`
`1027`	`1027`	`QgsFeatureRequest req( request );`
`1028`	`1028`
`1029`		`- if ( req.filterFids().isEmpty() && req.filterType() != QgsFeatureRequest::FilterFids )`
	`1029`	`+ if ( req.filterFids().isEmpty() && req.filterType() != QgsFeatureRequest::FilterFid )`
`1030`	`1030`	`{`
`1031`	`1031`	`req.setFilterFids( mSelectedFeatureIds );`
`1032`	`1032`	`}`