Add featureiterator tests

tests/src/python/CMakeLists.txt

@@ -1,6 +1,7 @@
 INCLUDE(UsePythonTest)
 ADD_PYTHON_TEST(PyQgsApplication test_qgsapplication.py)
 ADD_PYTHON_TEST(PyQgsFeature test_qgsfeature.py)
+ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py)
 ADD_PYTHON_TEST(PyQgsGeometry test_qgsgeometry.py)
 ADD_PYTHON_TEST(PyQgsVectorLayer test_qgsvectorlayer.py)
 ADD_PYTHON_TEST(PyQgsRasterLayer test_qgsrasterlayer.py)

tests/src/python/test_qgsfeatureiterator.py

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+"""QGIS Unit tests for QgsFeatureIterator.
+
+.. note:: This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+"""
+__author__ = 'Matthias Kuhn'
+__date__ = '18/09/2013'
+__copyright__ = 'Copyright 2013, The QGIS Project'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import os
+
+import qgis
+from qgis.core import QgsFeatureIterator, QgsVectorLayer, QgsFeatureRequest, QgsFeature
+from utilities import (unitTestDataPath,
+                       getQgisTestApp,
+                       TestCase,
+                       unittest,
+                       #expectedFailure
+                       )
+QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
+TEST_DATA_DIR = unitTestDataPath()
+
+class TestQgsFeatureIterator(TestCase):
+
+    def __init__(self, methodName):
+        """Run once on class initialisation."""
+        unittest.TestCase.__init__(self, methodName)
+
+    def test_FilterExpression(self):
+        # create point layer
+        myShpFile = os.path.join(TEST_DATA_DIR, 'points.shp')
+        pointLayer = QgsVectorLayer(myShpFile, 'Points', 'ogr')
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterExpression( 'Staff > 3' ) ) ]
+        expectedIds = [1L, 5L, 6L, 7L, 8L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+        pointLayer.startEditing()
+        self.addFeatures( pointLayer )
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterExpression( 'Staff > 3' ) ) ]
+        expectedIds = [-2L, 1L, 5L, 6L, 7L, 8L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+        pointLayer.rollBack()
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterExpression( 'Staff > 3' ) ) ]
+        expectedIds = [1L, 5L, 6L, 7L, 8L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+    def test_FilterFids(self):
+        # create point layer
+        myShpFile = os.path.join(TEST_DATA_DIR, 'points.shp')
+        pointLayer = QgsVectorLayer(myShpFile, 'Points', 'ogr')
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterFids( [7,8,12,30] ) ) ]
+        expectedIds = [7L, 8L, 12L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+        pointLayer.startEditing()
+        self.addFeatures( pointLayer )
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterFids( [-4,7,8,12,30] ) ) ]
+        expectedIds = [-4L, 7L, 8L, 12L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+        pointLayer.rollBack()
+
+        ids = [ feat.id() for feat in pointLayer.getFeatures( QgsFeatureRequest().setFilterFids( [-2,7,8,12,30] ) ) ]
+        expectedIds = [7L, 8L, 12L]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format( repr( expectedIds ), repr( ids ) )
+        assert ids == expectedIds, myMessage
+
+    def addFeatures(self,vl):
+        feat = QgsFeature()
+        fields = vl.pendingFields()
+        feat.setFields(fields)
+        feat['Staff'] = 4
+        vl.addFeature( feat )
+
+        feat = QgsFeature()
+        fields = vl.pendingFields()
+        feat.setFields(fields)
+        feat['Staff'] = 2
+        vl.addFeature( feat )
+
+if __name__ == '__main__':
+    unittest.main()