Skip to content

Commit aa175e3

Browse files
committedMay 20, 2020
Fix tests
1 parent a28c8ed commit aa175e3

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed
 

‎src/core/symbology/qgssymbol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
11441144
mSymbolRenderContext->expressionContextScope()->addVariable( QgsExpressionContextScope::StaticVariable( QgsExpressionContext::EXPR_GEOMETRY_PART_NUM, i + 1, true ) );
11451145

11461146
context.setGeometry( geomCollection.geometryN( i ) );
1147-
static_cast<QgsLineSymbol *>( this )->renderPolyline( linesToRender.at( 0 ), &feature, context, symbolLayerIndex, selected );
1147+
static_cast<QgsLineSymbol *>( this )->renderPolyline( linesToRender.at( i ), &feature, context, symbolLayerIndex, selected );
11481148
}
11491149
break;
11501150
}

‎tests/src/python/test_qgsgeometrygeneratorsymbollayer.py

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import os
2727

28-
from qgis.PyQt.QtCore import QSize
28+
from qgis.PyQt.QtCore import QSize, QDir
2929
from qgis.PyQt.QtGui import QColor
3030
from qgis.core import (
3131
QgsVectorLayer,
@@ -79,8 +79,13 @@ def setUp(self):
7979
self.mapsettings.setOutputDpi(96)
8080
self.mapsettings.setExtent(QgsRectangle(-133, 22, -70, 52))
8181

82+
self.report = "<h1>Python QgsGeometryGeneratorSymbolLayer Tests</h1>\n"
83+
8284
def tearDown(self):
8385
QgsProject.instance().removeAllMapLayers()
86+
report_file_path = "%s/qgistest.html" % QDir.tempPath()
87+
with open(report_file_path, 'a') as report_file:
88+
report_file.write(self.report)
8489

8590
def test_marker(self):
8691
sym = self.polys_layer.renderer().symbol()
@@ -95,7 +100,9 @@ def test_marker(self):
95100
renderchecker = QgsMultiRenderChecker()
96101
renderchecker.setMapSettings(self.mapsettings)
97102
renderchecker.setControlName('expected_geometrygenerator_marker')
98-
self.assertTrue(renderchecker.runTest('geometrygenerator_marker'))
103+
res = renderchecker.runTest('geometrygenerator_marker')
104+
self.report += renderchecker.report()
105+
self.assertTrue(res)
99106

100107
def test_mixed(self):
101108
sym = self.polys_layer.renderer().symbol()
@@ -116,7 +123,9 @@ def test_mixed(self):
116123
renderchecker = QgsMultiRenderChecker()
117124
renderchecker.setMapSettings(self.mapsettings)
118125
renderchecker.setControlName('expected_geometrygenerator_mixed')
119-
self.assertTrue(renderchecker.runTest('geometrygenerator_mixed'))
126+
res = renderchecker.runTest('geometrygenerator_mixed')
127+
self.report += renderchecker.report()
128+
self.assertTrue(res)
120129

121130
def test_buffer_lines(self):
122131
sym = self.lines_layer.renderer().symbol()
@@ -132,7 +141,9 @@ def test_buffer_lines(self):
132141
renderchecker = QgsMultiRenderChecker()
133142
renderchecker.setMapSettings(self.mapsettings)
134143
renderchecker.setControlName('expected_geometrygenerator_buffer_lines')
135-
self.assertTrue(renderchecker.runTest('geometrygenerator_buffer_lines'))
144+
res = renderchecker.runTest('geometrygenerator_buffer_lines')
145+
self.report += renderchecker.report()
146+
self.assertTrue(res)
136147

137148
def test_buffer_points(self):
138149
sym = self.points_layer.renderer().symbol()
@@ -148,7 +159,9 @@ def test_buffer_points(self):
148159
renderchecker = QgsMultiRenderChecker()
149160
renderchecker.setMapSettings(self.mapsettings)
150161
renderchecker.setControlName('expected_geometrygenerator_buffer_points')
151-
self.assertTrue(renderchecker.runTest('geometrygenerator_buffer_points'))
162+
res = renderchecker.runTest('geometrygenerator_buffer_points')
163+
self.report += renderchecker.report()
164+
self.assertTrue(res)
152165

153166

154167
if __name__ == '__main__':

0 commit comments

Comments
 (0)
Please sign in to comment.