Skip to content

Commit

Permalink
fix(testprocessingfixgeometry): removed unneeded temporary containers…
Browse files Browse the repository at this point in the history 
… and auto keywords
  • Loading branch information
@Djedouas
Djedouas committed Dec 5, 2024
1 parent 74cb4fb commit 07d1492
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions tests/src/analysis/testqgsprocessingfixgeometry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,26 @@ void TestQgsProcessingFixGeometry::fixAngleAlg()
QCOMPARE( outputLayer->featureCount(), sourceLayer->featureCount() );
QCOMPARE( reportLayer->featureCount(), reportList.count() );
int idx = 1;
for ( QString expectedReport : reportList )
for ( const QString &expectedReport : reportList )
{
const QgsFeature reportFeature = reportLayer->getFeature( idx );
QCOMPARE( reportFeature.attribute( "report" ), expectedReport );
idx++;
}

// Verification of vertex number
for ( auto fid : finalVertexCount.keys() )
for ( auto it = finalVertexCount.constBegin(); it != finalVertexCount.constEnd(); ++it )
{
int nbVertices = 0;
QgsFeature feat;
outputLayer->getFeatures( QgsFeatureRequest( QString( "\"fid\" = %1" ).arg( fid ) ) ).nextFeature( feat );
auto vit = feat.geometry().vertices();
outputLayer->getFeatures( QgsFeatureRequest( QString( "\"fid\" = %1" ).arg( it.key() ) ) ).nextFeature( feat );
QgsVertexIterator vit = feat.geometry().vertices();
while ( vit.hasNext() )
{
vit.next();
nbVertices++;
}
QCOMPARE( nbVertices, finalVertexCount.value( fid ) );
QCOMPARE( nbVertices, it.value() );
}
}

Expand Down Expand Up @@ -229,7 +229,7 @@ void TestQgsProcessingFixGeometry::fixAreaAlg()

const QDir testDataDir( QDir( TEST_DATA_DIR ).absoluteFilePath( "geometry_checker" ) );
QgsVectorLayer sourceLayer = QgsVectorLayer( testDataDir.absoluteFilePath( "polygon_layer.shp" ), QStringLiteral( "polygons" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "merge_polygons.gpkg|layername=errors_layer" ), QStringLiteral( "" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "merge_polygons.gpkg|layername=errors_layer" ), QString(), QStringLiteral( "ogr" ) );
QFETCH( QStringList, reportList );
QFETCH( int, method );

Expand Down Expand Up @@ -267,7 +267,7 @@ void TestQgsProcessingFixGeometry::fixAreaAlg()
QCOMPARE( outputLayer->featureCount(), 21 );
QCOMPARE( reportLayer->featureCount(), reportList.count() );
int idx = 1;
for ( QString expectedReport : reportList )
for ( const QString &expectedReport : reportList )
{
const QgsFeature reportFeature = reportLayer->getFeature( idx );
QCOMPARE( reportFeature.attribute( "report" ), expectedReport );
Expand All @@ -279,10 +279,10 @@ void TestQgsProcessingFixGeometry::fixHoleAlg()
{
const QDir testDataDir( QDir( TEST_DATA_DIR ).absoluteFilePath( "geometry_checker" ) );
QgsVectorLayer sourceLayer = QgsVectorLayer( testDataDir.absoluteFilePath( "polygon_layer.shp" ), QStringLiteral( "polygons" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "remove_hole.gpkg|layername=errors_layer" ), QStringLiteral( "" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "remove_hole.gpkg|layername=errors_layer" ), QString(), QStringLiteral( "ogr" ) );
QVERIFY( sourceLayer.isValid() );
QVERIFY( errorsLayer.isValid() );
const auto reportList = QStringList() << QStringLiteral( "Remove hole" );
const QStringList reportList = QStringList() << QStringLiteral( "Remove hole" );

const std::unique_ptr< QgsProcessingAlgorithm > alg(
QgsApplication::processingRegistry()->createAlgorithmById( QStringLiteral( "native:fixgeometryhole" ) )
Expand Down Expand Up @@ -312,7 +312,7 @@ void TestQgsProcessingFixGeometry::fixHoleAlg()
QCOMPARE( outputLayer->featureCount(), 25 );
QCOMPARE( reportLayer->featureCount(), reportList.count() );
int idx = 1;
for ( QString expectedReport : reportList )
for ( const QString &expectedReport : reportList )
{
const QgsFeature reportFeature = reportLayer->getFeature( idx );
QCOMPARE( reportFeature.attribute( "report" ), expectedReport );
Expand All @@ -324,15 +324,15 @@ void TestQgsProcessingFixGeometry::fixMissingVertexAlg()
{
const QDir testDataDir( QDir( TEST_DATA_DIR ).absoluteFilePath( "geometry_checker" ) );
QgsVectorLayer sourceLayer = QgsVectorLayer( testDataDir.absoluteFilePath( "missing_vertex.gpkg|layername=missing_vertex" ), QStringLiteral( "polygons" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "add_missing_vertex.gpkg|layername=errors_layer" ), QStringLiteral( "" ), QStringLiteral( "ogr" ) );
QgsVectorLayer errorsLayer = QgsVectorLayer( mDataDir.absoluteFilePath( "add_missing_vertex.gpkg|layername=errors_layer" ), QString(), QStringLiteral( "ogr" ) );
QVERIFY( sourceLayer.isValid() );
QVERIFY( errorsLayer.isValid() );
const auto reportList = QStringList()
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" );
const QStringList reportList = QStringList()
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" )
<< QStringLiteral( "Add missing vertex" );

const std::unique_ptr< QgsProcessingAlgorithm > alg(
QgsApplication::processingRegistry()->createAlgorithmById( QStringLiteral( "native:fixgeometrymissingvertex" ) )
Expand Down Expand Up @@ -362,7 +362,7 @@ void TestQgsProcessingFixGeometry::fixMissingVertexAlg()
QCOMPARE( outputLayer->featureCount(), 6 );
QCOMPARE( reportLayer->featureCount(), reportList.count() );
int idx = 1;
for ( QString expectedReport : reportList )
for ( const QString &expectedReport : reportList )
{
const QgsFeature reportFeature = reportLayer->getFeature( idx );
QCOMPARE( reportFeature.attribute( "report" ), expectedReport );
Expand Down

0 comments on commit 07d1492

Please sign in to comment.