Update test images

qgis · Dec 15, 2019 · 0d84e35 · 0d84e35
1 parent 2e3b57a
commit 0d84e35
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 5 deletions.
diff --git a/tests/src/core/testqgscallout.cpp b/tests/src/core/testqgscallout.cpp
@@ -147,7 +147,7 @@ class TestQgsCallout: public QObject
     void manhattanDataDefinedDrawToAllParts();
 
   private:
-    bool imageCheck( const QString &testName, QImage &image, int mismatchCount = 0 );
+    bool imageCheck( const QString &testName, QImage &image, unsigned int mismatchCount = 0 );
 
     QString mReport;
     QString mTestDataDir;
@@ -1698,7 +1698,7 @@ void TestQgsCallout::manhattanDataDefinedDrawToAllParts()
 // Private helper functions not called directly by CTest
 //
 
-bool TestQgsCallout::imageCheck( const QString &testName, QImage &image, int mismatchCount )
+bool TestQgsCallout::imageCheck( const QString &testName, QImage &image, unsigned int mismatchCount )
 {
   //draw background
   QImage imageWithBackground( image.width(), image.height(), QImage::Format_RGB32 );
@@ -1711,12 +1711,12 @@ bool TestQgsCallout::imageCheck( const QString &testName, QImage &image, int mis
   QString tempDir = QDir::tempPath() + '/';
   QString fileName = tempDir + testName + ".png";
   imageWithBackground.save( fileName, "PNG" );
-  QgsRenderChecker checker;
+  QgsMultiRenderChecker checker;
   checker.setControlPathPrefix( QStringLiteral( "callouts" ) );
   checker.setControlName( "expected_" + testName );
   checker.setRenderedImage( fileName );
   checker.setColorTolerance( 2 );
-  bool resultFlag = checker.compareImages( testName, mismatchCount );
+  bool resultFlag = checker.runTest( testName, mismatchCount );
   mReport += checker.report();
   return resultFlag;
 }

diff --git a/tests/src/python/test_selective_masking.py b/tests/src/python/test_selective_masking.py
@@ -564,7 +564,9 @@ def test_mask_symbollayer_preview(self):
             render_function()
             self.checker.setControlName(control_name)
             self.checker.setRenderedImage(tmp)
-            self.assertTrue(self.checker.compareImages(control_name))
+            res = self.checker.compareImages(control_name, 90)
+            self.report += self.checker.report()
+            self.assertTrue(res)
 
     def test_mask_with_effect(self):
         p = QgsMarkerSymbol.createSimple({'color': '#fdbf6f', 'size': "7"})

diff --git a/...a/control_images/callouts/expected_callouts_layout/expected_callouts_layout.png b/...a/control_images/callouts/expected_callouts_layout/expected_callouts_layout.png
diff --git a/...ol_images/callouts/expected_callouts_layout/fedora/expected_callouts_layout.png b/...ol_images/callouts/expected_callouts_layout/fedora/expected_callouts_layout.png
diff --git a/...ol_images/callouts/expected_callouts_layout/travis/expected_callouts_layout.png b/...ol_images/callouts/expected_callouts_layout/travis/expected_callouts_layout.png
diff --git a/tests/testdata/control_images/selective_masking/label_mask/label_mask.png b/tests/testdata/control_images/selective_masking/label_mask/label_mask.png
diff --git a/tests/testdata/control_images/selective_masking/label_mask/label_mask_mask.png b/tests/testdata/control_images/selective_masking/label_mask/label_mask_mask.png
diff --git a/.../control_images/selective_masking/label_mask_subsymbol/label_mask_subsymbol.png b/.../control_images/selective_masking/label_mask_subsymbol/label_mask_subsymbol.png
diff --git a/...rol_images/selective_masking/label_mask_subsymbol/label_mask_subsymbol_mask.png b/...rol_images/selective_masking/label_mask_subsymbol/label_mask_subsymbol_mask.png
diff --git a/..._images/selective_masking/label_mask_symbol_levels/label_mask_symbol_levels.png b/..._images/selective_masking/label_mask_symbol_levels/label_mask_symbol_levels.png
diff --git a/...es/selective_masking/label_mask_symbol_levels/label_mask_symbol_levels_mask.png b/...es/selective_masking/label_mask_symbol_levels/label_mask_symbol_levels_mask.png
diff --git a/...trol_images/selective_masking/label_mask_with_effect/label_mask_with_effect.png b/...trol_images/selective_masking/label_mask_with_effect/label_mask_with_effect.png
diff --git a/...images/selective_masking/label_mask_with_effect/label_mask_with_effect_mask.png b/...images/selective_masking/label_mask_with_effect/label_mask_with_effect_mask.png
diff --git a/...testdata/control_images/selective_masking/mask_with_effect/mask_with_effect.png b/...testdata/control_images/selective_masking/mask_with_effect/mask_with_effect.png
diff --git a/...ata/control_images/selective_masking/mask_with_effect/mask_with_effect_mask.png b/...ata/control_images/selective_masking/mask_with_effect/mask_with_effect_mask.png
diff --git a/...s/selective_masking/multiple_masks_different_sl/multiple_masks_different_sl.png b/...s/selective_masking/multiple_masks_different_sl/multiple_masks_different_sl.png
diff --git a/...ective_masking/multiple_masks_different_sl/multiple_masks_different_sl_mask.png b/...ective_masking/multiple_masks_different_sl/multiple_masks_different_sl_mask.png
diff --git a/...selective_masking/multiple_masks_different_sl2/multiple_masks_different_sl2.png b/...selective_masking/multiple_masks_different_sl2/multiple_masks_different_sl2.png
diff --git a/...tive_masking/multiple_masks_different_sl2/multiple_masks_different_sl2_mask.png b/...tive_masking/multiple_masks_different_sl2/multiple_masks_different_sl2_mask.png
diff --git a/...trol_images/selective_masking/multiple_masks_same_sl/multiple_masks_same_sl.png b/...trol_images/selective_masking/multiple_masks_same_sl/multiple_masks_same_sl.png
diff --git a/...images/selective_masking/multiple_masks_same_sl/multiple_masks_same_sl_mask.png b/...images/selective_masking/multiple_masks_same_sl/multiple_masks_same_sl_mask.png
diff --git a/tests/testdata/control_images/selective_masking/sl_mask/sl_mask.png b/tests/testdata/control_images/selective_masking/sl_mask/sl_mask.png
diff --git a/tests/testdata/control_images/selective_masking/sl_mask/sl_mask_mask.png b/tests/testdata/control_images/selective_masking/sl_mask/sl_mask_mask.png