Add some missing exitQgis() calls to unit tests

nyalldawson · nyalldawson · commit 118a9f63dc61 · 2014-12-01T19:52:04.000+11:00
Also ensure that compositions are deleted before exiting
Qgis during tests.
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()

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ void Regression1141::cleanupTestCase()`
`88`	`88`	`//`
`89`	`89`	`// Runs after all tests are done`
`90`	`90`	`//`
	`91`	`+ QgsApplication::exitQgis();`
`91`	`92`	`}`
`92`	`93`
`93`	`94`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ void TestQgsAtlasComposition::initTestCase()`
`106`	`106`
`107`	`107`	`void TestQgsAtlasComposition::cleanupTestCase()`
`108`	`108`	`{`
	`109`	`+ delete mComposition;`
`109`	`110`	`QgsApplication::exitQgis();`
`110`	`111`
`111`	`112`	`QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ void TestQgsComposerHtml::cleanupTestCase()`
`72`	`72`	`myQTextStream << mReport;`
`73`	`73`	`myFile.close();`
`74`	`74`	`}`
	`75`	`+ QgsApplication::exitQgis();`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`void TestQgsComposerHtml::init()`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ void TestQgsComposerPaper::cleanupTestCase()`
`88`	`88`	`myQTextStream << mReport;`
`89`	`89`	`myFile.close();`
`90`	`90`	`}`
	`91`	`+ QgsApplication::exitQgis();`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`void TestQgsComposerPaper::init()`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ void TestQgsComposerPicture::cleanupTestCase()`
`97`	`97`	`myQTextStream << mReport;`
`98`	`98`	`myFile.close();`
`99`	`99`	`}`
	`100`	`+ QgsApplication::exitQgis();`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`void TestQgsComposerPicture::init()`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ void TestQgsComposerRotation::initTestCase()`
`100`	`100`
`101`	`101`	`void TestQgsComposerRotation::cleanupTestCase()`
`102`	`102`	`{`
	`103`	`+ delete mComposition;`
	`104`	`+`
`103`	`105`	`QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";`
`104`	`106`	`QFile myFile( myReportFile );`
`105`	`107`	`if ( myFile.open( QIODevice::WriteOnly \| QIODevice::Append ) )`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ void TestQgsComposerShapes::cleanupTestCase()`
`83`	`83`	`myQTextStream << mReport;`
`84`	`84`	`myFile.close();`
`85`	`85`	`}`
	`86`	`+ QgsApplication::exitQgis();`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`void TestQgsComposerShapes::init()`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ void TestQgsComposerTableV2::cleanupTestCase()`
`130`	`130`	`myQTextStream << mReport;`
`131`	`131`	`myFile.close();`
`132`	`132`	`}`
	`133`	`+ QgsApplication::exitQgis();`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`void TestQgsComposerTableV2::init()`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ void TestQgsComposition::cleanupTestCase()`
`75`	`75`	`myQTextStream << mReport;`
`76`	`76`	`myFile.close();`
`77`	`77`	`}`
	`78`	`+ QgsApplication::exitQgis();`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`void TestQgsComposition::init()`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ class TestQgsDiagram: public QObject`
`109`	`109`	`// will be called after the last testfunction was executed.`
`110`	`110`	`void cleanupTestCase()`
`111`	`111`	`{`
	`112`	`+ delete mComposition;`
`112`	`113`	`QgsApplication::exitQgis();`
`113`	`114`	`QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";`
`114`	`115`	`QFile myFile( myReportFile );`