Add some missing exitQgis() calls to unit tests

Also ensure that compositions are deleted before exiting Qgis during tests.
qgis · Dec 1, 2014 · 118a9f6 · 118a9f6
1 parent 4fde34a
commit 118a9f6
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 3 deletions.
diff --git a/tests/src/core/regression1141.cpp b/tests/src/core/regression1141.cpp
@@ -88,6 +88,7 @@ void Regression1141::cleanupTestCase()
   //
   // Runs after all tests are done
   //
+  QgsApplication::exitQgis();
 }
 
 

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

diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -72,6 +72,7 @@ void TestQgsComposerHtml::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerHtml::init()

diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp
@@ -88,6 +88,7 @@ void TestQgsComposerPaper::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerPaper::init()

diff --git a/tests/src/core/testqgscomposerpicture.cpp b/tests/src/core/testqgscomposerpicture.cpp
@@ -97,6 +97,7 @@ void TestQgsComposerPicture::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerPicture::init()

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

diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp
@@ -83,6 +83,7 @@ void TestQgsComposerShapes::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerShapes::init()

diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp
@@ -130,6 +130,7 @@ void TestQgsComposerTableV2::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposerTableV2::init()

diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp
@@ -84,10 +84,10 @@ void TestQgsComposerUtils::initTestCase()
 
 void TestQgsComposerUtils::cleanupTestCase()
 {
-  QgsApplication::exitQgis();
-
   delete mComposition;
 
+  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/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp
@@ -75,6 +75,7 @@ void TestQgsComposition::cleanupTestCase()
     myQTextStream << mReport;
     myFile.close();
   }
+  QgsApplication::exitQgis();
 }
 
 void TestQgsComposition::init()

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()
     {
+      delete mComposition;
       QgsApplication::exitQgis();
       QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
       QFile myFile( myReportFile );

diff --git a/tests/src/core/testqgsdiagramexpression.cpp b/tests/src/core/testqgsdiagramexpression.cpp
@@ -114,7 +114,6 @@ 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 ) )
@@ -127,6 +126,7 @@ class TestQgsDiagramExpression: public QObject
       delete mComposerMap;
       delete mComposition;
       // delete mPointsLayer;
+      QgsApplication::exitQgis();
     }
 
     void init() {} // will be called before each testfunction is executed.

diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp
@@ -95,6 +95,7 @@ void TestStyleV2::cleanupTestCase()
   // don't save
   // mStyle->save();
   delete mStyle;
+  QgsApplication::exitQgis();
 }
 
 bool TestStyleV2::testValidColor( QgsVectorColorRampV2 *ramp, double value, QColor expected )

diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
@@ -163,6 +163,7 @@ class TestQgsVectorLayer: public QObject
         myFile.close();
         //QDesktopServices::openUrl( "file:///" + myReportFile );
       }
+      QgsApplication::exitQgis();
 
     }
     void init() {};// will be called before each testfunction is executed.

diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
@@ -51,6 +51,7 @@ void TestQgsScaleComboBox::initTestCase()
 void TestQgsScaleComboBox::cleanupTestCase()
 {
   delete s;
+  QgsApplication::exitQgis();
 };
 
 void TestQgsScaleComboBox::init()