Update labeling tests to use engine v2, update expected reference images

qgis · Dec 3, 2019 · 7f4226d · 7f4226d
1 parent 499f240
commit 7f4226d
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 74 deletions.
diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp
@@ -205,7 +205,7 @@ void TestQgsLabelingEngine::setDefaultLabelParams( QgsPalLayerSettings &settings
 QgsLabelingEngineSettings TestQgsLabelingEngine::createLabelEngineSettings()
 {
   QgsLabelingEngineSettings settings;
-  settings.setPlacementVersion( QgsLabelingEngineSettings::PlacementEngineVersion1 );
+  settings.setPlacementVersion( QgsLabelingEngineSettings::PlacementEngineVersion2 );
   return settings;
 }
 

diff --git a/tests/src/python/test_qgspallabeling_base.py b/tests/src/python/test_qgspallabeling_base.py
@@ -127,7 +127,9 @@ def setUp(self):
     @classmethod
     def setDefaultEngineSettings(cls):
         """Restore default settings for pal labeling"""
-        cls._MapSettings.setLabelingEngineSettings(QgsLabelingEngineSettings())
+        settings = QgsLabelingEngineSettings()
+        settings.setPlacementVersion(QgsLabelingEngineSettings.PlacementEngineVersion2)
+        cls._MapSettings.setLabelingEngineSettings(settings)
 
     @classmethod
     def removeAllLayers(cls):

diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py
diff --git a/...le_factor_greater_equal/sp_line_line_obstacle_obstacle_factor_greater_equal.png b/...le_factor_greater_equal/sp_line_line_obstacle_obstacle_factor_greater_equal.png
diff --git a/...ne_obstacle_obstacle_factor_less/sp_line_line_obstacle_obstacle_factor_less.png b/...ne_obstacle_obstacle_factor_less/sp_line_line_obstacle_obstacle_factor_less.png
diff --git a/...e_factor_greater_equal/sp_line_point_obstacle_obstacle_factor_greater_equal.png b/...e_factor_greater_equal/sp_line_point_obstacle_obstacle_factor_greater_equal.png
diff --git a/...t_obstacle_obstacle_factor_less/sp_line_point_obstacle_obstacle_factor_less.png b/...t_obstacle_obstacle_factor_less/sp_line_point_obstacle_obstacle_factor_less.png
diff --git a/...factor_greater_equal/sp_line_polygon_obstacle_obstacle_factor_greater_equal.png b/...factor_greater_equal/sp_line_polygon_obstacle_obstacle_factor_greater_equal.png
diff --git a/...obstacle_obstacle_factor_less/sp_line_polygon_obstacle_obstacle_factor_less.png b/...obstacle_obstacle_factor_less/sp_line_polygon_obstacle_obstacle_factor_less.png
diff --git a/...e_factor_greater_equal/sp_point_line_obstacle_obstacle_factor_greater_equal.png b/...e_factor_greater_equal/sp_point_line_obstacle_obstacle_factor_greater_equal.png
diff --git a/...e_obstacle_obstacle_factor_less/sp_point_line_obstacle_obstacle_factor_less.png b/...e_obstacle_obstacle_factor_less/sp_point_line_obstacle_obstacle_factor_less.png
diff --git a/..._factor_greater_equal/sp_point_point_obstacle_obstacle_factor_greater_equal.png b/..._factor_greater_equal/sp_point_point_obstacle_obstacle_factor_greater_equal.png
diff --git a/..._obstacle_obstacle_factor_less/sp_point_point_obstacle_obstacle_factor_less.png b/..._obstacle_obstacle_factor_less/sp_point_point_obstacle_obstacle_factor_less.png
diff --git a/...actor_greater_equal/sp_point_polygon_obstacle_obstacle_factor_greater_equal.png b/...actor_greater_equal/sp_point_polygon_obstacle_obstacle_factor_greater_equal.png
diff --git a/...bstacle_obstacle_factor_less/sp_point_polygon_obstacle_obstacle_factor_less.png b/...bstacle_obstacle_factor_less/sp_point_polygon_obstacle_obstacle_factor_less.png
diff --git a/...factor_greater_equal/sp_polygon_line_obstacle_obstacle_factor_greater_equal.png b/...factor_greater_equal/sp_polygon_line_obstacle_obstacle_factor_greater_equal.png
diff --git a/...obstacle_obstacle_factor_less/sp_polygon_line_obstacle_obstacle_factor_less.png b/...obstacle_obstacle_factor_less/sp_polygon_line_obstacle_obstacle_factor_less.png
diff --git a/...actor_greater_equal/sp_polygon_point_obstacle_obstacle_factor_greater_equal.png b/...actor_greater_equal/sp_polygon_point_obstacle_obstacle_factor_greater_equal.png
diff --git a/...bstacle_obstacle_factor_less/sp_polygon_point_obstacle_obstacle_factor_less.png b/...bstacle_obstacle_factor_less/sp_polygon_point_obstacle_obstacle_factor_less.png
diff --git a/...tor_greater_equal/sp_polygon_polygon_obstacle_obstacle_factor_greater_equal.png b/...tor_greater_equal/sp_polygon_polygon_obstacle_obstacle_factor_greater_equal.png
diff --git a/...tacle_obstacle_factor_less/sp_polygon_polygon_obstacle_obstacle_factor_less.png b/...tacle_obstacle_factor_less/sp_polygon_polygon_obstacle_obstacle_factor_less.png