More test updates

qgis · Dec 26, 2019 · 322eb31 · 322eb31
1 parent f44c229
commit 322eb31
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 9 deletions.
diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp
@@ -25,7 +25,7 @@
 #include <qgsvectorlayerdiagramprovider.h>
 #include <qgsvectorlayerlabeling.h>
 #include <qgsvectorlayerlabelprovider.h>
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 #include "qgsfontutils.h"
 #include "qgsnullsymbolrenderer.h"
 #include "pointset.h"
@@ -770,7 +770,7 @@ bool TestQgsLabelingEngine::imageCheck( const QString &testName, QImage &image,
 {
   //draw background
   QImage imageWithBackground( image.width(), image.height(), QImage::Format_RGB32 );
-  QgsRenderChecker::drawBackground( &imageWithBackground );
+  QgsMultiRenderChecker::drawBackground( &imageWithBackground );
   QPainter painter( &imageWithBackground );
   painter.drawImage( 0, 0, image );
   painter.end();
@@ -779,12 +779,12 @@ bool TestQgsLabelingEngine::imageCheck( const QString &testName, QImage &image,
   QString tempDir = QDir::tempPath() + '/';
   QString fileName = tempDir + testName + ".png";
   imageWithBackground.save( fileName, "PNG" );
-  QgsRenderChecker checker;
+  QgsMultiRenderChecker checker;
   checker.setControlPathPrefix( QStringLiteral( "labelingengine" ) );
   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;
 }
@@ -2173,7 +2173,7 @@ void TestQgsLabelingEngine::curvedOverrun()
   QImage img = job.renderedImage();
   QVERIFY( imageCheck( QStringLiteral( "label_curved_no_overrun" ), img, 20 ) );
 
-  settings.overrunDistance = 10;
+  settings.overrunDistance = 11;
   vl2->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );  // TODO: this should not be necessary!
   vl2->setLabelsEnabled( true );
   QgsMapRendererSequentialJob job2( mapSettings );

diff --git a/tests/src/core/testqgsmaprendererjob.cpp b/tests/src/core/testqgsmaprendererjob.cpp
@@ -45,7 +45,7 @@
 #include "qgssinglesymbolrenderer.h"
 
 //qgs unit test utility class
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 
 /**
  * \ingroup UnitTests

diff --git a/tests/src/core/testqgsmaprotation.cpp b/tests/src/core/testqgsmaprotation.cpp
@@ -32,7 +32,7 @@
 #include "qgsvectorlayerlabeling.h"
 
 //qgis unit test includes
-#include <qgsrenderchecker.h>
+#include "qgsmultirenderchecker.h"
 
 /**
  * \ingroup UnitTests
@@ -222,7 +222,7 @@ bool TestQgsMapRotation::render( const QString &testType )
 {
   mReport += "<h2>" + testType + "</h2>\n";
   mMapSettings->setOutputDpi( 96 );
-  QgsRenderChecker checker;
+  QgsMultiRenderChecker checker;
   checker.setControlPathPrefix( QStringLiteral( "maprotation" ) );
   checker.setControlName( "expected_" + testType );
   checker.setMapSettings( *mMapSettings );

diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py
@@ -553,7 +553,7 @@ def test_wms_getmap_transparent(self):
         self._img_diff_error(r, h, "WMS_GetMap_Transparent")
 
     def test_wms_getmap_labeling_settings(self):
-        # Test the `DrawRectOnly` option with 1 candidate (`CandidatesPolygon`).
+        # Test the `DrawRectOnly` option
         # May fail if the labeling position engine is tweaked.
 
         d = unitTestDataPath('qgis_server_accesscontrol') + '/'

diff --git a/...1/expected_label_curved_label_above_1.png → ...1/expected_label_curved_label_above_1.png b/...1/expected_label_curved_label_above_1.png → ...1/expected_label_curved_label_above_1.png
diff --git a/.../expected_label_curved_label_above_1/v2/expected_label_curved_label_above_1.png b/.../expected_label_curved_label_above_1/v2/expected_label_curved_label_above_1.png
diff --git a/...1/expected_label_curved_label_below_1.png → ...1/expected_label_curved_label_below_1.png b/...1/expected_label_curved_label_below_1.png → ...1/expected_label_curved_label_below_1.png
diff --git a/.../expected_label_curved_label_below_1/v2/expected_label_curved_label_below_1.png b/.../expected_label_curved_label_below_1/v2/expected_label_curved_label_below_1.png
diff --git a/...curved_label_small_segments/expected_label_curved_label_small_segments_mask.png b/...curved_label_small_segments/expected_label_curved_label_small_segments_mask.png
diff --git a/...label_curved_negative_distance/expected_label_curved_negative_distance_mask.png b/...label_curved_negative_distance/expected_label_curved_negative_distance_mask.png
diff --git a/...overrun/expected_label_curved_overrun.png → ...rrun/v1/expected_label_curved_overrun.png b/...overrun/expected_label_curved_overrun.png → ...rrun/v1/expected_label_curved_overrun.png
diff --git a/...belingengine/expected_label_curved_overrun/v2/expected_label_curved_overrun.png b/...belingengine/expected_label_curved_overrun/v2/expected_label_curved_overrun.png
diff --git a/...ed_small_feature_centered/expected_label_curved_small_feature_centered_mask.png b/...ed_small_feature_centered/expected_label_curved_small_feature_centered_mask.png
diff --git a/...multipart_touching_branches/expected_label_multipart_touching_branches_mask.png b/...multipart_touching_branches/expected_label_multipart_touching_branches_mask.png
diff --git a/...label_multipart_touching_lines/expected_label_multipart_touching_lines_mask.png b/...label_multipart_touching_lines/expected_label_multipart_touching_lines_mask.png
diff --git a/...istance_with_small_line/expected_label_repeat_distance_with_small_line_mask.png b/...istance_with_small_line/expected_label_repeat_distance_with_small_line_mask.png
diff --git a/...eling_rotation_based_orientation_line.png → ...eling_rotation_based_orientation_line.png b/...eling_rotation_based_orientation_line.png → ...eling_rotation_based_orientation_line.png
diff --git a/...based_orientation_line/v2/expected_labeling_rotation_based_orientation_line.png b/...based_orientation_line/v2/expected_labeling_rotation_based_orientation_line.png
diff --git a/...ngengine/expected_parallel_prefer_above/expected_parallel_prefer_above_mask.png b/...ngengine/expected_parallel_prefer_above/expected_parallel_prefer_above_mask.png
diff --git a/...ted_staged_render_lines_staged_labels.png → ...ted_staged_render_lines_staged_labels.png b/...ted_staged_render_lines_staged_labels.png → ...ted_staged_render_lines_staged_labels.png
diff --git a/...ed_render_lines_staged_labels/v2/expected_staged_render_lines_staged_labels.png b/...ed_render_lines_staged_labels/v2/expected_staged_render_lines_staged_labels.png
diff --git a/...l+45/expected_lines-parallel-label+45.png → ...5/v1/expected_lines-parallel-label+45.png b/...l+45/expected_lines-parallel-label+45.png → ...5/v1/expected_lines-parallel-label+45.png
diff --git a/...expected_lines-parallel-label+45_mask.png → ...expected_lines-parallel-label+45_mask.png b/...expected_lines-parallel-label+45_mask.png → ...expected_lines-parallel-label+45_mask.png
diff --git a/...tation/expected_lines-parallel-label+45/v2/expected_lines-parallel-label+45.png b/...tation/expected_lines-parallel-label+45/v2/expected_lines-parallel-label+45.png
diff --git a/...es/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings_mask.png b/...es/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings_mask.png