Add provider test for getting feature count with subset string set,

fix memory provider invalid count when subset set
qgis · Feb 4, 2016 · 27f1637 · 27f1637
1 parent 9c91dd2
commit 27f1637
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/providers/memory/qgsmemoryprovider.cpp b/src/providers/memory/qgsmemoryprovider.cpp
@@ -289,7 +289,18 @@ QGis::WkbType QgsMemoryProvider::geometryType() const
 
 long QgsMemoryProvider::featureCount() const
 {
-  return mFeatures.count();
+  if ( mSubsetString.isEmpty() )
+    return mFeatures.count();
+
+  // subset string set, no alternative but testing each feature
+  QgsFeatureIterator fit = QgsFeatureIterator( new QgsMemoryFeatureIterator( new QgsMemoryFeatureSource( this ), true,  QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) ) );
+  int count = 0;
+  QgsFeature feature;
+  while ( fit.nextFeature( feature ) )
+  {
+    count++;
+  }
+  return count;
 }
 
 const QgsFields & QgsMemoryProvider::fields() const

diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
@@ -363,6 +363,13 @@ def testUnique(self):
     def testFeatureCount(self):
         assert self.provider.featureCount() == 5, 'Got {}'.format(self.provider.featureCount())
 
+        #Add a subset string and test feature count
+        subset = self.getSubsetString()
+        self.provider.setSubsetString(subset)
+        count = self.provider.featureCount()
+        self.provider.setSubsetString(None)
+        assert count == 3, 'Got {}'.format(count)
+
     def testClosedIterators(self):
         """ Test behaviour of closed iterators """