update tests

qgis · Jan 23, 2023 · 1f891c5 · 1f891c5
1 parent f2067ab
commit 1f891c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
@@ -1227,8 +1227,6 @@ void TestQgs3DRendering::testBillboardRendering()
 
 void TestQgs3DRendering::testEpsg4978LineRendering()
 {
-  const QgsRectangle fullExtent( 0, 0, 1000, 1000 );
-
   QgsProject p;
 
   QgsCoordinateReferenceSystem newCrs( QStringLiteral( "EPSG:4978" ) );
@@ -1244,6 +1242,8 @@ void TestQgs3DRendering::testEpsg4978LineRendering()
   lineSymbol->setMaterialSettings( matSettings.clone() );
   layerLines->setRenderer3D( new QgsVectorLayer3DRenderer( lineSymbol ) );
 
+  const QgsRectangle fullExtent = layerLines->extent();
+
   Qgs3DMapSettings *map = new Qgs3DMapSettings;
   map->setCrs( p.crs() );
   map->setExtent( fullExtent );
@@ -1308,7 +1308,7 @@ void TestQgs3DRendering::testFilteredFlatTerrain()
   Qgs3DUtils::captureSceneImage( engine, scene );
 
   QImage img = Qgs3DUtils::captureSceneImage( engine, scene );
-  renderCheck( "flat_terrain_filtered_1", img, 40 );
+  QVERIFY( renderCheck( "flat_terrain_filtered_1", img, 40 ) );
 
   // Now set the extent to have height > width and redo
   fullExtent = mLayerDtm->extent();
@@ -1353,7 +1353,7 @@ void TestQgs3DRendering::testFilteredDemTerrain()
   Qgs3DUtils::captureSceneImage( engine, scene );
 
   QImage img1 = Qgs3DUtils::captureSceneImage( engine, scene );
-  renderCheck( "dem_terrain_filtered_1", img1, 40 );
+  QVERIFY( renderCheck( "dem_terrain_filtered_1", img1, 40 ) );
 
   // Now set the extent to have height > width and redo
   fullExtent = mLayerDtm->extent();

diff --git a/tests/src/3d/testqgslayout3dmap.cpp b/tests/src/3d/testqgslayout3dmap.cpp
@@ -89,12 +89,11 @@ void TestQgsLayout3DMap::testBasic()
 
   Qgs3DMapSettings *map = new Qgs3DMapSettings;
   map->setCrs( mProject->crs() );
-  map->setOrigin( QgsVector3D( fullExtent.center().x(), fullExtent.center().y(), 0 ) );
+  map->setExtent( fullExtent );
   map->setLayers( QList<QgsMapLayer *>() << mLayerDtm );
 
   QgsFlatTerrainGenerator *flatTerrain = new QgsFlatTerrainGenerator;
   flatTerrain->setCrs( map->crs() );
-  flatTerrain->setExtent( fullExtent );
   map->setTerrainGenerator( flatTerrain );
 
   QgsCameraPose cam;

diff --git a/...expected_polygon3d_extrusion_filtered/expected_polygon3d_extrusion_filtered.png b/...expected_polygon3d_extrusion_filtered/expected_polygon3d_extrusion_filtered.png