Add test for rulebased renderer else rule

qgis · Sep 8, 2015 · 93e9204 · 93e9204
1 parent 72665e0
commit 93e9204
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 34 deletions.
diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -101,7 +101,13 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
         void setFilterExpression( QString filterExp );
         void setDescription( QString description );
         //! @note added in 2.6
+        //! @deprecated use setActive instead
         void setCheckState( bool state );
+        /**
+         * Sets if this rule is active
+         * @param state Determines if the rule should be activated or deactivated
+         */
+        void setActive( bool state );
 
         //! clone this rule, return new instance
         QgsRuleBasedRendererV2::Rule* clone() const /Factory/;

diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
@@ -7,55 +7,56 @@ IF (WITH_SERVER)
   ADD_PYTHON_TEST(PyQgsLocalServer test_qgis_local_server.py)
 ENDIF (WITH_SERVER)
 
+ADD_PYTHON_TEST(PyQgsAnalysis test_qgsanalysis.py)
 ADD_PYTHON_TEST(PyQgsApplication test_qgsapplication.py)
-ADD_PYTHON_TEST(PyQgsFontUtils test_qgsfontutils.py)
-ADD_PYTHON_TEST(PyQgsFeature test_qgsfeature.py)
-ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py)
-ADD_PYTHON_TEST(PyQgsGeometryTest test_qgsgeometry.py)
-ADD_PYTHON_TEST(PyQgsGeometryAvoidIntersections test_qgsgeometry_avoid_intersections.py)
-ADD_PYTHON_TEST(PyQgsVectorLayer test_qgsvectorlayer.py)
-ADD_PYTHON_TEST(PyQgsRasterLayer test_qgsrasterlayer.py)
+ADD_PYTHON_TEST(PyQgsAtlasComposition test_qgsatlascomposition.py)
+ADD_PYTHON_TEST(PyQgsAttributeTableModel test_qgsattributetablemodel.py)
 ADD_PYTHON_TEST(PyQgsBlendModes test_qgsblendmodes.py)
-ADD_PYTHON_TEST(PyQgsRasterFileWriter test_qgsrasterfilewriter.py)
-ADD_PYTHON_TEST(PyQgsDelimitedTextProvider test_qgsdelimitedtextprovider.py)
-ADD_PYTHON_TEST(PyQgsCoordinateTransform test_qgscoordinatetransform.py)
-ADD_PYTHON_TEST(PyQgsRectangle test_qgsrectangle.py)
-ADD_PYTHON_TEST(PyQgsRelation test_qgsrelation.py)
-ADD_PYTHON_TEST(PyQgsSpatialIndex test_qgsspatialindex.py)
-ADD_PYTHON_TEST(PyQgsConditionalStyle test_qgsconditionalstyle.py)
-ADD_PYTHON_TEST(PyQgsComposerHtml test_qgscomposerhtml.py)
-ADD_PYTHON_TEST(PyQgsComposition test_qgscomposition.py)
-ADD_PYTHON_TEST(PyQgsAnalysis test_qgsanalysis.py)
 ADD_PYTHON_TEST(PyQgsColorScheme test_qgscolorscheme.py)
 ADD_PYTHON_TEST(PyQgsColorSchemeRegistry test_qgscolorschemeregistry.py)
+ADD_PYTHON_TEST(PyQgsComposerEffects test_qgscomposereffects.py)
+ADD_PYTHON_TEST(PyQgsComposerHtml test_qgscomposerhtml.py)
+ADD_PYTHON_TEST(PyQgsComposerLabel test_qgscomposerlabel.py)
 ADD_PYTHON_TEST(PyQgsComposerMap test_qgscomposermap.py)
 ADD_PYTHON_TEST(PyQgsComposerMapGrid test_qgscomposermapgrid.py)
-ADD_PYTHON_TEST(PyQgsComposerEffects test_qgscomposereffects.py)
-ADD_PYTHON_TEST(PyQgsComposerShapes test_qgscomposershapes.py)
 ADD_PYTHON_TEST(PyQgsComposerPicture test_qgscomposerpicture.py)
-ADD_PYTHON_TEST(PyQgsSymbolLayerV2 test_qgssymbollayerv2.py)
-ADD_PYTHON_TEST(PyQgsPoint test_qgspoint.py)
-ADD_PYTHON_TEST(PyQgsAtlasComposition test_qgsatlascomposition.py)
-ADD_PYTHON_TEST(PyQgsComposerLabel test_qgscomposerlabel.py)
+ADD_PYTHON_TEST(PyQgsComposerShapes test_qgscomposershapes.py)
+ADD_PYTHON_TEST(PyQgsComposition test_qgscomposition.py)
+ADD_PYTHON_TEST(PyQgsConditionalStyle test_qgsconditionalstyle.py)
+ADD_PYTHON_TEST(PyQgsCoordinateTransform test_qgscoordinatetransform.py)
+ADD_PYTHON_TEST(PyQgsDelimitedTextProvider test_qgsdelimitedtextprovider.py)
+ADD_PYTHON_TEST(PyQgsDistanceArea test_qgsdistancearea.py)
+ADD_PYTHON_TEST(PyQgsEditWidgets test_qgseditwidgets.py)
 ADD_PYTHON_TEST(PyQgsExpression test_qgsexpression.py)
+ADD_PYTHON_TEST(PyQgsFeature test_qgsfeature.py)
+ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py)
+ADD_PYTHON_TEST(PyQgsField test_qgsfield.py)
+ADD_PYTHON_TEST(PyQgsFontUtils test_qgsfontutils.py)
+ADD_PYTHON_TEST(PyQgsGeometryAvoidIntersections test_qgsgeometry_avoid_intersections.py)
+ADD_PYTHON_TEST(PyQgsGeometryTest test_qgsgeometry.py)
+ADD_PYTHON_TEST(PyQgsGraduatedSymbolRendererV2 test_qgsgraduatedsymbolrendererv2.py)
+ADD_PYTHON_TEST(PyQgsMemoryProvider test_provider_memory.py)
+ADD_PYTHON_TEST(PyQgsNetworkContentFetcher test_qgsnetworkcontentfetcher.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingBase test_qgspallabeling_base.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingCanvas test_qgspallabeling_canvas.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingComposer test_qgspallabeling_composer.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingPlacement test_qgspallabeling_placement.py)
-ADD_PYTHON_TEST(PyQgsVectorFileWriter test_qgsvectorfilewriter.py)
-ADD_PYTHON_TEST(PyQgsZonalStatistics test_qgszonalstatistics.py)
-ADD_PYTHON_TEST(PyQgsDistanceArea test_qgsdistancearea.py)
-ADD_PYTHON_TEST(PyQgsGraduatedSymbolRendererV2 test_qgsgraduatedsymbolrendererv2.py)
-ADD_PYTHON_TEST(PyQgsNetworkContentFetcher test_qgsnetworkcontentfetcher.py)
-ADD_PYTHON_TEST(PyQgsEditWidgets test_qgseditwidgets.py)
+ADD_PYTHON_TEST(PyQgsPoint test_qgspoint.py)
 ADD_PYTHON_TEST(PyQgsRangeWidgets test_qgsrangewidgets.py)
-ADD_PYTHON_TEST(PyQgsAttributeTableModel test_qgsattributetablemodel.py)
-ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_provider_spatialite.py)
+ADD_PYTHON_TEST(PyQgsRasterFileWriter test_qgsrasterfilewriter.py)
+ADD_PYTHON_TEST(PyQgsRasterLayer test_qgsrasterlayer.py)
+ADD_PYTHON_TEST(PyQgsRectangle test_qgsrectangle.py)
+ADD_PYTHON_TEST(PyQgsRelation test_qgsrelation.py)
+ADD_PYTHON_TEST(PyQgsRulebasedRenderer test_qgsrulebasedrenderer.py)
 ADD_PYTHON_TEST(PyQgsShapefileProvider test_provider_shapefile.py)
-ADD_PYTHON_TEST(PyQgsMemoryProvider test_provider_memory.py)
-ADD_PYTHON_TEST(PyQgsVectorColorRamp test_qgsvectorcolorramp.py)
+ADD_PYTHON_TEST(PyQgsSpatialIndex test_qgsspatialindex.py)
+ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_provider_spatialite.py)
+ADD_PYTHON_TEST(PyQgsSymbolLayerV2 test_qgssymbollayerv2.py)
 ADD_PYTHON_TEST(PyQgsSyntacticSugar test_syntactic_sugar.py)
-ADD_PYTHON_TEST(PyQgsField test_qgsfield.py)
+ADD_PYTHON_TEST(PyQgsVectorColorRamp test_qgsvectorcolorramp.py)
+ADD_PYTHON_TEST(PyQgsVectorFileWriter test_qgsvectorfilewriter.py)
+ADD_PYTHON_TEST(PyQgsVectorLayer test_qgsvectorlayer.py)
+ADD_PYTHON_TEST(PyQgsZonalStatistics test_qgszonalstatistics.py)
 
 IF (NOT WIN32)
   ADD_PYTHON_TEST(PyQgsLogger test_qgslogger.py)

diff --git a/tests/src/python/test_qgsrulebasedrenderer.py b/tests/src/python/test_qgsrulebasedrenderer.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    test_qgsrulebasedrenderer.py
+    ---------------------
+    Date                 : September 2015
+    Copyright            : (C) 2015 by Matthias Kuhn
+    Email                : matthias at opengis dot ch
+***************************************************************************
+*                                                                         *
+*   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__ = 'September 2015'
+__copyright__ = '(C) 2015, Matthiasd Kuhn'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import qgis
+import os
+
+from PyQt4.QtCore import QSize
+
+from qgis.core import (QgsVectorLayer,
+                       QgsMapLayerRegistry,
+                       QgsRectangle,
+                       QgsMultiRenderChecker,
+                       QgsRuleBasedRendererV2,
+                       QgsFillSymbolV2
+                       )
+from utilities import (unitTestDataPath,
+                       getQgisTestApp,
+                       TestCase,
+                       unittest
+                       )
+# Convenience instances in case you may need them
+# not used in this test
+QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
+TEST_DATA_DIR = unitTestDataPath()
+
+
+class TestQgsRulebasedRenderer(TestCase):
+
+    def setUp(self):
+        myShpFile = os.path.join(TEST_DATA_DIR, 'rectangles.shp')
+        layer = QgsVectorLayer(myShpFile, 'Points', 'ogr')
+        QgsMapLayerRegistry.instance().addMapLayer(layer)
+
+        # Create rulebased style
+        sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'})
+        sym2 = QgsFillSymbolV2.createSimple({'color': '#71bd6c'})
+        sym3 = QgsFillSymbolV2.createSimple({'color': '#1f78b4'})
+
+        self.r1 = QgsRuleBasedRendererV2.Rule(sym1, 0, 0, '"id" = 1')
+        self.r2 = QgsRuleBasedRendererV2.Rule(sym2, 0, 0, '"id" = 2')
+        self.r3 = QgsRuleBasedRendererV2.Rule(sym3, 0, 0, 'ELSE')
+
+        self.rootrule = QgsRuleBasedRendererV2.Rule(None)
+        self.rootrule.appendChild(self.r1)
+        self.rootrule.appendChild(self.r2)
+        self.rootrule.appendChild(self.r3)
+
+        self.renderer = QgsRuleBasedRendererV2(self.rootrule)
+        layer.setRendererV2(self.renderer)
+        self.mapsettings = CANVAS.mapSettings()
+        self.mapsettings.setOutputSize(QSize(400, 400))
+        self.mapsettings.setOutputDpi(96)
+        self.mapsettings.setExtent(QgsRectangle(-163, 22, -70, 52))
+
+        rendered_layers = [layer.id()]
+        self.mapsettings.setLayers(rendered_layers)
+
+    def tearDown(self):
+        QgsMapLayerRegistry.instance().removeAllMapLayers()
+
+    def testElse(self):
+        # Setup rendering check
+        renderchecker = QgsMultiRenderChecker()
+        renderchecker.setMapSettings(self.mapsettings)
+        renderchecker.setControlName('expected_rulebased_else')
+        result = renderchecker.runTest('rulebased_else')
+
+        assert result
+
+    def testDisabledElse(self):
+        # Disable a rule and assert that it's hidden not rendered with else
+        self.r2.setActive(False)
+
+        renderchecker = QgsMultiRenderChecker()
+        renderchecker.setMapSettings(self.mapsettings)
+        renderchecker.setControlName('expected_rulebased_disabled_else')
+        result = renderchecker.runTest('rulebased_disabled_else')
+
+        assert result
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/...ol_images/expected_rulebased_disabled_else/expected_rulebased_disabled_else.png b/...ol_images/expected_rulebased_disabled_else/expected_rulebased_disabled_else.png
diff --git a/tests/testdata/control_images/expected_rulebased_else/expected_rulebased_else.png b/tests/testdata/control_images/expected_rulebased_else/expected_rulebased_else.png
diff --git a/tests/testdata/rectangles.dbf b/tests/testdata/rectangles.dbf
diff --git a/tests/testdata/rectangles.prj b/tests/testdata/rectangles.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/tests/testdata/rectangles.qpj b/tests/testdata/rectangles.qpj
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/tests/testdata/rectangles.shp b/tests/testdata/rectangles.shp
diff --git a/tests/testdata/rectangles.shx b/tests/testdata/rectangles.shx