@@ -981,20 +981,21 @@ QgsFeaturePool *TestQgsGeometryChecks::createFeaturePool( QgsVectorLayer *layer,
981
981
QgsGeometryCheckerContext *TestQgsGeometryChecks::createTestContext ( QTemporaryDir &tempDir, QMap<QString, QString> &layers, const QString &mapCrs, double prec ) const
982
982
{
983
983
QDir testDataDir ( QDir ( TEST_DATA_DIR ).absoluteFilePath ( " geometry_checker" ) );
984
+ QDir tmpDir ( tempDir.path () );
984
985
985
986
QMap<QString, QgsFeaturePool *> featurePools;
986
987
for ( const QString &layerFile : layers.keys () )
987
988
{
988
- QFile ( testDataDir.absoluteFilePath ( layerFile ) ).copy ( tempDir. filePath ( layerFile ) );
989
+ QFile ( testDataDir.absoluteFilePath ( layerFile ) ).copy ( tmpDir. absoluteFilePath ( layerFile ) );
989
990
if ( layerFile.endsWith ( " .shp" , Qt::CaseInsensitive ) )
990
991
{
991
992
QString baseName = QFileInfo ( layerFile ).baseName ();
992
- QFile ( testDataDir.absoluteFilePath ( baseName + " .dbf" ) ).copy ( tempDir. filePath ( baseName + " .dbf" ) );
993
- QFile ( testDataDir.absoluteFilePath ( baseName + " .pri" ) ).copy ( tempDir. filePath ( baseName + " .pri" ) );
994
- QFile ( testDataDir.absoluteFilePath ( baseName + " .qpj" ) ).copy ( tempDir. filePath ( baseName + " .qpj" ) );
995
- QFile ( testDataDir.absoluteFilePath ( baseName + " .shx" ) ).copy ( tempDir. filePath ( baseName + " .shx" ) );
993
+ QFile ( testDataDir.absoluteFilePath ( baseName + " .dbf" ) ).copy ( tmpDir. absoluteFilePath ( baseName + " .dbf" ) );
994
+ QFile ( testDataDir.absoluteFilePath ( baseName + " .pri" ) ).copy ( tmpDir. absoluteFilePath ( baseName + " .pri" ) );
995
+ QFile ( testDataDir.absoluteFilePath ( baseName + " .qpj" ) ).copy ( tmpDir. absoluteFilePath ( baseName + " .qpj" ) );
996
+ QFile ( testDataDir.absoluteFilePath ( baseName + " .shx" ) ).copy ( tmpDir. absoluteFilePath ( baseName + " .shx" ) );
996
997
}
997
- QgsVectorLayer *layer = new QgsVectorLayer ( tempDir. filePath ( layerFile ), layerFile );
998
+ QgsVectorLayer *layer = new QgsVectorLayer ( tmpDir. absoluteFilePath ( layerFile ), layerFile );
998
999
Q_ASSERT ( layer && layer->isValid () );
999
1000
layers[layerFile] = layer->id ();
1000
1001
layer->dataProvider ()->enterUpdateMode ();
0 commit comments