sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make tests completely independant, by recreating all layers and tool between tests

Browse Source 
(cherry picked from commit 73a824582c044dc69011b6fdf271a9d15cb866e4)
This commit is contained in:
Nyall Dawson 2025-09-03 10:54:10 +10:00
parent 3d9ac99b9f
commit 6f4dc82432
No known key found for this signature in database
GPG Key ID: AEA7D60D3DF12896
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
tests/src/app/testqgsvertextool.cpp
View File

@ -158,15 +158,15 @@ class TestQgsVertexTool : public QObject
QgisApp *mQgisApp = nullptr;
QgsAdvancedDigitizingDockWidget *mAdvancedDigitizingDockWidget = nullptr;
QgsVertexTool *mVertexTool = nullptr;
QgsVectorLayer *mLayerLine = nullptr;
QgsVectorLayer *mLayerMultiLine = nullptr;
QgsVectorLayer *mLayerPolygon = nullptr;
QgsVectorLayer *mLayerMultiPolygon = nullptr;
QgsVectorLayer *mLayerPoint = nullptr;
QgsVectorLayer *mLayerPointZ = nullptr;
QgsVectorLayer *mLayerLineZ = nullptr;
QgsVectorLayer *mLayerCompoundCurve = nullptr;
QgsVectorLayer *mLayerLineReprojected = nullptr;
QPointer< QgsVectorLayer > mLayerLine;
QPointer< QgsVectorLayer > mLayerMultiLine;
QPointer< QgsVectorLayer > mLayerPolygon;
QPointer< QgsVectorLayer > mLayerMultiPolygon;
QPointer< QgsVectorLayer > mLayerPoint;
QPointer< QgsVectorLayer > mLayerPointZ;
QPointer< QgsVectorLayer > mLayerLineZ;
QPointer< QgsVectorLayer > mLayerCompoundCurve;
QPointer< QgsVectorLayer > mLayerLineReprojected;
QgsFeatureId mFidLineZF1 = 0;
QgsFeatureId mFidLineZF2 = 0;
QgsFeatureId mFidLineZF3 = 0;
@ -208,13 +208,10 @@ void TestQgsVertexTool::initTestCase()
QCOMPARE( mFake27700.authid(), QString() );
mQgisApp = new QgisApp();
}
mCanvas = new QgsMapCanvas();
mCanvas->setDestinationCrs( mFake27700 );
mAdvancedDigitizingDockWidget = new QgsAdvancedDigitizingDockWidget( mCanvas );
void TestQgsVertexTool::init()
{
// make testing layers
mLayerLine = new QgsVectorLayer( QStringLiteral( "LineString?" ), QStringLiteral( "layer line" ), QStringLiteral( "memory" ) );
mLayerLine->setCrs( mFake27700 );
@ -244,37 +241,7 @@ void TestQgsVertexTool::initTestCase()
mLayerCompoundCurve->setCrs( mFake27700 );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerLine << mLayerMultiLine << mLayerPolygon << mLayerMultiPolygon << mLayerPoint << mLayerPointZ << mLayerLineZ << mLayerCompoundCurve );
mCanvas->setFrameStyle( QFrame::NoFrame );
mCanvas->resize( 512, 512 );
mCanvas->setExtent( QgsRectangle( 0, 0, 8, 8 ) );
mCanvas->show(); // to make the canvas resize
mCanvas->hide();
QCOMPARE( mCanvas->mapSettings().outputSize(), QSize( 512, 512 ) );
QCOMPARE( mCanvas->mapSettings().visibleExtent(), QgsRectangle( 0, 0, 8, 8 ) );
mCanvas->setLayers( QList<QgsMapLayer *>() << mLayerLine << mLayerMultiLine << mLayerLineReprojected << mLayerPolygon << mLayerMultiPolygon << mLayerPoint << mLayerPointZ << mLayerLineZ << mLayerCompoundCurve );
QgsMapCanvasSnappingUtils *snappingUtils = new QgsMapCanvasSnappingUtils( mCanvas, this );
mCanvas->setSnappingUtils( snappingUtils );
snappingUtils->locatorForLayer( mLayerLine )->init();
snappingUtils->locatorForLayer( mLayerMultiLine )->init();
snappingUtils->locatorForLayer( mLayerLineReprojected )->init();
snappingUtils->locatorForLayer( mLayerPolygon )->init();
snappingUtils->locatorForLayer( mLayerMultiPolygon )->init();
snappingUtils->locatorForLayer( mLayerPoint )->init();
snappingUtils->locatorForLayer( mLayerPointZ )->init();
snappingUtils->locatorForLayer( mLayerLineZ )->init();
snappingUtils->locatorForLayer( mLayerCompoundCurve )->init();
// create vertex tool
mVertexTool = new QgsVertexTool( mCanvas, mAdvancedDigitizingDockWidget );
mCanvas->setMapTool( mVertexTool );
}
void TestQgsVertexTool::init()
{
QgsFeature lineF1;
lineF1.setGeometry( QgsGeometry::fromWkt( "LineString (2 1, 1 1, 1 3)" ) );
@ -372,9 +339,41 @@ void TestQgsVertexTool::init()
QCOMPARE( mLayerCompoundCurve->undoStack()->index(), 2 );
QgsProject::instance()->setTopologicalEditing( false );
mCanvas = new QgsMapCanvas();
mCanvas->setDestinationCrs( mFake27700 );
mAdvancedDigitizingDockWidget = new QgsAdvancedDigitizingDockWidget( mCanvas );
mCanvas->setFrameStyle( QFrame::NoFrame );
mCanvas->resize( 512, 512 );
mCanvas->setExtent( QgsRectangle( 0, 0, 8, 8 ) );
mCanvas->show(); // to make the canvas resize
mCanvas->hide();
QCOMPARE( mCanvas->mapSettings().outputSize(), QSize( 512, 512 ) );
QCOMPARE( mCanvas->mapSettings().visibleExtent(), QgsRectangle( 0, 0, 8, 8 ) );
mCanvas->setLayers( QList<QgsMapLayer *>() << mLayerLine << mLayerMultiLine << mLayerLineReprojected << mLayerPolygon << mLayerMultiPolygon << mLayerPoint << mLayerPointZ << mLayerLineZ << mLayerCompoundCurve );
QgsMapCanvasSnappingUtils *snappingUtils = new QgsMapCanvasSnappingUtils( mCanvas, this );
mCanvas->setSnappingUtils( snappingUtils );
snappingUtils->locatorForLayer( mLayerLine )->init();
snappingUtils->locatorForLayer( mLayerMultiLine )->init();
snappingUtils->locatorForLayer( mLayerLineReprojected )->init();
snappingUtils->locatorForLayer( mLayerPolygon )->init();
snappingUtils->locatorForLayer( mLayerMultiPolygon )->init();
snappingUtils->locatorForLayer( mLayerPoint )->init();
snappingUtils->locatorForLayer( mLayerPointZ )->init();
snappingUtils->locatorForLayer( mLayerLineZ )->init();
snappingUtils->locatorForLayer( mLayerCompoundCurve )->init();
// create vertex tool
mVertexTool = new QgsVertexTool( mCanvas, mAdvancedDigitizingDockWidget );
mCanvas->setMapTool( mVertexTool );
QgsSnappingConfig cfg = mCanvas->snappingUtils()->config();
cfg.setEnabled( false );
mCanvas->snappingUtils()->setConfig( cfg );
@ -391,6 +390,8 @@ void TestQgsVertexTool::cleanup()
mLayerPointZ->rollBack();
mLayerLineZ->rollBack();
mLayerCompoundCurve->rollBack();
QgsProject::instance()->clear();
}
//runs after all tests
@ -549,6 +550,8 @@ void TestQgsVertexTool::testMoveVertex()
mouseClick( 2, 1, Qt::LeftButton );
mouseClick( 2, 2, Qt::LeftButton );
QCOMPARE( mLayerLine->undoStack()->count(), 2 );
QCOMPARE( mLayerLine->undoStack()->index(), 2 );
QCOMPARE( mLayerLine->getFeature( mFidLineF1 ).geometry(), QgsGeometry::fromWkt( "LINESTRING(2 2, 1 1, 1 3)" ) );