Fix tests

qgis · Dec 3, 2019 · 316fd50 · 316fd50
1 parent 9f63f49
commit 316fd50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/tests/src/core/testqgsmaprendererjob.cpp b/tests/src/core/testqgsmaprendererjob.cpp
@@ -767,6 +767,7 @@ void TestQgsMapRendererJob::stagedRendererWithStagedLabeling()
   settings.fieldName = QStringLiteral( "Name" );
   settings.placement = QgsPalLayerSettings::OverPoint;
   settings.zIndex = 2;
+  settings.obstacleSettings().setType( QgsLabelObstacleSettings::PolygonInterior );
   polygonsLayer->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );
   polygonsLayer->setLabelsEnabled( true );
 

diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py
@@ -622,6 +622,7 @@ def test_polygon_polygon_obstacle_obstacle_factor_greater_equal(self):
                 obstacle_label_settings.obstacle = True
                 obstacle_label_settings.drawLabels = False
                 obstacle_label_settings.obstacleFactor = obstacle_weight * 0.2
+                obstacle_label_settings.obstacleSettings().setType(QgsLabelObstacleSettings.PolygonInterior)
                 obstacleLayer.setLabeling(QgsVectorLayerSimpleLabeling(obstacle_label_settings))
                 obstacleLayer.setLabelsEnabled(True)
 
@@ -645,6 +646,7 @@ def test_polygon_polygon_obstacle_obstacle_factor_less(self):
                 obstacle_label_settings.obstacle = True
                 obstacle_label_settings.drawLabels = False
                 obstacle_label_settings.obstacleFactor = obstacle_weight * 0.2
+                obstacle_label_settings.obstacleSettings().setType(QgsLabelObstacleSettings.PolygonInterior)
                 obstacleLayer.setLabeling(QgsVectorLayerSimpleLabeling(obstacle_label_settings))
                 obstacleLayer.setLabelsEnabled(True)