Skip to content

Commit

Permalink
Better fix for b847a06
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jul 1, 2015
1 parent f72ae91 commit f3fe29d
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions tests/src/core/testqgsvectorlayercache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,17 @@ void TestVectorLayerCache::initTestCase()

// Backup test shape file and attributes
QStringList backupFiles;
backupFiles << "points.shp" << "points.shx" << "points.dbf";
backupFiles << "points.shp" << "points.shx" << "points.dbf" << "points.prj";

QString myDataDir( TEST_DATA_DIR ); //defined in CmakeLists.txt
QString myTestDataDir = myDataDir + QDir::separator();

foreach ( QString f, backupFiles )
{
QString tmpFileName = QDir::tempPath() + QDir::separator() + f + "_" + QString::number( qApp->applicationPid() );
QString origFileName = myTestDataDir + f;
QFileInfo origFileInfo( origFileName );

QString tmpFileName = QDir::tempPath() + QDir::separator() + origFileInfo.baseName() + "_" + QString::number( qApp->applicationPid() ) + "." + origFileInfo.completeSuffix();

qDebug() << "Copy " << origFileName << " " << tmpFileName;

Expand All @@ -90,7 +92,7 @@ void TestVectorLayerCache::initTestCase()
//
// load a vector layer
//
QString myPointsFileName = myTestDataDir + "points.shp";
QString myPointsFileName = mTmpFiles.value( myTestDataDir + "points.shp" );
QFileInfo myPointFileInfo( myPointsFileName );
mPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
myPointFileInfo.completeBaseName(), "ogr" );
Expand All @@ -111,19 +113,6 @@ void TestVectorLayerCache::cleanup()
//runs after all tests
void TestVectorLayerCache::cleanupTestCase()
{
// Clean added features
if ( mAddedFeatures.length() > 0 )
{
mPointsLayer->startEditing();
foreach ( QgsFeature f, mAddedFeatures )
{
mPointsLayer->deleteFeature( f.id() );
}
mPointsLayer->commitChanges();
mAddedFeatures.clear();
}


delete mPointsLayer;

// Clean tmp files
Expand All @@ -132,8 +121,6 @@ void TestVectorLayerCache::cleanupTestCase()
for ( it = mTmpFiles.constBegin(); it != mTmpFiles.constEnd(); ++it )
{
QString tmpFileName = it.value();
QString origFileName = it.key();

qDebug() << "Remove " << tmpFileName;
QFile::remove( tmpFileName );
}
Expand Down

0 comments on commit f3fe29d

Please sign in to comment.