Let all tests work with a proper QgsApplication instance

qgis · Dec 20, 2016 · dfd9833
1 parent d169487
commit dfd9833
Show file tree

Hide file tree

Showing 155 changed files with 304 additions and 299 deletions.
diff --git a/src/test/qgstest.h b/src/test/qgstest.h
@@ -16,6 +16,9 @@
 #ifndef QGSTEST_H
 #define QGSTEST_H
 
+#include <QtTest/QtTest>
+#include "qgsapplication.h"
+
 #define QGSTEST_MAIN(TestObject) \
   QT_BEGIN_NAMESPACE \
   QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \

diff --git a/tests/bench/README b/tests/bench/README
@@ -65,7 +65,7 @@ Unfortunately I don't see anything better than user time + sys time, running tes
 
 To be sure that the measured values are correct, it is necessary to run more cycles and check some standard deviation or so.
 
-There is also high level benchmark support available in QTestLib, it is possible to use QBENCHMARK macro + QTEST_MAIN to create easily test executable. Such test may be run with various options, some notes on modes/options:
+There is also high level benchmark support available in QTestLib, it is possible to use QBENCHMARK macro + QGSTEST_MAIN to create easily test executable. Such test may be run with various options, some notes on modes/options:
 
 -tickcounter - reads rdtsc register (on Linux), thus it counts real time, result is not constant
 

diff --git a/tests/qt_modeltest/tst_modeltest.cpp b/tests/qt_modeltest/tst_modeltest.cpp
@@ -314,5 +314,5 @@ void tst_ModelTest::testResetThroughProxy()
 }
 
 
-QTEST_MAIN( tst_ModelTest )
+QGSTEST_MAIN( tst_ModelTest )
 #include "tst_modeltest.moc"
diff --git a/tests/src/analysis/CMakeLists.txt b/tests/src/analysis/CMakeLists.txt
@@ -15,6 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/src/analysis
   ${CMAKE_SOURCE_DIR}/src/analysis/vector
   ${CMAKE_SOURCE_DIR}/src/analysis/raster
+  ${CMAKE_SOURCE_DIR}/src/test
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}

diff --git a/tests/src/analysis/testopenstreetmap.cpp b/tests/src/analysis/testopenstreetmap.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include <QtTest/QSignalSpy>
 
 #include <qgsapplication.h>
@@ -188,6 +188,6 @@ void TestOpenStreetMap::importAndQueries()
 }
 
 
-QTEST_MAIN( TestOpenStreetMap )
+QGSTEST_MAIN( TestOpenStreetMap )
 
 #include "testopenstreetmap.moc"
diff --git a/tests/src/analysis/testqgsalignraster.cpp b/tests/src/analysis/testqgsalignraster.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 #include "qgsalignraster.h"
 #include "qgsapplication.h"
@@ -268,6 +268,6 @@ class TestAlignRaster : public QObject
 
 };
 
-QTEST_MAIN( TestAlignRaster )
+QGSTEST_MAIN( TestAlignRaster )
 
 #include "testqgsalignraster.moc"
diff --git a/tests/src/analysis/testqgsgeometrysnapper.cpp b/tests/src/analysis/testqgsgeometrysnapper.cpp
@@ -12,7 +12,7 @@ Email                : nyall dot dawson at gmail dot com
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 //header for class being tested
 #include "qgsgeometrysnapper.h"
@@ -410,5 +410,5 @@ void TestQgsGeometrySnapper::snapPointToPolygon()
 }
 
 
-QTEST_MAIN( TestQgsGeometrySnapper )
+QGSTEST_MAIN( TestQgsGeometrySnapper )
 #include "testqgsgeometrysnapper.moc"
diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp
@@ -12,7 +12,7 @@ Email                : nyall dot dawson at gmail dot com
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 #include "qgsrastercalculator.h"
 #include "qgsrastercalcnode.h"
@@ -529,5 +529,5 @@ void TestQgsRasterCalculator::calcWithReprojectedLayers()
   delete block;
 }
 
-QTEST_MAIN( TestQgsRasterCalculator )
+QGSTEST_MAIN( TestQgsRasterCalculator )
 #include "testqgsrastercalculator.moc"
diff --git a/tests/src/analysis/testqgsvectoranalyzer.cpp b/tests/src/analysis/testqgsvectoranalyzer.cpp
@@ -12,7 +12,7 @@ Email                : sherman at mrcc dot com
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 //header for class being tested
 #include <qgsgeometryanalyzer.h>
@@ -141,5 +141,5 @@ void TestQgsVectorAnalyzer::layerExtent()
   QVERIFY( mAnalyzer.extent( mpPointLayer, myFileName ) );
 }
 
-QTEST_MAIN( TestQgsVectorAnalyzer )
+QGSTEST_MAIN( TestQgsVectorAnalyzer )
 #include "testqgsvectoranalyzer.moc"
diff --git a/tests/src/analysis/testqgszonalstatistics.cpp b/tests/src/analysis/testqgszonalstatistics.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <QDir>
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 #include "qgsapplication.h"
 #include "qgsfeatureiterator.h"
@@ -136,5 +136,5 @@ void TestQgsZonalStatistics::testStatistics()
   QCOMPARE( f.attribute( "myqgis2_me" ).toDouble(), 0.833333333333333 );
 }
 
-QTEST_MAIN( TestQgsZonalStatistics )
+QGSTEST_MAIN( TestQgsZonalStatistics )
 #include "testqgszonalstatistics.moc"
diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
@@ -17,7 +17,7 @@
 #include <QSplashScreen>
 #include <QString>
 #include <QStringList>
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 #include <qgisapp.h>
 #include <qgsapplication.h>
@@ -316,5 +316,5 @@ void TestQgisAppClipboard::clipboardLogic()
   QCOMPARE( features.at( 0 ).attribute( "name" ).toString(), QString( "Dinagat Islands" ) );
 }
 
-QTEST_MAIN( TestQgisAppClipboard )
+QGSTEST_MAIN( TestQgisAppClipboard )
 #include "testqgisappclipboard.moc"
diff --git a/tests/src/app/testqgisapppython.cpp b/tests/src/app/testqgisapppython.cpp
@@ -17,7 +17,7 @@
 #include <QSplashScreen>
 #include <QString>
 #include <QStringList>
-#include <QtTest/QtTest>
+#include "qgstest.h"
 
 #include <qgisapp.h>
 #include <qgsapplication.h>
@@ -94,5 +94,5 @@ void TestQgisAppPython::evalString()
   QVERIFY( !mQgisApp->mPythonUtils->evalString( "1+", result ) );
 }
 
-QTEST_MAIN( TestQgisAppPython )
+QGSTEST_MAIN( TestQgisAppPython )
 #include "testqgisapppython.moc"
diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsfeatureiterator.h"

diff --git a/tests/src/app/testqgsfieldcalculator.cpp b/tests/src/app/testqgsfieldcalculator.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
@@ -188,5 +188,5 @@ void TestQgsFieldCalculator::testAreaCalculations()
   QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
 }
 
-QTEST_MAIN( TestQgsFieldCalculator )
+QGSTEST_MAIN( TestQgsFieldCalculator )
 #include "testqgsfieldcalculator.moc"
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsrasterlayer.h"
@@ -378,7 +378,7 @@ void TestQgsMapToolIdentifyAction::identifyInvalidPolygons()
 }
 
 
-QTEST_MAIN( TestQgsMapToolIdentifyAction )
+QGSTEST_MAIN( TestQgsMapToolIdentifyAction )
 #include "testqgsmaptoolidentifyaction.moc"
 
 

diff --git a/tests/src/app/testqgsmaptoolselect.cpp b/tests/src/app/testqgsmaptoolselect.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsrasterlayer.h"
@@ -152,5 +152,5 @@ void TestQgsMapToolSelect::selectInvalidPolygons()
 }
 
 
-QTEST_MAIN( TestQgsMapToolSelect )
+QGSTEST_MAIN( TestQgsMapToolSelect )
 #include "testqgsmaptoolselect.moc"
diff --git a/tests/src/app/testqgsmeasuretool.cpp b/tests/src/app/testqgsmeasuretool.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
@@ -203,5 +203,5 @@ void TestQgsMeasureTool::testAreaCalculation()
   QGSCOMPARENEAR( measured, expected, 0.001 );
 }
 
-QTEST_MAIN( TestQgsMeasureTool )
+QGSTEST_MAIN( TestQgsMeasureTool )
 #include "testqgsmeasuretool.moc"
diff --git a/tests/src/app/testqgsvectorlayersaveasdialog.cpp b/tests/src/app/testqgsvectorlayersaveasdialog.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QtTest/QtTest>
+#include "qgstest.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
@@ -133,5 +133,5 @@ void TestQgsVectorLayerSaveAsDialog::testAttributesAsDisplayedValues()
   //d.exec();
 }
 
-QTEST_MAIN( TestQgsVectorLayerSaveAsDialog )
+QGSTEST_MAIN( TestQgsVectorLayerSaveAsDialog )
 #include "testqgsvectorlayersaveasdialog.moc"
diff --git a/tests/src/core/test_template.cpp b/tests/src/core/test_template.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
      *   (at your option) any later version.                                   *
      *                                                                         *
      ***************************************************************************/
-</