More reference images and masks for 3d tests

qgis · Apr 2, 2019 · f0994fd · f0994fd
1 parent bdf062a
commit f0994fd
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 3 deletions.
diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include "qgstest.h"
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 
 #include "qgsproject.h"
 #include "qgsrasterlayer.h"
@@ -208,12 +208,12 @@ bool TestQgs3DRendering::renderCheck( const QString &testName, QImage &image, in
   QString myTmpDir = QDir::tempPath() + '/';
   QString myFileName = myTmpDir + testName + ".png";
   image.save( myFileName, "PNG" );
-  QgsRenderChecker myChecker;
+  QgsMultiRenderChecker myChecker;
   myChecker.setControlPathPrefix( QStringLiteral( "3d" ) );
   myChecker.setControlName( "expected_" + testName );
   myChecker.setRenderedImage( myFileName );
   myChecker.setColorTolerance( 2 );  // color tolerance < 2 was failing polygon3d_extrusion test
-  bool myResultFlag = myChecker.compareImages( testName, mismatchCount );
+  bool myResultFlag = myChecker.runTest( testName, mismatchCount );
   mReport += myChecker.report();
   return myResultFlag;
 }

diff --git a/...stdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1_mask.png b/...stdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1_mask.png
diff --git a/tests/testdata/control_images/3d/expected_mesh3d/default/expected_mesh3d.png b/tests/testdata/control_images/3d/expected_mesh3d/default/expected_mesh3d.png
diff --git a/tests/testdata/control_images/3d/expected_mesh3d/fedora/expected_mesh3d.png b/tests/testdata/control_images/3d/expected_mesh3d/fedora/expected_mesh3d.png
diff --git a/...xtrusion/expected_polygon3d_extrusion.png → .../default/expected_polygon3d_extrusion.png b/...xtrusion/expected_polygon3d_extrusion.png → .../default/expected_polygon3d_extrusion.png
diff --git a/..._images/3d/expected_polygon3d_extrusion/fedora/expected_polygon3d_extrusion.png b/..._images/3d/expected_polygon3d_extrusion/fedora/expected_polygon3d_extrusion.png
diff --git a/tests/testdata/control_images/3d/expected_rulebased/default/expected_rulebased.png b/tests/testdata/control_images/3d/expected_rulebased/default/expected_rulebased.png
diff --git a/tests/testdata/control_images/3d/expected_rulebased/fedora/expected_rulebased.png b/tests/testdata/control_images/3d/expected_rulebased/fedora/expected_rulebased.png