Skip to content

Commit 42c9d15

Browse files
committedNov 8, 2017
[test] Fix canvas size and background garbage
1 parent 593bff2 commit 42c9d15

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed
 

‎tests/src/python/test_qgshighlight.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
from qgis.PyQt.QtGui import (
2525
QColor,
2626
QImage,
27-
QPainter
27+
QPainter,
28+
QResizeEvent
2829
)
2930
from qgis.core import (
3031
QgsVectorLayer,
@@ -46,7 +47,9 @@ class TestQgsHighlight(unittest.TestCase):
4647
def setUp(self):
4748
self.iface = get_iface()
4849

49-
self.iface.mapCanvas().resize(QSize(400, 400))
50+
self.iface.mapCanvas().viewport().resize(400, 400)
51+
# For some reason the resizeEvent is not delivered, fake it
52+
self.iface.mapCanvas().resizeEvent(QResizeEvent(QSize(400, 400), self.iface.mapCanvas().size()))
5053

5154
def tearDown(self):
5255
QgsProject.instance().removeAllMapLayers()
@@ -63,11 +66,13 @@ def runTestForLayer(self, layer, testname):
6366
highlight = QgsHighlight(self.iface.mapCanvas(), geom, layer)
6467
color = QColor(Qt.red)
6568
highlight.setColor(color)
69+
highlight.setWidth(1)
6670
color.setAlpha(50)
6771
highlight.setFillColor(color)
6872
highlight.show()
6973

7074
image = QImage(QSize(400, 400), QImage.Format_ARGB32)
75+
image.fill(Qt.white)
7176
painter = QPainter()
7277
painter.begin(image)
7378
self.iface.mapCanvas().render(painter)
@@ -78,8 +83,7 @@ def runTestForLayer(self, layer, testname):
7883
checker.setControlPathPrefix("highlight")
7984
checker.setControlName("expected_highlight_{}".format(testname))
8085
checker.setRenderedImage(control_image)
81-
checker.setSizeTolerance(10, 10)
82-
self.assertTrue(checker.compareImages("highlight_{}".format(testname), 10))
86+
self.assertTrue(checker.compareImages("highlight_{}".format(testname)))
8387
shutil.rmtree(tempdir)
8488

8589
def testLine(self):
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.