Fix some race condition segfaults of tests on exit

qgis · Nov 21, 2014 · 95f6483 · 95f6483
1 parent 78c5195
commit 95f6483
Show file tree

Hide file tree

Showing 43 changed files with 109 additions and 25 deletions.
diff --git a/tests/src/analysis/testqgsvectoranalyzer.cpp b/tests/src/analysis/testqgsvectoranalyzer.cpp
@@ -78,7 +78,7 @@ void  TestQgsVectorAnalyzer::initTestCase()
 }
 void  TestQgsVectorAnalyzer::cleanupTestCase()
 {
-
+  QgsApplication::exitQgis();
 }
 void  TestQgsVectorAnalyzer::init()
 {

diff --git a/tests/src/analysis/testqgszonalstatistics.cpp b/tests/src/analysis/testqgszonalstatistics.cpp
@@ -28,7 +28,7 @@ class TestQgsZonalStatistics: public QObject
     Q_OBJECT;
   private slots:
     void initTestCase();
-    void cleanupTestCase() {};
+    void cleanupTestCase();
     void init() {};
     void cleanup() {};
 
@@ -62,6 +62,11 @@ void TestQgsZonalStatistics::initTestCase()
   mRasterPath = myTempPath + "edge_problem.asc";
 }
 
+void TestQgsZonalStatistics::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsZonalStatistics::testStatistics()
 {
   QgsZonalStatistics zs( mVectorLayer, mRasterPath, "", 1 );

diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
@@ -63,6 +63,7 @@ void TestQgisAppClipboard::initTestCase()
 //runs after all tests
 void TestQgisAppClipboard::cleanupTestCase()
 {
+  QgsApplication::exitQgis();
 }
 
 void TestQgisAppClipboard::copyPaste()

diff --git a/tests/src/core/regression992.cpp b/tests/src/core/regression992.cpp
@@ -105,7 +105,7 @@ void Regression992::cleanupTestCase()
     //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
-  delete mpRasterLayer;
+  QgsApplication::exitQgis();
 }
 
 void Regression992::regression992()

diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -30,6 +30,7 @@ class TestQgsApplication: public QObject
     void checkPaths();
     void checkGdalSkip();
     void initTestCase();
+    void cleanupTestCase();
   private:
     QString getQgisPath();
 };
@@ -46,6 +47,11 @@ void TestQgsApplication::initTestCase()
   qDebug( "%s", QgsApplication::showSettings().toUtf8().constData() );
 };
 
+void TestQgsApplication::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsApplication::checkPaths()
 {
   QString myPath = QgsApplication::authorsFilePath();

diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
@@ -112,7 +112,7 @@ void TestQgsBlendModes::initTestCase()
                                       rasterFileInfo.completeBaseName() );
   QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer1->dataProvider(), 2, 3, 4 );
   mRasterLayer1->setRenderer( rasterRenderer );
-  mRasterLayer2->setRenderer( rasterRenderer );
+  mRasterLayer2->setRenderer(( QgsRasterRenderer* ) rasterRenderer->clone() );
   QgsMapLayerRegistry::instance()->addMapLayers(
     QList<QgsMapLayer *>() << mRasterLayer1 );
   QgsMapLayerRegistry::instance()->addMapLayers(
@@ -131,6 +131,8 @@ void TestQgsBlendModes::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsBlendModes::vectorBlending()

diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
@@ -105,7 +105,6 @@ void TestQgsComposerDD::initTestCase()
 void TestQgsComposerDD::cleanupTestCase()
 {
   delete mComposition;
-  delete mVectorLayer;
 
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
@@ -115,6 +114,7 @@ void TestQgsComposerDD::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerDD::init()

diff --git a/tests/src/core/testqgscomposereffects.cpp b/tests/src/core/testqgscomposereffects.cpp
@@ -77,6 +77,8 @@ void TestQgsComposerEffects::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerEffects::init()

diff --git a/tests/src/core/testqgscomposerlabel.cpp b/tests/src/core/testqgscomposerlabel.cpp
@@ -78,7 +78,8 @@ void TestQgsComposerLabel::initTestCase()
 void TestQgsComposerLabel::cleanupTestCase()
 {
   delete mComposition;
-  delete mVectorLayer;
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerLabel::init()

diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp
@@ -76,7 +76,6 @@ void TestQgsComposerMap::initTestCase()
 void TestQgsComposerMap::cleanupTestCase()
 {
   delete mComposition;
-  delete mRasterLayer;
 
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
@@ -86,6 +85,8 @@ void TestQgsComposerMap::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerMap::init()

diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp
@@ -91,6 +91,8 @@ void TestQgsComposerMapGrid::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerMapGrid::init()

diff --git a/tests/src/core/testqgscomposermapoverview.cpp b/tests/src/core/testqgscomposermapoverview.cpp
@@ -80,7 +80,6 @@ void TestQgsComposerMapOverview::initTestCase()
 void TestQgsComposerMapOverview::cleanupTestCase()
 {
   delete mComposition;
-  delete mRasterLayer;
 
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
@@ -90,6 +89,7 @@ void TestQgsComposerMapOverview::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerMapOverview::init()

diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp
@@ -97,10 +97,9 @@ void TestQgsComposerRotation::initTestCase()
 
   mReport = "<h1>Composer Rotation Tests</h1>\n";
 }
+
 void TestQgsComposerRotation::cleanupTestCase()
 {
-  delete mComposition;
-
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
   if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
@@ -109,6 +108,8 @@ void TestQgsComposerRotation::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerRotation::init()

diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp
@@ -101,7 +101,6 @@ void TestQgsComposerScaleBar::initTestCase()
 void TestQgsComposerScaleBar::cleanupTestCase()
 {
   delete mComposition;
-  delete mRasterLayer;
 
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
@@ -111,6 +110,8 @@ void TestQgsComposerScaleBar::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 };
 
 void TestQgsComposerScaleBar::init()

diff --git a/tests/src/core/testqgscomposertable.cpp b/tests/src/core/testqgscomposertable.cpp
@@ -92,7 +92,8 @@ void TestQgsComposerTable::initTestCase()
 void TestQgsComposerTable::cleanupTestCase()
 {
   delete mComposition;
-  delete mVectorLayer;
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerTable::init()

diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp
@@ -84,6 +84,8 @@ void TestQgsComposerUtils::initTestCase()
 
 void TestQgsComposerUtils::cleanupTestCase()
 {
+  QgsApplication::exitQgis();
+
   delete mComposition;
 
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -34,6 +34,7 @@ class TestQgsCoordinateReferenceSystem: public QObject
     Q_OBJECT
   private slots:
     void initTestCase();
+    void cleanupTestCase();
     void wktCtor();
     void idCtor();
     void copyCtor();
@@ -101,6 +102,11 @@ void TestQgsCoordinateReferenceSystem::initTestCase()
 
 }
 
+void TestQgsCoordinateReferenceSystem::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsCoordinateReferenceSystem::wktCtor()
 {
   QString myWkt = GEOWKT;

diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp
@@ -25,6 +25,7 @@ class TestQgsCoordinateTransform: public QObject
 
   private slots:
     void initTestCase();
+    void cleanupTestCase();
     void transformBoundingBox();
 
   private:
@@ -39,6 +40,11 @@ void TestQgsCoordinateTransform::initTestCase()
 
 }
 
+void TestQgsCoordinateTransform::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsCoordinateTransform::transformBoundingBox()
 {
   //test transforming a bounding box which crosses the 180 degree longitude line

diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp
@@ -33,7 +33,7 @@ class TestQgsDataItem: public QObject
 
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
-    void cleanupTestCase();;// will be called after the last testfunction was executed.
+    void cleanupTestCase();// will be called after the last testfunction was executed.
     void init() {};// will be called before each testfunction is executed.
     void cleanup() {};// will be called after every testfunction.
 
@@ -75,6 +75,8 @@ void TestQgsDataItem::cleanupTestCase()
   settings.setValue( "/qgis/scanItemsInBrowser2", mScanItemsSetting );
   if ( mDirItem )
     delete mDirItem;
+
+  QgsApplication::exitQgis();
 }
 
 bool TestQgsDataItem::isValidDirItem( QgsDirectoryItem *item )

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -109,6 +109,7 @@ class TestQgsDiagram: public QObject
     // will be called after the last testfunction was executed.
     void cleanupTestCase()
     {
+      QgsApplication::exitQgis();
       QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
       QFile myFile( myReportFile );
       if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
@@ -118,10 +119,6 @@ class TestQgsDiagram: public QObject
         myFile.close();
         //QDesktopServices::openUrl( "file:///" + myReportFile );
       }
-
-      delete mComposerMap;
-      delete mComposition;
-      delete mPointsLayer;
     }
     void init() {};// will be called before each testfunction is executed.
     void cleanup() {};// will be called after every testfunction.

diff --git a/tests/src/core/testqgsdiagramexpression.cpp b/tests/src/core/testqgsdiagramexpression.cpp
@@ -114,6 +114,7 @@ class TestQgsDiagramExpression: public QObject
     // will be called after the last testfunction was executed.
     void cleanupTestCase()
     {
+      QgsApplication::exitQgis();
       QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
       QFile myFile( myReportFile );
       if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )

diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp
@@ -30,6 +30,7 @@ class TestQgsDistanceArea: public QObject
     Q_OBJECT;
   private slots:
     void initTestCase();
+    void cleanupTestCase();
     void basic();
     void test_distances();
     void unit_conversions();
@@ -46,6 +47,11 @@ void TestQgsDistanceArea::initTestCase()
   QgsApplication::showSettings();
 }
 
+void TestQgsDistanceArea::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsDistanceArea::basic()
 {
   QgsPoint p1( 1.0, 3.0 ), p2( -2.0, -1.0 );

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -59,6 +59,11 @@ class TestQgsExpression: public QObject
       QgsApplication::showSettings();
     }
 
+    void cleanupTestCase()
+    {
+      QgsApplication::exitQgis();
+    }
+
     void parsing_data()
     {
       QTest::addColumn<QString>( "string" );

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -320,6 +320,7 @@ void TestQgsGeometry::cleanupTestCase()
     //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
+  QgsApplication::exitQgis();
 }
 
 // MK, Disabled 14.11.2014

diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp
@@ -128,6 +128,8 @@ void TestQgsGradients::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsGradients::gradientSymbol()

diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp
@@ -101,6 +101,8 @@ void TestQgsInvertedPolygon::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+
+  QgsApplication::exitQgis();
 }
 
 void TestQgsInvertedPolygon::singleSubRenderer()

diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp
@@ -50,7 +50,7 @@ class TestQgsMapLayer: public QObject
     Q_OBJECT;
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
-    void cleanupTestCase() {};// will be called after the last testfunction was executed.
+    void cleanupTestCase();// will be called after the last testfunction was executed.
     void init() {};// will be called before each testfunction is executed.
     void cleanup() {};// will be called after every testfunction.
 
@@ -80,6 +80,11 @@ void TestQgsMapLayer::initTestCase()
                                 myMapFileInfo.completeBaseName(), "ogr" );
 }
 
+void TestQgsMapLayer::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
 void TestQgsMapLayer::isValid()
 {
   QVERIFY( mpLayer->isValid() );

diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
@@ -171,6 +171,8 @@ void TestQgsMapRenderer::initTestCase()
 
 void TestQgsMapRenderer::cleanupTestCase()
 {
+  QgsApplication::exitQgis();
+
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
   if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )

diff --git a/tests/src/core/testqgsrasterfilewriter.cpp b/tests/src/core/testqgsrasterfilewriter.cpp
@@ -74,6 +74,7 @@ void TestQgsRasterFileWriter::initTestCase()
 //runs after all tests
 void TestQgsRasterFileWriter::cleanupTestCase()
 {
+  QgsApplication::exitQgis();
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
   if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )