Fix tests

qgis · May 20, 2020 · aa175e3 · aa175e3
1 parent a28c8ed
commit aa175e3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -1144,7 +1144,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
             mSymbolRenderContext->expressionContextScope()->addVariable( QgsExpressionContextScope::StaticVariable( QgsExpressionContext::EXPR_GEOMETRY_PART_NUM, i + 1, true ) );
 
           context.setGeometry( geomCollection.geometryN( i ) );
-          static_cast<QgsLineSymbol *>( this )->renderPolyline( linesToRender.at( 0 ), &feature, context, symbolLayerIndex, selected );
+          static_cast<QgsLineSymbol *>( this )->renderPolyline( linesToRender.at( i ), &feature, context, symbolLayerIndex, selected );
         }
         break;
       }

diff --git a/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py b/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py
@@ -25,7 +25,7 @@
 
 import os
 
-from qgis.PyQt.QtCore import QSize
+from qgis.PyQt.QtCore import QSize, QDir
 from qgis.PyQt.QtGui import QColor
 from qgis.core import (
     QgsVectorLayer,
@@ -79,8 +79,13 @@ def setUp(self):
         self.mapsettings.setOutputDpi(96)
         self.mapsettings.setExtent(QgsRectangle(-133, 22, -70, 52))
 
+        self.report = "<h1>Python QgsGeometryGeneratorSymbolLayer Tests</h1>\n"
+
     def tearDown(self):
         QgsProject.instance().removeAllMapLayers()
+        report_file_path = "%s/qgistest.html" % QDir.tempPath()
+        with open(report_file_path, 'a') as report_file:
+            report_file.write(self.report)
 
     def test_marker(self):
         sym = self.polys_layer.renderer().symbol()
@@ -95,7 +100,9 @@ def test_marker(self):
         renderchecker = QgsMultiRenderChecker()
         renderchecker.setMapSettings(self.mapsettings)
         renderchecker.setControlName('expected_geometrygenerator_marker')
-        self.assertTrue(renderchecker.runTest('geometrygenerator_marker'))
+        res = renderchecker.runTest('geometrygenerator_marker')
+        self.report += renderchecker.report()
+        self.assertTrue(res)
 
     def test_mixed(self):
         sym = self.polys_layer.renderer().symbol()
@@ -116,7 +123,9 @@ def test_mixed(self):
         renderchecker = QgsMultiRenderChecker()
         renderchecker.setMapSettings(self.mapsettings)
         renderchecker.setControlName('expected_geometrygenerator_mixed')
-        self.assertTrue(renderchecker.runTest('geometrygenerator_mixed'))
+        res = renderchecker.runTest('geometrygenerator_mixed')
+        self.report += renderchecker.report()
+        self.assertTrue(res)
 
     def test_buffer_lines(self):
         sym = self.lines_layer.renderer().symbol()
@@ -132,7 +141,9 @@ def test_buffer_lines(self):
         renderchecker = QgsMultiRenderChecker()
         renderchecker.setMapSettings(self.mapsettings)
         renderchecker.setControlName('expected_geometrygenerator_buffer_lines')
-        self.assertTrue(renderchecker.runTest('geometrygenerator_buffer_lines'))
+        res = renderchecker.runTest('geometrygenerator_buffer_lines')
+        self.report += renderchecker.report()
+        self.assertTrue(res)
 
     def test_buffer_points(self):
         sym = self.points_layer.renderer().symbol()
@@ -148,7 +159,9 @@ def test_buffer_points(self):
         renderchecker = QgsMultiRenderChecker()
         renderchecker.setMapSettings(self.mapsettings)
         renderchecker.setControlName('expected_geometrygenerator_buffer_points')
-        self.assertTrue(renderchecker.runTest('geometrygenerator_buffer_points'))
+        res = renderchecker.runTest('geometrygenerator_buffer_points')
+        self.report += renderchecker.report()
+        self.assertTrue(res)
 
 
 if __name__ == '__main__':

diff --git a/...ages/expected_geometrygenerator_mixed/expected_geometrygenerator_mixed_mask.png b/...ages/expected_geometrygenerator_mixed/expected_geometrygenerator_mixed_mask.png
diff --git a/...s/symbol_svgmarker/expected_svgmarker_bounds/expected_svgmarker_bounds_mask.png b/...s/symbol_svgmarker/expected_svgmarker_bounds/expected_svgmarker_bounds_mask.png