From faf389bde5399f5e6bb317e4b7fe38ea9570ded3 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 16 Dec 2020 14:37:00 +1000 Subject: [PATCH] Test updates --- tests/src/python/test_qgscolorramplegendnode.py | 4 ++-- ...expected_color_ramp_legend_node_draw_mask.png | Bin 0 -> 1384 bytes .../expected_color_ramp_legend_node_icon.png | Bin .../expected_color_ramp_legend_node_icon.png | Bin 0 -> 3883 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_draw/expected_color_ramp_legend_node_draw_mask.png rename tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/{ => set1}/expected_color_ramp_legend_node_icon.png (100%) create mode 100644 tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/set2/expected_color_ramp_legend_node_icon.png diff --git a/tests/src/python/test_qgscolorramplegendnode.py b/tests/src/python/test_qgscolorramplegendnode.py index 021da858dbdf..7cb1c357f0aa 100644 --- a/tests/src/python/test_qgscolorramplegendnode.py +++ b/tests/src/python/test_qgscolorramplegendnode.py @@ -19,7 +19,7 @@ QgsColorRampLegendNode, QgsLayerTreeLayer, QgsVectorLayer, - QgsRenderChecker, + QgsMultiRenderChecker, QgsFontUtils, QgsLegendSettings, QgsLegendStyle, @@ -141,7 +141,7 @@ def imageCheck(self, name, reference_image, image, size_tolerance=0): temp_dir = QDir.tempPath() + '/' file_name = temp_dir + name + ".png" image.save(file_name, "PNG") - checker = QgsRenderChecker() + checker = QgsMultiRenderChecker() checker.setControlPathPrefix("color_ramp_legend_node") checker.setControlName("expected_" + reference_image) checker.setRenderedImage(file_name) diff --git a/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_draw/expected_color_ramp_legend_node_draw_mask.png b/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_draw/expected_color_ramp_legend_node_draw_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..d0786af3b2d6371e208baa7427d7afa0f0a02210 GIT binary patch literal 1384 zcmZuxeM}o=7=Q12T}$V#?NwMZZD~i@+}dmbH9`f~vLh{ouqg^hVz#zn^AG>AKw}5X zCYict(Ff6#FiN;C9>WWpyM-@Wc@VRR%pkC7J+w^^( z=lAuz-sAP=U6MT#gwU=U3;i5Im><^b;vMkrAC=SamG_FJxeXyQ%6+gw9r*}C!aX&# z>3P@i?{`XkiAEW1x~6`4p)2mZEJ&AiSZ$YvJ%T5`vj-1u?C+|)wQ@^0M&&Oo&C6;RwzjuT2+qXsjb7;f_jn@|DKF>8|KkC7$k(S-;gOJd0@U%s>)p zeM_p3Blu7Ny64Vrwx%%LxEKC;QCl%bY1nC^mHq%veNT(jCEYx>+=l-GA74Hcy1VqN z@1Co$fc8bo$iQWAUc& z=S_`_YUrJwgX}cN#Y^&-wzrH{M~*H`ps6~wxktoKS63lwtnEmP1ml^tZxeJY=vQsZ z*7Gvv&q-p=l()F@DHPuX_-_f<_Wr1;6#v7fwjEIuE@`t3n;J;+Z2?}C$VfJj>`SY| zrG*2y`q`ksp9B@#)#lJ2Zs$IKQB^)O3Nm~YG1z;Bp|;moJ;#Od`D_3vC2%}PA0|SN zgUH-Lpn6lMjIAV1U%n^8hQ2867WW^E2$)eY0&3(~f=l*w6feKA(+Fjac6?is%5HQ< zOHNqtfcJer@4qC0w!0x5DbJOMn3rH{N%x~*YKmi$5jx6=2muJvM}oU?9^Q$7@$HF+ zmz52i2qf(~OR2(!RijV*f_0>UL0V3c;&si{N^2kw@+-VlV6benGFgTN6^Dd@_N8PfasWI{Ebz=ieOFy@|n#n z0@n9w(a?bz%)(7Wh$T69>azBOxpSRrbGk5WP{5=?^s*xcpykB|wjMUv@p4Yjc_1aV zj=(T-)h~hxXQc_gA+KzC3!X_9H$sg}Ux;;|8mm)Be!8%T;>|Xt{KK#TGVCQ2{wE9A zuQ_tSX32D=2=Z*u=@F%f$rWO@9wg$u>UF}L@;*2e_x%Sl#2netE$emC8yHXjF<_RX zler$YrunU;8HO|dnMKSI?W@y-OO-%0zW{kTKi~i;Z}F1)+dzu3VchjXDP!{cB6eXg zFZ$K;1;}AWJm1Ahx0Cae2m8PGQqv*onf|GsSw}#|{G!VC0mZgoUpagagrBUC_+h5X Pj^L@OuBWe6Szr4b*s;kV literal 0 HcmV?d00001 diff --git a/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/expected_color_ramp_legend_node_icon.png b/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/set1/expected_color_ramp_legend_node_icon.png similarity index 100% rename from tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/expected_color_ramp_legend_node_icon.png rename to tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/set1/expected_color_ramp_legend_node_icon.png diff --git a/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/set2/expected_color_ramp_legend_node_icon.png b/tests/testdata/control_images/color_ramp_legend_node/expected_color_ramp_legend_node_icon/set2/expected_color_ramp_legend_node_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cd810197b583d84612719163a9314dae37979023 GIT binary patch literal 3883 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