diff --git a/src/test/qgstest.h b/src/test/qgstest.h index ffbd12a43f4..e7382496490 100644 --- a/src/test/qgstest.h +++ b/src/test/qgstest.h @@ -16,6 +16,9 @@ #ifndef QGSTEST_H #define QGSTEST_H +#include +#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 index 5b0451d0412..18f8f9d4103 100644 --- 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 index 7f60c722fb8..7cc30eb45e9 100644 --- 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 index 7bf7b76f212..c9c64b54b85 100644 --- 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 index a2e60a19224..6f86bd7449a 100644 --- a/tests/src/analysis/testopenstreetmap.cpp +++ b/tests/src/analysis/testopenstreetmap.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -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 index 8090bdb4623..a67facf2314 100644 --- a/tests/src/analysis/testqgsalignraster.cpp +++ b/tests/src/analysis/testqgsalignraster.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#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 index ffb59f70d0c..e4d864727d0 100644 --- 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 +#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 index 825076af9e9..19c54914b87 100644 --- 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 +#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 index eee86542795..b63492daf19 100644 --- 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 +#include "qgstest.h" //header for class being tested #include @@ -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 index db49b263855..df363de0e1e 100644 --- a/tests/src/analysis/testqgszonalstatistics.cpp +++ b/tests/src/analysis/testqgszonalstatistics.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include -#include +#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 index cf85574a903..5956979ce80 100644 --- a/tests/src/app/testqgisappclipboard.cpp +++ b/tests/src/app/testqgisappclipboard.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include "qgstest.h" #include #include @@ -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 index 00ae53bdb47..1339b440675 100644 --- a/tests/src/app/testqgisapppython.cpp +++ b/tests/src/app/testqgisapppython.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include "qgstest.h" #include #include @@ -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 index ef1d5c3c268..b907196b96d 100644 --- a/tests/src/app/testqgsattributetable.cpp +++ b/tests/src/app/testqgsattributetable.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#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 index eae641ab2a1..bb389bd258b 100644 --- a/tests/src/app/testqgsfieldcalculator.cpp +++ b/tests/src/app/testqgsfieldcalculator.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#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 index bce3db0dff8..84cec1c9743 100644 --- a/tests/src/app/testqgsmaptoolidentifyaction.cpp +++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#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 index 35b5ae76a67..fa099a14f56 100644 --- a/tests/src/app/testqgsmaptoolselect.cpp +++ b/tests/src/app/testqgsmaptoolselect.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#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 index cac422a9f51..5348f562ee5 100644 --- a/tests/src/app/testqgsmeasuretool.cpp +++ b/tests/src/app/testqgsmeasuretool.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#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 index dfca7b804cf..f9ad4417902 100644 --- a/tests/src/app/testqgsvectorlayersaveasdialog.cpp +++ b/tests/src/app/testqgsvectorlayersaveasdialog.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#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 index 354d20ac04e..b2f529d9b99 100644 --- a/tests/src/core/test_template.cpp +++ b/tests/src/core/test_template.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include //header for class being tested @@ -25,7 +25,7 @@ class Test[testClassCamelCaseName]: public QObject [TestMethods] }; -QTEST_MAIN( Test[testClassCamelCaseName] ) +QGSTEST_MAIN( Test[testClassCamelCaseName] ) #include "test[testClassLowerCaseName].moc" diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp index 19223110f33..f9e1bf813e3 100644 --- a/tests/src/core/testcontrastenhancements.cpp +++ b/tests/src/core/testcontrastenhancements.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -102,5 +102,5 @@ void TestContrastEnhancements::linearMinMaxEnhancementTest() //Original pixel value of 240 should be scaled to 255 QVERIFY( 255.0 == myEnhancement.enhance( 240.0 ) ); } -QTEST_MAIN( TestContrastEnhancements ) +QGSTEST_MAIN( TestContrastEnhancements ) #include "testcontrastenhancements.moc" diff --git a/tests/src/core/testmaprendererjob.cpp b/tests/src/core/testmaprendererjob.cpp index 336fdace027..c0c3ebdd86f 100644 --- a/tests/src/core/testmaprendererjob.cpp +++ b/tests/src/core/testmaprendererjob.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include "qgsapplication.h" @@ -289,5 +289,5 @@ void TestQgsMapRendererJob::testCache() } -QTEST_MAIN( TestQgsMapRendererJob ) +QGSTEST_MAIN( TestQgsMapRendererJob ) #include "testmaprendererjob.moc" diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp index 00d35a5ea75..5df0bf6424a 100644 --- a/tests/src/core/testqgis.cpp +++ b/tests/src/core/testqgis.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -293,5 +293,5 @@ void TestQgis::qVariantCompare() } -QTEST_MAIN( TestQgis ) +QGSTEST_MAIN( TestQgis ) #include "testqgis.moc" diff --git a/tests/src/core/testqgs25drenderer.cpp b/tests/src/core/testqgs25drenderer.cpp index af813ed4557..676e649f488 100644 --- a/tests/src/core/testqgs25drenderer.cpp +++ b/tests/src/core/testqgs25drenderer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -159,5 +159,5 @@ bool TestQgs25DRenderer::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgs25DRenderer ) +QGSTEST_MAIN( TestQgs25DRenderer ) #include "testqgs25drenderer.moc" diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp index 007de82ad2a..ba7f34596c8 100644 --- a/tests/src/core/testqgsapplication.cpp +++ b/tests/src/core/testqgsapplication.cpp @@ -12,7 +12,7 @@ Email : sherman at mrcc dot com * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #define CPL_SUPRESS_CPLUSPLUS @@ -100,5 +100,5 @@ void TestQgsApplication::checkGdalSkip() QVERIFY( !QgsApplication::skippedGdalDrivers().contains( "GTiff" ) ); } -QTEST_MAIN( TestQgsApplication ) +QGSTEST_MAIN( TestQgsApplication ) #include "testqgsapplication.moc" diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp index f68d95410bf..cc4f2bde4fb 100644 --- a/tests/src/core/testqgsatlascomposition.cpp +++ b/tests/src/core/testqgsatlascomposition.cpp @@ -30,7 +30,7 @@ #include "qgsfontutils.h" #include #include -#include +#include "qgstest.h" class TestQgsAtlasComposition : public QObject { @@ -437,5 +437,5 @@ void TestQgsAtlasComposition::test_remove_layer() QVERIFY( spyToggled.count() == 1 ); } -QTEST_MAIN( TestQgsAtlasComposition ) +QGSTEST_MAIN( TestQgsAtlasComposition ) #include "testqgsatlascomposition.moc" diff --git a/tests/src/core/testqgsauthconfig.cpp b/tests/src/core/testqgsauthconfig.cpp index 51ed3f8be27..73b83292575 100644 --- a/tests/src/core/testqgsauthconfig.cpp +++ b/tests/src/core/testqgsauthconfig.cpp @@ -13,7 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -242,5 +242,5 @@ void TestQgsAuthConfig::testConfigSslServer() QCOMPARE( sslconfig2.configString(), confstr ); } -QTEST_MAIN( TestQgsAuthConfig ) +QGSTEST_MAIN( TestQgsAuthConfig ) #include "testqgsauthconfig.moc" diff --git a/tests/src/core/testqgsauthcrypto.cpp b/tests/src/core/testqgsauthcrypto.cpp index 8a3932153e0..d2f1840c031 100644 --- a/tests/src/core/testqgsauthcrypto.cpp +++ b/tests/src/core/testqgsauthcrypto.cpp @@ -13,7 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -118,5 +118,5 @@ void TestQgsAuthCrypto::testPasswordHashKnown() QVERIFY( QgsAuthCrypto::verifyPasswordKeyHash( smPass, smSalt, smHash ) ); } -QTEST_MAIN( TestQgsAuthCrypto ) +QGSTEST_MAIN( TestQgsAuthCrypto ) #include "testqgsauthcrypto.moc" diff --git a/tests/src/core/testqgsauthmanager.cpp b/tests/src/core/testqgsauthmanager.cpp index 9b6339c4c94..e0a0d86a185 100644 --- a/tests/src/core/testqgsauthmanager.cpp +++ b/tests/src/core/testqgsauthmanager.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -402,5 +402,5 @@ QList TestQgsAuthManager::registerAuthConfigs() return configs; } -QTEST_MAIN( TestQgsAuthManager ) +QGSTEST_MAIN( TestQgsAuthManager ) #include "testqgsauthmanager.moc" diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp index 5f0af1048ef..d10ef7cc9af 100644 --- a/tests/src/core/testqgsblendmodes.cpp +++ b/tests/src/core/testqgsblendmodes.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -240,5 +240,5 @@ bool TestQgsBlendModes::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsBlendModes ) +QGSTEST_MAIN( TestQgsBlendModes ) #include "testqgsblendmodes.moc" diff --git a/tests/src/core/testqgscentroidfillsymbol.cpp b/tests/src/core/testqgscentroidfillsymbol.cpp index 2d45516db0a..cce5df37b57 100644 --- a/tests/src/core/testqgscentroidfillsymbol.cpp +++ b/tests/src/core/testqgscentroidfillsymbol.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -162,5 +162,5 @@ bool TestQgsCentroidFillSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsCentroidFillSymbol ) +QGSTEST_MAIN( TestQgsCentroidFillSymbol ) #include "testqgscentroidfillsymbol.moc" diff --git a/tests/src/core/testqgsclipper.cpp b/tests/src/core/testqgsclipper.cpp index 6c1497835be..02926c0bc5b 100644 --- a/tests/src/core/testqgsclipper.cpp +++ b/tests/src/core/testqgsclipper.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -85,5 +85,5 @@ bool TestQgsClipper::checkBoundingBox( const QPolygonF& polygon, const QgsRectan return clipRect.contains( bBox ); } -QTEST_MAIN( TestQgsClipper ) +QGSTEST_MAIN( TestQgsClipper ) #include "testqgsclipper.moc" diff --git a/tests/src/core/testqgscolorscheme.cpp b/tests/src/core/testqgscolorscheme.cpp index fac090b4af2..3c3cf146c5e 100644 --- a/tests/src/core/testqgscolorscheme.cpp +++ b/tests/src/core/testqgscolorscheme.cpp @@ -18,7 +18,7 @@ #include "qgscolorscheme.h" #include #include -#include +#include "qgstest.h" //dummy color scheme for testing class DummyColorScheme : public QgsColorScheme @@ -148,5 +148,5 @@ void TestQgsColorScheme::clone() QCOMPARE( colors, colors2 ); } -QTEST_MAIN( TestQgsColorScheme ) +QGSTEST_MAIN( TestQgsColorScheme ) #include "testqgscolorscheme.moc" diff --git a/tests/src/core/testqgscolorschemeregistry.cpp b/tests/src/core/testqgscolorschemeregistry.cpp index 2e7d1a47eb7..86ea502101b 100644 --- a/tests/src/core/testqgscolorschemeregistry.cpp +++ b/tests/src/core/testqgscolorschemeregistry.cpp @@ -19,7 +19,7 @@ #include "qgscolorscheme.h" #include #include -#include +#include "qgstest.h" //dummy color scheme for testing class DummyColorScheme : public QgsColorScheme @@ -187,5 +187,5 @@ void TestQgsColorSchemeRegistry::matchingSchemes() QCOMPARE( dummySchemes.at( 0 ), dummyScheme ); } -QTEST_MAIN( TestQgsColorSchemeRegistry ) +QGSTEST_MAIN( TestQgsColorSchemeRegistry ) #include "testqgscolorschemeregistry.moc" diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp index bb5e6546f3c..4e927c512ec 100644 --- a/tests/src/core/testqgscomposerdd.cpp +++ b/tests/src/core/testqgscomposerdd.cpp @@ -29,7 +29,7 @@ #include "qgsdatadefined.h" #include -#include +#include "qgstest.h" class TestQgsComposerDD : public QObject { @@ -146,5 +146,5 @@ void TestQgsComposerDD::ddEvaluate() mAtlasMap->setDataDefinedProperty( QgsComposerItem::PositionY, false, false, QString(), QString() ); } -QTEST_MAIN( TestQgsComposerDD ) +QGSTEST_MAIN( TestQgsComposerDD ) #include "testqgscomposerdd.moc" diff --git a/tests/src/core/testqgscomposereffects.cpp b/tests/src/core/testqgscomposereffects.cpp index 11c053140d3..df4bd91d826 100644 --- a/tests/src/core/testqgscomposereffects.cpp +++ b/tests/src/core/testqgscomposereffects.cpp @@ -20,7 +20,7 @@ #include "qgsmultirenderchecker.h" #include "qgscomposershape.h" #include -#include +#include "qgstest.h" #include #include @@ -122,5 +122,5 @@ void TestQgsComposerEffects::transparency() QVERIFY( checker.testComposition( mReport ) ); } -QTEST_MAIN( TestQgsComposerEffects ) +QGSTEST_MAIN( TestQgsComposerEffects ) #include "testqgscomposereffects.moc" diff --git a/tests/src/core/testqgscomposergroup.cpp b/tests/src/core/testqgscomposergroup.cpp index e0f1e7c0266..28fc4f09ec1 100644 --- a/tests/src/core/testqgscomposergroup.cpp +++ b/tests/src/core/testqgscomposergroup.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include "qgstest.h" class TestQgsComposerGroup : public QObject { @@ -432,5 +432,5 @@ void TestQgsComposerGroup::undoRedo() QgsDebugMsg( QString( "clear stack count:%1 index:%2" ) .arg( us->count() ) .arg( us->index() ) ); } -QTEST_MAIN( TestQgsComposerGroup ) +QGSTEST_MAIN( TestQgsComposerGroup ) #include "testqgscomposergroup.moc" diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp index 58674cc1133..30262dd169a 100644 --- a/tests/src/core/testqgscomposerhtml.cpp +++ b/tests/src/core/testqgscomposerhtml.cpp @@ -26,7 +26,7 @@ #include "qgsvectordataprovider.h" #include "qgsproject.h" #include -#include +#include "qgstest.h" class TestQgsComposerHtml : public QObject { @@ -324,5 +324,5 @@ void TestQgsComposerHtml::javascriptSetFeature() } -QTEST_MAIN( TestQgsComposerHtml ) +QGSTEST_MAIN( TestQgsComposerHtml ) #include "testqgscomposerhtml.moc" diff --git a/tests/src/core/testqgscomposerlabel.cpp b/tests/src/core/testqgscomposerlabel.cpp index ce11cd4324f..6a44cb5ce0c 100644 --- a/tests/src/core/testqgscomposerlabel.cpp +++ b/tests/src/core/testqgscomposerlabel.cpp @@ -25,7 +25,7 @@ #include "qgsproject.h" #include -#include +#include "qgstest.h" class TestQgsComposerLabel : public QObject { @@ -271,5 +271,5 @@ void TestQgsComposerLabel::renderAsHtmlRelative() QVERIFY( checker.testComposition( mReport, 0, 0 ) ); } -QTEST_MAIN( TestQgsComposerLabel ) +QGSTEST_MAIN( TestQgsComposerLabel ) #include "testqgscomposerlabel.moc" diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp index 9fafa977d84..c4cd277d637 100644 --- a/tests/src/core/testqgscomposermap.cpp +++ b/tests/src/core/testqgscomposermap.cpp @@ -27,7 +27,7 @@ #include "qgsproject.h" #include "qgsmapthemecollection.h" #include -#include +#include "qgstest.h" class TestQgsComposerMap : public QObject { @@ -399,5 +399,5 @@ void TestQgsComposerMap::dataDefinedStyles() QVERIFY( checker.testComposition( mReport, 0, 0 ) ); } -QTEST_MAIN( TestQgsComposerMap ) +QGSTEST_MAIN( TestQgsComposerMap ) #include "testqgscomposermap.moc" diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp index bc78f2cc0a2..2481b6afa30 100644 --- a/tests/src/core/testqgscomposermapgrid.cpp +++ b/tests/src/core/testqgscomposermapgrid.cpp @@ -22,7 +22,7 @@ #include "qgscomposermapgrid.h" #include "qgsfontutils.h" #include -#include +#include "qgstest.h" class TestQgsComposerMapGrid : public QObject { @@ -705,5 +705,5 @@ void TestQgsComposerMapGrid::descendingAnnotations() mComposerMap->grid()->setAnnotationEnabled( false ); } -QTEST_MAIN( TestQgsComposerMapGrid ) +QGSTEST_MAIN( TestQgsComposerMapGrid ) #include "testqgscomposermapgrid.moc" diff --git a/tests/src/core/testqgscomposermapoverview.cpp b/tests/src/core/testqgscomposermapoverview.cpp index 916377e8132..4f6ea149eee 100644 --- a/tests/src/core/testqgscomposermapoverview.cpp +++ b/tests/src/core/testqgscomposermapoverview.cpp @@ -26,7 +26,7 @@ #include "qgsrasterdataprovider.h" #include "qgsfontutils.h" #include -#include +#include "qgstest.h" class TestQgsComposerMapOverview : public QObject { @@ -217,5 +217,5 @@ void TestQgsComposerMapOverview::overviewMapCenter() QVERIFY( testResult ); } -QTEST_MAIN( TestQgsComposerMapOverview ) +QGSTEST_MAIN( TestQgsComposerMapOverview ) #include "testqgscomposermapoverview.moc" diff --git a/tests/src/core/testqgscomposermodel.cpp b/tests/src/core/testqgscomposermodel.cpp index bf7d1e08a2b..304f6c713e6 100644 --- a/tests/src/core/testqgscomposermodel.cpp +++ b/tests/src/core/testqgscomposermodel.cpp @@ -22,7 +22,7 @@ #include "qgsmapsettings.h" #include -#include +#include "qgstest.h" #include class TestQgsComposerModel : public QObject @@ -611,5 +611,5 @@ void TestQgsComposerModel::reorderToBottomWithRemoved() QCOMPARE( mComposition->itemsModel()->mItemsInScene.at( 1 ), mItem2 ); } -QTEST_MAIN( TestQgsComposerModel ) +QGSTEST_MAIN( TestQgsComposerModel ) #include "testqgscomposermodel.moc" diff --git a/tests/src/core/testqgscomposermultiframe.cpp b/tests/src/core/testqgscomposermultiframe.cpp index c983d49674d..98b6497d004 100644 --- a/tests/src/core/testqgscomposermultiframe.cpp +++ b/tests/src/core/testqgscomposermultiframe.cpp @@ -23,7 +23,7 @@ #include "qgsapplication.h" #include -#include +#include "qgstest.h" class TestQgsComposerMultiFrame : public QObject { @@ -368,5 +368,5 @@ void TestQgsComposerMultiFrame::undoRedoRemovedFrame() delete htmlItem; } -QTEST_MAIN( TestQgsComposerMultiFrame ) +QGSTEST_MAIN( TestQgsComposerMultiFrame ) #include "testqgscomposermultiframe.moc" diff --git a/tests/src/core/testqgscomposerobject.cpp b/tests/src/core/testqgscomposerobject.cpp index eecd1d4ae6e..40aa622d3c2 100644 --- a/tests/src/core/testqgscomposerobject.cpp +++ b/tests/src/core/testqgscomposerobject.cpp @@ -23,7 +23,7 @@ #include "qgsapplication.h" #include -#include +#include "qgstest.h" class TestQgsComposerObject : public QObject { @@ -312,5 +312,5 @@ bool TestQgsComposerObject::renderCheck( const QString& testName, QImage &image, return myResultFlag; } -QTEST_MAIN( TestQgsComposerObject ) +QGSTEST_MAIN( TestQgsComposerObject ) #include "testqgscomposerobject.moc" diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp index 532511f8063..bcc8373e995 100644 --- a/tests/src/core/testqgscomposerpaper.cpp +++ b/tests/src/core/testqgscomposerpaper.cpp @@ -25,7 +25,7 @@ #include "qgslinesymbollayer.h" #include -#include +#include "qgstest.h" #include #include @@ -166,5 +166,5 @@ void TestQgsComposerPaper::hiddenPages() QVERIFY( result ); } -QTEST_MAIN( TestQgsComposerPaper ) +QGSTEST_MAIN( TestQgsComposerPaper ) #include "testqgscomposerpaper.moc" diff --git a/tests/src/core/testqgscomposerpicture.cpp b/tests/src/core/testqgscomposerpicture.cpp index e3c08902bc9..b337001777c 100644 --- a/tests/src/core/testqgscomposerpicture.cpp +++ b/tests/src/core/testqgscomposerpicture.cpp @@ -20,7 +20,7 @@ #include "qgsmultirenderchecker.h" #include "qgscomposerpicture.h" #include -#include +#include "qgstest.h" #include #include @@ -426,5 +426,5 @@ void TestQgsComposerPicture::pictureInvalidExpression() false, false, QString(), QString() ); } -QTEST_MAIN( TestQgsComposerPicture ) +QGSTEST_MAIN( TestQgsComposerPicture ) #include "testqgscomposerpicture.moc" diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp index a593fe7d935..7423992f67c 100644 --- a/tests/src/core/testqgscomposerrotation.cpp +++ b/tests/src/core/testqgscomposerrotation.cpp @@ -27,7 +27,7 @@ #include "qgsfontutils.h" #include "qgsrasterdataprovider.h" #include -#include +#include "qgstest.h" #include #include @@ -197,5 +197,5 @@ void TestQgsComposerRotation::mapItemRotation() QVERIFY( checker.testComposition( mReport ) ); } -QTEST_MAIN( TestQgsComposerRotation ) +QGSTEST_MAIN( TestQgsComposerRotation ) #include "testqgscomposerrotation.moc" diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp index 96d3c13a537..2d6591ee888 100644 --- a/tests/src/core/testqgscomposerscalebar.cpp +++ b/tests/src/core/testqgscomposerscalebar.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include "qgstest.h" class TestQgsComposerScaleBar : public QObject { @@ -203,5 +203,5 @@ void TestQgsComposerScaleBar::tick() QVERIFY( checker.testComposition( mReport, 0, 0 ) ); } -QTEST_MAIN( TestQgsComposerScaleBar ) +QGSTEST_MAIN( TestQgsComposerScaleBar ) #include "testqgscomposerscalebar.moc" diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp index c1e2cac334f..8f2360188d4 100644 --- a/tests/src/core/testqgscomposershapes.cpp +++ b/tests/src/core/testqgscomposershapes.cpp @@ -24,7 +24,7 @@ #include "qgssinglesymbolrenderer.h" #include "qgsfillsymbollayer.h" #include -#include +#include "qgstest.h" #include #include @@ -159,5 +159,5 @@ void TestQgsComposerShapes::symbol() QVERIFY( checker.testComposition( mReport ) ); } -QTEST_MAIN( TestQgsComposerShapes ) +QGSTEST_MAIN( TestQgsComposerShapes ) #include "testqgscomposershapes.moc" diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp index 9131f39a1fa..7e5bc660bac 100644 --- a/tests/src/core/testqgscomposertablev2.cpp +++ b/tests/src/core/testqgscomposertablev2.cpp @@ -31,7 +31,7 @@ #include "qgsrelationmanager.h" #include -#include +#include "qgstest.h" class TestQgsComposerTableV2 : public QObject { @@ -1074,5 +1074,5 @@ void TestQgsComposerTableV2::cellStylesRender() mComposerAttributeTable->setShowEmptyRows( false ); } -QTEST_MAIN( TestQgsComposerTableV2 ) +QGSTEST_MAIN( TestQgsComposerTableV2 ) #include "testqgscomposertablev2.moc" diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp index 4b8fb622f7a..fe1eb97236c 100644 --- a/tests/src/core/testqgscomposerutils.cpp +++ b/tests/src/core/testqgscomposerutils.cpp @@ -22,7 +22,7 @@ #include "qgsdatadefined.h" #include "qgsfontutils.h" #include -#include +#include "qgstest.h" #include class TestQgsComposerUtils : public QObject @@ -715,5 +715,5 @@ bool TestQgsComposerUtils::renderCheck( const QString& testName, QImage &image, return myResultFlag; } -QTEST_MAIN( TestQgsComposerUtils ) +QGSTEST_MAIN( TestQgsComposerUtils ) #include "testqgscomposerutils.moc" diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp index 12ee7a611b6..a99ae9cdeed 100644 --- a/tests/src/core/testqgscomposition.cpp +++ b/tests/src/core/testqgscomposition.cpp @@ -28,7 +28,7 @@ #include "qgsfillsymbollayer.h" #include -#include +#include "qgstest.h" class TestQgsComposition : public QObject { @@ -598,5 +598,5 @@ void TestQgsComposition::variablesEdited() QVERIFY( spyVariablesChanged.count() == 2 ); } -QTEST_MAIN( TestQgsComposition ) +QGSTEST_MAIN( TestQgsComposition ) #include "testqgscomposition.moc" diff --git a/tests/src/core/testqgsconnectionpool.cpp b/tests/src/core/testqgsconnectionpool.cpp index f5faee75874..d17574f9190 100644 --- a/tests/src/core/testqgsconnectionpool.cpp +++ b/tests/src/core/testqgsconnectionpool.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include "qgstest.h" class TestQgsConnectionPool: public QObject { @@ -140,5 +140,5 @@ void TestQgsConnectionPool::layersFromSameDatasetGPX() QFile( testFile.fileName() ).remove(); } -QTEST_MAIN( TestQgsConnectionPool ) +QGSTEST_MAIN( TestQgsConnectionPool ) #include "testqgsconnectionpool.moc" diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp index 67e6e73e3d4..e84730552af 100644 --- a/tests/src/core/testqgscoordinatereferencesystem.cpp +++ b/tests/src/core/testqgscoordinatereferencesystem.cpp @@ -12,7 +12,7 @@ Email : sherman at mrcc dot com * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -739,5 +739,5 @@ void TestQgsCoordinateReferenceSystem::createFromProj4Invalid() QVERIFY( !myCrs.createFromProj4( "+proj=longlat +no_defs" ) ); } -QTEST_MAIN( TestQgsCoordinateReferenceSystem ) +QGSTEST_MAIN( TestQgsCoordinateReferenceSystem ) #include "testqgscoordinatereferencesystem.moc" diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp index 8bced0cd132..0c50498ed9c 100644 --- a/tests/src/core/testqgscoordinatetransform.cpp +++ b/tests/src/core/testqgscoordinatetransform.cpp @@ -18,7 +18,7 @@ #include "qgsapplication.h" #include "qgsrectangle.h" #include -#include +#include "qgstest.h" class TestQgsCoordinateTransform: public QObject { @@ -206,5 +206,5 @@ void TestQgsCoordinateTransform::transformBoundingBox() QVERIFY( qgsDoubleNear( resultRect.yMaximum(), expectedRect.yMaximum(), 0.001 ) ); } -QTEST_MAIN( TestQgsCoordinateTransform ) +QGSTEST_MAIN( TestQgsCoordinateTransform ) #include "testqgscoordinatetransform.moc" diff --git a/tests/src/core/testqgsdatadefined.cpp b/tests/src/core/testqgsdatadefined.cpp index 2419b89bb29..6a7c39d7749 100644 --- a/tests/src/core/testqgsdatadefined.cpp +++ b/tests/src/core/testqgsdatadefined.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -323,5 +323,5 @@ void TestQgsDataDefined::expressionOrString() QCOMPARE( dd.expressionOrField(), QString( "\"field\"" ) ); } -QTEST_MAIN( TestQgsDataDefined ) +QGSTEST_MAIN( TestQgsDataDefined ) #include "testqgsdatadefined.moc" diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp index 231935b1fd3..879c32693a5 100644 --- a/tests/src/core/testqgsdataitem.cpp +++ b/tests/src/core/testqgsdataitem.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -178,5 +178,5 @@ void TestQgsDataItem::testDirItemChildren() } } -QTEST_MAIN( TestQgsDataItem ) +QGSTEST_MAIN( TestQgsDataItem ) #include "testqgsdataitem.moc" diff --git a/tests/src/core/testqgsdatasourceuri.cpp b/tests/src/core/testqgsdatasourceuri.cpp index 4c7177f7236..4c75497c935 100644 --- a/tests/src/core/testqgsdatasourceuri.cpp +++ b/tests/src/core/testqgsdatasourceuri.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include //header for class being tested @@ -177,5 +177,5 @@ void TestQgsDataSourceUri::checkparser() QCOMPARE( ds.param( "myparam" ), myparam ); } -QTEST_MAIN( TestQgsDataSourceUri ) +QGSTEST_MAIN( TestQgsDataSourceUri ) #include "testqgsdatasourceuri.moc" diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp index 892a82ea418..73363719b7a 100644 --- a/tests/src/core/testqgsdiagram.cpp +++ b/tests/src/core/testqgsdiagram.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -224,5 +224,5 @@ bool TestQgsDiagram::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsDiagram ) +QGSTEST_MAIN( TestQgsDiagram ) #include "testqgsdiagram.moc" diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp index b6b3925a060..e2486f0ca14 100644 --- a/tests/src/core/testqgsdistancearea.cpp +++ b/tests/src/core/testqgsdistancearea.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -332,7 +332,7 @@ void TestQgsDistanceArea::regression14675() QGSCOMPARENEAR( calc.measureArea( &geom ), 0.83301, 0.02 ); } -QTEST_MAIN( TestQgsDistanceArea ) +QGSTEST_MAIN( TestQgsDistanceArea ) #include "testqgsdistancearea.moc" diff --git a/tests/src/core/testqgsellipsemarker.cpp b/tests/src/core/testqgsellipsemarker.cpp index 78c9907e37a..f625f956382 100644 --- a/tests/src/core/testqgsellipsemarker.cpp +++ b/tests/src/core/testqgsellipsemarker.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -221,5 +221,5 @@ bool TestQgsEllipseMarkerSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsEllipseMarkerSymbol ) +QGSTEST_MAIN( TestQgsEllipseMarkerSymbol ) #include "testqgsellipsemarker.moc" diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp index d255629ad04..d9813096c93 100644 --- a/tests/src/core/testqgsexpression.cpp +++ b/tests/src/core/testqgsexpression.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -2680,6 +2680,6 @@ class TestQgsExpression: public QObject }; -QTEST_MAIN( TestQgsExpression ) +QGSTEST_MAIN( TestQgsExpression ) #include "testqgsexpression.moc" diff --git a/tests/src/core/testqgsexpressioncontext.cpp b/tests/src/core/testqgsexpressioncontext.cpp index 70e6fd8e94f..71fbaba42dd 100644 --- a/tests/src/core/testqgsexpressioncontext.cpp +++ b/tests/src/core/testqgsexpressioncontext.cpp @@ -22,7 +22,7 @@ #include "qgsproject.h" #include "qgscolorscheme.h" #include -#include +#include "qgstest.h" class TestQgsExpressionContext : public QObject { @@ -687,5 +687,5 @@ void TestQgsExpressionContext::cache() QVERIFY( !c.cachedValue( "test" ).isValid() ); } -QTEST_MAIN( TestQgsExpressionContext ) +QGSTEST_MAIN( TestQgsExpressionContext ) #include "testqgsexpressioncontext.moc" diff --git a/tests/src/core/testqgsfeature.cpp b/tests/src/core/testqgsfeature.cpp index 3d7efcd96e7..92e50859d12 100644 --- a/tests/src/core/testqgsfeature.cpp +++ b/tests/src/core/testqgsfeature.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -519,5 +519,5 @@ void TestQgsFeature::dataStream() QCOMPARE( resultFeature.isValid(), originalFeature.isValid() ); } -QTEST_MAIN( TestQgsFeature ) +QGSTEST_MAIN( TestQgsFeature ) #include "testqgsfeature.moc" diff --git a/tests/src/core/testqgsfield.cpp b/tests/src/core/testqgsfield.cpp index 60d846e22dd..b2936aecf03 100644 --- a/tests/src/core/testqgsfield.cpp +++ b/tests/src/core/testqgsfield.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp index f33041894ed..6c5248b96ba 100644 --- a/tests/src/core/testqgsfields.cpp +++ b/tests/src/core/testqgsfields.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -602,5 +602,5 @@ void TestQgsFields::constIterator() QCOMPARE( it3 - it, 1 ); } -QTEST_MAIN( TestQgsFields ) +QGSTEST_MAIN( TestQgsFields ) #include "testqgsfields.moc" diff --git a/tests/src/core/testqgsfilledmarker.cpp b/tests/src/core/testqgsfilledmarker.cpp index 309a791d05d..1b8a47f7a00 100644 --- a/tests/src/core/testqgsfilledmarker.cpp +++ b/tests/src/core/testqgsfilledmarker.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -191,5 +191,5 @@ bool TestQgsFilledMarkerSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsFilledMarkerSymbol ) +QGSTEST_MAIN( TestQgsFilledMarkerSymbol ) #include "testqgsfilledmarker.moc" diff --git a/tests/src/core/testqgsfontmarker.cpp b/tests/src/core/testqgsfontmarker.cpp index 82f7173dc67..88621ab4e08 100644 --- a/tests/src/core/testqgsfontmarker.cpp +++ b/tests/src/core/testqgsfontmarker.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -188,5 +188,5 @@ bool TestQgsFontMarkerSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsFontMarkerSymbol ) +QGSTEST_MAIN( TestQgsFontMarkerSymbol ) #include "testqgsfontmarker.moc" diff --git a/tests/src/core/testqgsfontutils.cpp b/tests/src/core/testqgsfontutils.cpp index 5499c102af0..5c7f4af0361 100644 --- a/tests/src/core/testqgsfontutils.cpp +++ b/tests/src/core/testqgsfontutils.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -164,5 +164,5 @@ void TestQgsFontUtils::toCss() QCOMPARE( QgsFontUtils::asCSS( f1, 10 ), QString( "font-family: QGIS Vera Sans;font-style: oblique;font-weight: 700;font-size: 125px;" ) ); } -QTEST_MAIN( TestQgsFontUtils ) +QGSTEST_MAIN( TestQgsFontUtils ) #include "testqgsfontutils.moc" diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp index d233d31675a..b629aa93d23 100644 --- a/tests/src/core/testqgsgeometry.cpp +++ b/tests/src/core/testqgsgeometry.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -4044,5 +4044,5 @@ void TestQgsGeometry::poleOfInaccessibility() QGSCOMPARENEAR( point.y(), -0.2434, 0.0001 ); } -QTEST_MAIN( TestQgsGeometry ) +QGSTEST_MAIN( TestQgsGeometry ) #include "testqgsgeometry.moc" diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp index 4cd25cdc024..ee400632331 100644 --- a/tests/src/core/testqgsgeometryimport.cpp +++ b/tests/src/core/testqgsgeometryimport.cpp @@ -20,7 +20,7 @@ #include -#include +#include "qgstest.h" #include class TestQgsGeometryImport: public QObject @@ -242,5 +242,5 @@ bool TestQgsGeometryImport::compareLineStrings( const QgsPolyline& polyline, QVa return true; } -QTEST_MAIN( TestQgsGeometryImport ) +QGSTEST_MAIN( TestQgsGeometryImport ) #include "testqgsgeometryimport.moc" diff --git a/tests/src/core/testqgsgeometryutils.cpp b/tests/src/core/testqgsgeometryutils.cpp index 2623e30f496..9bbe4dc6a02 100644 --- a/tests/src/core/testqgsgeometryutils.cpp +++ b/tests/src/core/testqgsgeometryutils.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include "qgsgeometryutils.h" #include "qgslinestring.h" @@ -540,5 +540,5 @@ void TestQgsGeometryUtils::testAngleThreePoints() -QTEST_MAIN( TestQgsGeometryUtils ) +QGSTEST_MAIN( TestQgsGeometryUtils ) #include "testqgsgeometryutils.moc" diff --git a/tests/src/core/testqgsgml.cpp b/tests/src/core/testqgsgml.cpp index 656cdf5ef3d..099b81857ae 100644 --- a/tests/src/core/testqgsgml.cpp +++ b/tests/src/core/testqgsgml.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include //qgis includes... @@ -1103,5 +1103,5 @@ void TestQgsGML::testThroughOGRGeometry_urn_EPSG_4326() delete features[0].first; } -QTEST_MAIN( TestQgsGML ) +QGSTEST_MAIN( TestQgsGML ) #include "testqgsgml.moc" diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp index a8b2548721e..96ddc9050ea 100644 --- a/tests/src/core/testqgsgradients.cpp +++ b/tests/src/core/testqgsgradients.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -294,5 +294,5 @@ bool TestQgsGradients::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsGradients ) +QGSTEST_MAIN( TestQgsGradients ) #include "testqgsgradients.moc" diff --git a/tests/src/core/testqgsgraduatedsymbolrenderer.cpp b/tests/src/core/testqgsgraduatedsymbolrenderer.cpp index 123d1c9fdc7..6ac3c107b73 100644 --- a/tests/src/core/testqgsgraduatedsymbolrenderer.cpp +++ b/tests/src/core/testqgsgraduatedsymbolrenderer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -137,5 +137,5 @@ void TestQgsGraduatedSymbolRenderer::rangesHaveGaps() QVERIFY( renderer.rangesHaveGaps() ); } -QTEST_MAIN( TestQgsGraduatedSymbolRenderer ) +QGSTEST_MAIN( TestQgsGraduatedSymbolRenderer ) #include "testqgsgraduatedsymbolrenderer.moc" diff --git a/tests/src/core/testqgshistogram.cpp b/tests/src/core/testqgshistogram.cpp index c7055d94d1f..82a082260b1 100644 --- a/tests/src/core/testqgshistogram.cpp +++ b/tests/src/core/testqgshistogram.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include -#include +#include "qgstest.h" #include "qgsapplication.h" #include "qgsvectorlayer.h" @@ -153,5 +153,5 @@ void TestQgsHistogram::fromLayer() delete layer; } -QTEST_MAIN( TestQgsHistogram ) +QGSTEST_MAIN( TestQgsHistogram ) #include "testqgshistogram.moc" diff --git a/tests/src/core/testqgsimageoperation.cpp b/tests/src/core/testqgsimageoperation.cpp index 179f7ae2daa..084fdfd5879 100644 --- a/tests/src/core/testqgsimageoperation.cpp +++ b/tests/src/core/testqgsimageoperation.cpp @@ -18,7 +18,7 @@ #include "qgsimageoperation.h" #include "qgscolorramp.h" #include -#include +#include "qgstest.h" #include "qgsrenderchecker.h" #include "qgssymbollayerutils.h" #include "qgsapplication.h" @@ -473,5 +473,5 @@ bool TestQgsImageOperation::imageCheck( const QString& testName, QImage &image, return resultFlag; } -QTEST_MAIN( TestQgsImageOperation ) +QGSTEST_MAIN( TestQgsImageOperation ) #include "testqgsimageoperation.moc" diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp index 6e1765a35e6..c2c1f843cc2 100644 --- a/tests/src/core/testqgsinvertedpolygonrenderer.cpp +++ b/tests/src/core/testqgsinvertedpolygonrenderer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -211,5 +211,5 @@ bool TestQgsInvertedPolygon::imageCheck( const QString& theTestType, const QgsRe return myResultFlag; } -QTEST_MAIN( TestQgsInvertedPolygon ) +QGSTEST_MAIN( TestQgsInvertedPolygon ) #include "testqgsinvertedpolygonrenderer.moc" diff --git a/tests/src/core/testqgsjsonutils.cpp b/tests/src/core/testqgsjsonutils.cpp index b492488326a..3c06bf16643 100644 --- a/tests/src/core/testqgsjsonutils.cpp +++ b/tests/src/core/testqgsjsonutils.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include class TestQgsJSONUtils : public QObject @@ -72,5 +72,5 @@ class TestQgsJSONUtils : public QObject } }; -QTEST_MAIN( TestQgsJSONUtils ) +QGSTEST_MAIN( TestQgsJSONUtils ) #include "testqgsjsonutils.moc" diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp index 4306ba0991d..a99b5cb0e18 100644 --- a/tests/src/core/testqgslabelingengine.cpp +++ b/tests/src/core/testqgslabelingengine.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -556,5 +556,5 @@ bool TestQgsLabelingEngine::imageCheck( const QString& testName, QImage &image, return resultFlag; } -QTEST_MAIN( TestQgsLabelingEngine ) +QGSTEST_MAIN( TestQgsLabelingEngine ) #include "testqgslabelingengine.moc" diff --git a/tests/src/core/testqgslayertree.cpp b/tests/src/core/testqgslayertree.cpp index d5b1fdbd488..f1037fd3215 100644 --- a/tests/src/core/testqgslayertree.cpp +++ b/tests/src/core/testqgslayertree.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -483,5 +483,5 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRenderer* renderer ) } -QTEST_MAIN( TestQgsLayerTree ) +QGSTEST_MAIN( TestQgsLayerTree ) #include "testqgslayertree.moc" diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp index aa61750ec97..ec4a1cdcd3d 100644 --- a/tests/src/core/testqgslegendrenderer.cpp +++ b/tests/src/core/testqgslegendrenderer.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include "qgsapplication.h" @@ -725,5 +725,5 @@ void TestQgsLegendRenderer::testDiagramSizeLegend() QgsProject::instance()->removeMapLayer( vl4 ); } -QTEST_MAIN( TestQgsLegendRenderer ) +QGSTEST_MAIN( TestQgsLegendRenderer ) #include "testqgslegendrenderer.moc" diff --git a/tests/src/core/testqgslinefillsymbol.cpp b/tests/src/core/testqgslinefillsymbol.cpp index 4ba050bfdca..1ada3715a9f 100644 --- a/tests/src/core/testqgslinefillsymbol.cpp +++ b/tests/src/core/testqgslinefillsymbol.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -178,5 +178,5 @@ bool TestQgsLineFillSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsLineFillSymbol ) +QGSTEST_MAIN( TestQgsLineFillSymbol ) #include "testqgslinefillsymbol.moc" diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp index f0290806b10..bf7bea10c84 100644 --- a/tests/src/core/testqgsmaplayer.cpp +++ b/tests/src/core/testqgsmaplayer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -152,5 +152,5 @@ void TestQgsMapLayer::isInScaleRange() } -QTEST_MAIN( TestQgsMapLayer ) +QGSTEST_MAIN( TestQgsMapLayer ) #include "testqgsmaplayer.moc" diff --git a/tests/src/core/testqgsmaplayerstylemanager.cpp b/tests/src/core/testqgsmaplayerstylemanager.cpp index d498336e1f4..eabb51ce59a 100644 --- a/tests/src/core/testqgsmaplayerstylemanager.cpp +++ b/tests/src/core/testqgsmaplayerstylemanager.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include "qgsapplication.h" @@ -203,5 +203,5 @@ void TestQgsMapLayerStyleManager::testSwitchingStyles() } -QTEST_MAIN( TestQgsMapLayerStyleManager ) +QGSTEST_MAIN( TestQgsMapLayerStyleManager ) #include "testqgsmaplayerstylemanager.moc" diff --git a/tests/src/core/testqgsmaprendererjob.cpp b/tests/src/core/testqgsmaprendererjob.cpp index 3c855cd793a..eed54e43369 100644 --- a/tests/src/core/testqgsmaprendererjob.cpp +++ b/tests/src/core/testqgsmaprendererjob.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -332,7 +332,7 @@ void TestQgsMapRendererJob::testFourAdjacentTiles() } -QTEST_MAIN( TestQgsMapRendererJob ) +QGSTEST_MAIN( TestQgsMapRendererJob ) #include "testqgsmaprendererjob.moc" diff --git a/tests/src/core/testqgsmaprotation.cpp b/tests/src/core/testqgsmaprotation.cpp index fabc51423ff..015e15f6aa0 100644 --- a/tests/src/core/testqgsmaprotation.cpp +++ b/tests/src/core/testqgsmaprotation.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -233,5 +233,5 @@ bool TestQgsMapRotation::render( const QString& theTestType ) return result; } -QTEST_MAIN( TestQgsMapRotation ) +QGSTEST_MAIN( TestQgsMapRotation ) #include "testqgsmaprotation.moc" diff --git a/tests/src/core/testqgsmapsettings.cpp b/tests/src/core/testqgsmapsettings.cpp index 8d27addba88..cf0a092d247 100644 --- a/tests/src/core/testqgsmapsettings.cpp +++ b/tests/src/core/testqgsmapsettings.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -194,5 +194,5 @@ void TestQgsMapSettings::testMapLayerListUtils() delete vlB; } -QTEST_MAIN( TestQgsMapSettings ) +QGSTEST_MAIN( TestQgsMapSettings ) #include "testqgsmapsettings.moc" diff --git a/tests/src/core/testqgsmaptopixel.cpp b/tests/src/core/testqgsmaptopixel.cpp index d767f70cf7b..186e6c37a77 100644 --- a/tests/src/core/testqgsmaptopixel.cpp +++ b/tests/src/core/testqgsmaptopixel.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include //header for class being tested @@ -106,7 +106,7 @@ void TestQgsMapToPixel::fromScale() QGSCOMPARENEAR( m2p.mapUnitsPerPixel(), 0.000265, 0.000001 ); } -QTEST_MAIN( TestQgsMapToPixel ) +QGSTEST_MAIN( TestQgsMapToPixel ) #include "testqgsmaptopixel.moc" diff --git a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp index da0afa47e7e..7717695bc15 100644 --- a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp +++ b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -206,5 +206,5 @@ void TestQgsMapToPixelGeometrySimplifier::testVisvalingam() QCOMPARE( simplifier.simplify( g ).exportToWkt(), expectedWkt ); } -QTEST_MAIN( TestQgsMapToPixelGeometrySimplifier ) +QGSTEST_MAIN( TestQgsMapToPixelGeometrySimplifier ) #include "testqgsmaptopixelgeometrysimplifier.moc" diff --git a/tests/src/core/testqgsmarkerlinesymbol.cpp b/tests/src/core/testqgsmarkerlinesymbol.cpp index c65c73ebe14..b243dc0153b 100644 --- a/tests/src/core/testqgsmarkerlinesymbol.cpp +++ b/tests/src/core/testqgsmarkerlinesymbol.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -214,5 +214,5 @@ bool TestQgsMarkerLineSymbol::render( const QString& theTestType ) return result; } -QTEST_MAIN( TestQgsMarkerLineSymbol ) +QGSTEST_MAIN( TestQgsMarkerLineSymbol ) #include "testqgsmarkerlinesymbol.moc" diff --git a/tests/src/core/testqgsnetworkcontentfetcher.cpp b/tests/src/core/testqgsnetworkcontentfetcher.cpp index 44407d5bb5d..c5b378c3604 100644 --- a/tests/src/core/testqgsnetworkcontentfetcher.cpp +++ b/tests/src/core/testqgsnetworkcontentfetcher.cpp @@ -18,7 +18,7 @@ #include "qgsnetworkcontentfetcher.h" #include "qgsapplication.h" #include -#include +#include "qgstest.h" #include class TestQgsNetworkContentFetcher : public QObject @@ -116,5 +116,5 @@ void TestQgsNetworkContentFetcher::contentLoaded() mLoaded = true; } -QTEST_MAIN( TestQgsNetworkContentFetcher ) +QGSTEST_MAIN( TestQgsNetworkContentFetcher ) #include "testqgsnetworkcontentfetcher.moc" diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp index 2a7f7a50a84..b5901737ad0 100644 --- a/tests/src/core/testqgsogcutils.cpp +++ b/tests/src/core/testqgsogcutils.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include //qgis includes... @@ -1023,5 +1023,5 @@ void TestQgsOgcUtils::testSQLStatementToOgcFilter_data() "" ); } -QTEST_MAIN( TestQgsOgcUtils ) +QGSTEST_MAIN( TestQgsOgcUtils ) #include "testqgsogcutils.moc" diff --git a/tests/src/core/testqgsogrutils.cpp b/tests/src/core/testqgsogrutils.cpp index 0efd8b77ef4..7afeaab48df 100644 --- a/tests/src/core/testqgsogrutils.cpp +++ b/tests/src/core/testqgsogrutils.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -389,5 +389,5 @@ void TestQgsOgrUtils::stringToFields() -QTEST_MAIN( TestQgsOgrUtils ) +QGSTEST_MAIN( TestQgsOgrUtils ) #include "testqgsogrutils.moc" diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp index 2f80ef9df01..99f5a91b9b1 100644 --- a/tests/src/core/testqgspainteffect.cpp +++ b/tests/src/core/testqgspainteffect.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -945,5 +945,5 @@ bool TestQgsPaintEffect::mapRenderCheck( const QString& testName, QgsMapSettings return result; } -QTEST_MAIN( TestQgsPaintEffect ) +QGSTEST_MAIN( TestQgsPaintEffect ) #include "testqgspainteffect.moc" diff --git a/tests/src/core/testqgspainteffectregistry.cpp b/tests/src/core/testqgspainteffectregistry.cpp index 2b6f4f82929..a089145430d 100644 --- a/tests/src/core/testqgspainteffectregistry.cpp +++ b/tests/src/core/testqgspainteffectregistry.cpp @@ -21,7 +21,7 @@ #include "qgsrendercontext.h" #include -#include +#include "qgstest.h" //dummy paint effect for testing class DummyPaintEffect : public QgsPaintEffect @@ -174,5 +174,5 @@ void TestQgsPaintEffectRegistry::defaultStack() delete effect2; } -QTEST_MAIN( TestQgsPaintEffectRegistry ) +QGSTEST_MAIN( TestQgsPaintEffectRegistry ) #include "testqgspainteffectregistry.moc" diff --git a/tests/src/core/testqgspallabeling.cpp b/tests/src/core/testqgspallabeling.cpp index 42ac74ba5e5..e818ecac7f0 100644 --- a/tests/src/core/testqgspallabeling.cpp +++ b/tests/src/core/testqgspallabeling.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -170,5 +170,5 @@ void TestQgsPalLabeling::graphemes() << expected2Pt11 ); } -QTEST_MAIN( TestQgsPalLabeling ) +QGSTEST_MAIN( TestQgsPalLabeling ) #include "testqgspallabeling.moc" diff --git a/tests/src/core/testqgspoint.cpp b/tests/src/core/testqgspoint.cpp index 153a316d90f..52e0f83788e 100644 --- a/tests/src/core/testqgspoint.cpp +++ b/tests/src/core/testqgspoint.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -760,5 +760,5 @@ void TestQgsPoint::vector() QCOMPARE( v1.y(), 3.0 ); } -QTEST_MAIN( TestQgsPoint ) +QGSTEST_MAIN( TestQgsPoint ) #include "testqgspoint.moc" diff --git a/tests/src/core/testqgspointlocator.cpp b/tests/src/core/testqgspointlocator.cpp index 64b699a397a..5c47ddb5d3e 100644 --- a/tests/src/core/testqgspointlocator.cpp +++ b/tests/src/core/testqgspointlocator.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -306,6 +306,6 @@ class TestQgsPointLocator : public QObject } }; -QTEST_MAIN( TestQgsPointLocator ) +QGSTEST_MAIN( TestQgsPointLocator ) #include "testqgspointlocator.moc" diff --git a/tests/src/core/testqgspointpatternfillsymbol.cpp b/tests/src/core/testqgspointpatternfillsymbol.cpp index 874f795868b..8010c288cc2 100644 --- a/tests/src/core/testqgspointpatternfillsymbol.cpp +++ b/tests/src/core/testqgspointpatternfillsymbol.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -180,5 +180,5 @@ bool TestQgsPointPatternFillSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsPointPatternFillSymbol ) +QGSTEST_MAIN( TestQgsPointPatternFillSymbol ) #include "testqgspointpatternfillsymbol.moc" diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp index c8abaa60bb0..1f94eca385d 100644 --- a/tests/src/core/testqgsproject.cpp +++ b/tests/src/core/testqgsproject.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -140,5 +140,5 @@ void TestQgsProject::variablesChanged() } -QTEST_MAIN( TestQgsProject ) +QGSTEST_MAIN( TestQgsProject ) #include "testqgsproject.moc" diff --git a/tests/src/core/testqgsrasterfilewriter.cpp b/tests/src/core/testqgsrasterfilewriter.cpp index be794e21f94..d4bf4aa9d44 100644 --- a/tests/src/core/testqgsrasterfilewriter.cpp +++ b/tests/src/core/testqgsrasterfilewriter.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -189,5 +189,5 @@ void TestQgsRasterFileWriter::logError( const QString& msg ) qDebug() << msg; } -QTEST_MAIN( TestQgsRasterFileWriter ) +QGSTEST_MAIN( TestQgsRasterFileWriter ) #include "testqgsrasterfilewriter.moc" diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp index 2c79318fcc0..c8c18f098ed 100644 --- a/tests/src/core/testqgsrasterfill.cpp +++ b/tests/src/core/testqgsrasterfill.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -223,5 +223,5 @@ bool TestQgsRasterFill::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsRasterFill ) +QGSTEST_MAIN( TestQgsRasterFill ) #include "testqgsrasterfill.moc" diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp index 3db8c42b588..03973d54f3c 100644 --- a/tests/src/core/testqgsrasterlayer.cpp +++ b/tests/src/core/testqgsrasterlayer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -723,5 +723,5 @@ void TestQgsRasterLayer::testRefreshRendererIfNeeded() QGSCOMPARENOTNEAR( initMinVal, newMinVal, 1e-5 ); } -QTEST_MAIN( TestQgsRasterLayer ) +QGSTEST_MAIN( TestQgsRasterLayer ) #include "testqgsrasterlayer.moc" diff --git a/tests/src/core/testqgsrastersublayer.cpp b/tests/src/core/testqgsrastersublayer.cpp index 54f57bba69b..40698145a22 100644 --- a/tests/src/core/testqgsrastersublayer.cpp +++ b/tests/src/core/testqgsrastersublayer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -183,5 +183,5 @@ void TestQgsRasterSubLayer::checkStats() } -QTEST_MAIN( TestQgsRasterSubLayer ) +QGSTEST_MAIN( TestQgsRasterSubLayer ) #include "testqgsrastersublayer.moc" diff --git a/tests/src/core/testqgsrectangle.cpp b/tests/src/core/testqgsrectangle.cpp index 3a0f9ff0090..dab6cd77694 100644 --- a/tests/src/core/testqgsrectangle.cpp +++ b/tests/src/core/testqgsrectangle.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include //header for class being tested @@ -85,7 +85,7 @@ void TestQgsRectangle::regression6194() QVERIFY( rect1 == rect2 ); } -QTEST_MAIN( TestQgsRectangle ) +QGSTEST_MAIN( TestQgsRectangle ) #include "testqgsrectangle.moc" diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp index 1a5aec062ec..378eae0af53 100644 --- a/tests/src/core/testqgsrenderers.cpp +++ b/tests/src/core/testqgsrenderers.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -236,5 +236,5 @@ bool TestQgsRenderers::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsRenderers ) +QGSTEST_MAIN( TestQgsRenderers ) #include "testqgsrenderers.moc" diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp index 55b77c7fd08..f021be4b78a 100644 --- a/tests/src/core/testqgsrulebasedrenderer.cpp +++ b/tests/src/core/testqgsrulebasedrenderer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include //header for class being tested @@ -181,6 +181,6 @@ class TestQgsRuleBasedRenderer: public QObject }; -QTEST_MAIN( TestQgsRuleBasedRenderer ) +QGSTEST_MAIN( TestQgsRuleBasedRenderer ) #include "testqgsrulebasedrenderer.moc" diff --git a/tests/src/core/testqgsscaleexpression.cpp b/tests/src/core/testqgsscaleexpression.cpp index 292e0d00c3a..91977bad4c7 100644 --- a/tests/src/core/testqgsscaleexpression.cpp +++ b/tests/src/core/testqgsscaleexpression.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -106,6 +106,6 @@ class TestQgsScaleExpression: public QObject } }; -QTEST_MAIN( TestQgsScaleExpression ) +QGSTEST_MAIN( TestQgsScaleExpression ) #include "testqgsscaleexpression.moc" diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp index beb9f51036b..5b1b6c53c6f 100644 --- a/tests/src/core/testqgsshapeburst.cpp +++ b/tests/src/core/testqgsshapeburst.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -253,5 +253,5 @@ bool TestQgsShapeburst::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsShapeburst ) +QGSTEST_MAIN( TestQgsShapeburst ) #include "testqgsshapeburst.moc" diff --git a/tests/src/core/testqgssimplemarker.cpp b/tests/src/core/testqgssimplemarker.cpp index 63b9ee0bc67..5a9ffbeaae0 100644 --- a/tests/src/core/testqgssimplemarker.cpp +++ b/tests/src/core/testqgssimplemarker.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -292,5 +292,5 @@ bool TestQgsSimpleMarkerSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsSimpleMarkerSymbol ) +QGSTEST_MAIN( TestQgsSimpleMarkerSymbol ) #include "testqgssimplemarker.moc" diff --git a/tests/src/core/testqgssnappingutils.cpp b/tests/src/core/testqgssnappingutils.cpp index c79e9cad442..f2b881922b9 100644 --- a/tests/src/core/testqgssnappingutils.cpp +++ b/tests/src/core/testqgssnappingutils.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -238,7 +238,7 @@ class TestQgsSnappingUtils : public QObject } }; -QTEST_MAIN( TestQgsSnappingUtils ) +QGSTEST_MAIN( TestQgsSnappingUtils ) #include "testqgssnappingutils.moc" diff --git a/tests/src/core/testqgsspatialindex.cpp b/tests/src/core/testqgsspatialindex.cpp index b033c34079d..628aed14fc6 100644 --- a/tests/src/core/testqgsspatialindex.cpp +++ b/tests/src/core/testqgsspatialindex.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -205,7 +205,7 @@ class TestQgsSpatialIndex : public QObject }; -QTEST_MAIN( TestQgsSpatialIndex ) +QGSTEST_MAIN( TestQgsSpatialIndex ) #include "testqgsspatialindex.moc" diff --git a/tests/src/core/testqgsstatisticalsummary.cpp b/tests/src/core/testqgsstatisticalsummary.cpp index b4298cfcfe6..1c776bdd745 100644 --- a/tests/src/core/testqgsstatisticalsummary.cpp +++ b/tests/src/core/testqgsstatisticalsummary.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -299,5 +299,5 @@ void TestQgsStatisticSummary::countMissing() QCOMPARE( s.statistic( QgsStatisticalSummary::CountMissing ), 3.0 ); } -QTEST_MAIN( TestQgsStatisticSummary ) +QGSTEST_MAIN( TestQgsStatisticSummary ) #include "testqgsstatisticalsummary.moc" diff --git a/tests/src/core/testqgsstringutils.cpp b/tests/src/core/testqgsstringutils.cpp index 63490c0405c..5087efabb9c 100644 --- a/tests/src/core/testqgsstringutils.cpp +++ b/tests/src/core/testqgsstringutils.cpp @@ -17,7 +17,7 @@ #include "qgsstringutils.h" #include -#include +#include "qgstest.h" class TestQgsStringUtils : public QObject { @@ -155,5 +155,5 @@ void TestQgsStringUtils::insertLinks() } -QTEST_MAIN( TestQgsStringUtils ) +QGSTEST_MAIN( TestQgsStringUtils ) #include "testqgsstringutils.moc" diff --git a/tests/src/core/testqgsstyle.cpp b/tests/src/core/testqgsstyle.cpp index df597ca6043..d125e220c1c 100644 --- a/tests/src/core/testqgsstyle.cpp +++ b/tests/src/core/testqgsstyle.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -391,5 +391,5 @@ void TestStyle::testTags() QVERIFY( symbols.contains( "red circle" ) ); } -QTEST_MAIN( TestStyle ) +QGSTEST_MAIN( TestStyle ) #include "testqgsstyle.moc" diff --git a/tests/src/core/testqgssvgmarker.cpp b/tests/src/core/testqgssvgmarker.cpp index e7de22195d1..d4920f92cc5 100644 --- a/tests/src/core/testqgssvgmarker.cpp +++ b/tests/src/core/testqgssvgmarker.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -174,5 +174,5 @@ bool TestQgsSvgMarkerSymbol::imageCheck( const QString& theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsSvgMarkerSymbol ) +QGSTEST_MAIN( TestQgsSvgMarkerSymbol ) #include "testqgssvgmarker.moc" diff --git a/tests/src/core/testqgssymbol.cpp b/tests/src/core/testqgssymbol.cpp index 59386b43ab5..a5b18519176 100644 --- a/tests/src/core/testqgssymbol.cpp +++ b/tests/src/core/testqgssymbol.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -455,5 +455,5 @@ void TestQgsSymbol::symbolProperties() delete fillSymbol2; } -QTEST_MAIN( TestQgsSymbol ) +QGSTEST_MAIN( TestQgsSymbol ) #include "testqgssymbol.moc" diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp index ca65b8d599d..c5e442550b5 100644 --- a/tests/src/core/testqgstaskmanager.cpp +++ b/tests/src/core/testqgstaskmanager.cpp @@ -21,7 +21,7 @@ #include "qgsapplication.h" #include #include -#include +#include "qgstest.h" class TestTask : public QgsTask { @@ -1190,5 +1190,5 @@ void TestQgsTaskManager::managerWithSubTasks3() QCOMPARE( manager3.dependencies( subTask2Id ), QSet< long >() ); } -QTEST_MAIN( TestQgsTaskManager ) +QGSTEST_MAIN( TestQgsTaskManager ) #include "testqgstaskmanager.moc" diff --git a/tests/src/core/testqgstracer.cpp b/tests/src/core/testqgstracer.cpp index 7e9d4f0735a..4a697e71c33 100644 --- a/tests/src/core/testqgstracer.cpp +++ b/tests/src/core/testqgstracer.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -354,5 +354,5 @@ void TestQgsTracer::testCurved() } -QTEST_MAIN( TestQgsTracer ) +QGSTEST_MAIN( TestQgsTracer ) #include "testqgstracer.moc" diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp index a321ae46381..46c49b5053f 100644 --- a/tests/src/core/testqgsvectordataprovider.cpp +++ b/tests/src/core/testqgsvectordataprovider.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -228,6 +228,6 @@ void TestQgsVectorDataProvider::featureAtId() } -QTEST_MAIN( TestQgsVectorDataProvider ) +QGSTEST_MAIN( TestQgsVectorDataProvider ) #include "testqgsvectordataprovider.moc" diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp index 580010e6e1d..cb5094be570 100644 --- a/tests/src/core/testqgsvectorfilewriter.cpp +++ b/tests/src/core/testqgsvectorfilewriter.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -460,5 +460,5 @@ void TestQgsVectorFileWriter::regression1141() QVERIFY( QgsVectorFileWriter::deleteShapeFile( fileName ) ); } -QTEST_MAIN( TestQgsVectorFileWriter ) +QGSTEST_MAIN( TestQgsVectorFileWriter ) #include "testqgsvectorfilewriter.moc" diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp index 3734edd01ff..3d1db9adcbd 100644 --- a/tests/src/core/testqgsvectorlayer.cpp +++ b/tests/src/core/testqgsvectorlayer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -337,5 +337,5 @@ void TestQgsVectorLayer::isSpatial() QVERIFY( !mpNonSpatialLayer->isSpatial() ); } -QTEST_MAIN( TestQgsVectorLayer ) +QGSTEST_MAIN( TestQgsVectorLayer ) #include "testqgsvectorlayer.moc" diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp index 1cdf83eb464..6de098ed34b 100644 --- a/tests/src/core/testqgsvectorlayercache.cpp +++ b/tests/src/core/testqgsvectorlayercache.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -337,5 +337,5 @@ void TestVectorLayerCache::onCommittedFeaturesAdded( const QString& layerId, con mAddedFeatures.append( features ); } -QTEST_MAIN( TestVectorLayerCache ) +QGSTEST_MAIN( TestVectorLayerCache ) #include "testqgsvectorlayercache.moc" diff --git a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp index 68b87d47cc2..8bd9012777e 100644 --- a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp +++ b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include //qgis includes... @@ -604,7 +604,7 @@ void TestVectorLayerJoinBuffer::testCacheUpdate() } -QTEST_MAIN( TestVectorLayerJoinBuffer ) +QGSTEST_MAIN( TestVectorLayerJoinBuffer ) #include "testqgsvectorlayerjoinbuffer.moc" diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp index b7fc303e92f..b584e06fac9 100644 --- a/tests/src/core/testziplayer.cpp +++ b/tests/src/core/testziplayer.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -550,5 +550,5 @@ void TestZipLayer::testZipItemVRT() } } -QTEST_MAIN( TestZipLayer ) +QGSTEST_MAIN( TestZipLayer ) #include "testziplayer.moc" diff --git a/tests/src/gui/testprojectionissues.cpp b/tests/src/gui/testprojectionissues.cpp index b8b12a35e8f..1370b8c97b3 100644 --- a/tests/src/gui/testprojectionissues.cpp +++ b/tests/src/gui/testprojectionissues.cpp @@ -22,7 +22,7 @@ #include "qgsrasterdataprovider.h" #include "qgsrasterlayer.h" #include -#include +#include "qgstest.h" #include "qgstestutils.h" class TestProjectionIssues : public QObject @@ -134,5 +134,5 @@ void TestProjectionIssues::issue15183() QGSCOMPARENEARPOINT( initialExtent.center(), currentExtent.center(), 0.00001 ); } -QTEST_MAIN( TestProjectionIssues ) +QGSTEST_MAIN( TestProjectionIssues ) #include "testprojectionissues.moc" diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp index c1a986129fa..4bcbbe04175 100644 --- a/tests/src/gui/testqgsattributeform.cpp +++ b/tests/src/gui/testqgsattributeform.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -305,5 +305,5 @@ void TestQgsAttributeForm::testOKButtonStatus() QVERIFY( !okButton->isEnabled() ); } -QTEST_MAIN( TestQgsAttributeForm ) +QGSTEST_MAIN( TestQgsAttributeForm ) #include "testqgsattributeform.moc" diff --git a/tests/src/gui/testqgsdockwidget.cpp b/tests/src/gui/testqgsdockwidget.cpp index 0b0ec422c5c..65da5d3d58a 100644 --- a/tests/src/gui/testqgsdockwidget.cpp +++ b/tests/src/gui/testqgsdockwidget.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include "qgsdockwidget.h" #include @@ -176,5 +176,5 @@ void TestQgsDockWidget::testSetUserVisible() } -QTEST_MAIN( TestQgsDockWidget ) +QGSTEST_MAIN( TestQgsDockWidget ) #include "testqgsdockwidget.moc" diff --git a/tests/src/gui/testqgsdoublespinbox.cpp b/tests/src/gui/testqgsdoublespinbox.cpp index 3af7231715c..dd78ab407c8 100644 --- a/tests/src/gui/testqgsdoublespinbox.cpp +++ b/tests/src/gui/testqgsdoublespinbox.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include @@ -144,5 +144,5 @@ void TestQgsDoubleSpinBox::expression() delete spinBox; } -QTEST_MAIN( TestQgsDoubleSpinBox ) +QGSTEST_MAIN( TestQgsDoubleSpinBox ) #include "testqgsdoublespinbox.moc" diff --git a/tests/src/gui/testqgsdualview.cpp b/tests/src/gui/testqgsdualview.cpp index 92ad6f09bbd..ae26791d5ed 100644 --- a/tests/src/gui/testqgsdualview.cpp +++ b/tests/src/gui/testqgsdualview.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include diff --git a/tests/src/gui/testqgseditorwidgetregistry.cpp b/tests/src/gui/testqgseditorwidgetregistry.cpp index b60cebb983d..5b31be0ba54 100644 --- a/tests/src/gui/testqgseditorwidgetregistry.cpp +++ b/tests/src/gui/testqgseditorwidgetregistry.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include "qgseditorwidgetregistry.h" #include "qgseditorwidgetautoconf.h" @@ -153,5 +153,5 @@ class TestQgsEditorWidgetRegistry: public QObject } }; -QTEST_MAIN( TestQgsEditorWidgetRegistry ) +QGSTEST_MAIN( TestQgsEditorWidgetRegistry ) #include "testqgseditorwidgetregistry.moc" diff --git a/tests/src/gui/testqgsfieldexpressionwidget.cpp b/tests/src/gui/testqgsfieldexpressionwidget.cpp index c21a813a0de..3b271217035 100644 --- a/tests/src/gui/testqgsfieldexpressionwidget.cpp +++ b/tests/src/gui/testqgsfieldexpressionwidget.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include //qgis includes... @@ -272,7 +272,7 @@ void TestQgsFieldExpressionWidget::testFilters() QgsProject::instance()->removeMapLayer( layer ); } -QTEST_MAIN( TestQgsFieldExpressionWidget ) +QGSTEST_MAIN( TestQgsFieldExpressionWidget ) #include "testqgsfieldexpressionwidget.moc" diff --git a/tests/src/gui/testqgsfiledownloader.cpp b/tests/src/gui/testqgsfiledownloader.cpp index 8027b1dd880..8301223cec7 100644 --- a/tests/src/gui/testqgsfiledownloader.cpp +++ b/tests/src/gui/testqgsfiledownloader.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -248,7 +248,7 @@ void TestQgsFileDownloader::testSslError() #endif -QTEST_MAIN( TestQgsFileDownloader ) +QGSTEST_MAIN( TestQgsFileDownloader ) #include "testqgsfiledownloader.moc" diff --git a/tests/src/gui/testqgsfilewidget.cpp b/tests/src/gui/testqgsfilewidget.cpp index 69af72b62e0..8a81424538f 100644 --- a/tests/src/gui/testqgsfilewidget.cpp +++ b/tests/src/gui/testqgsfilewidget.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include "qgsfilewidget.h" @@ -83,5 +83,5 @@ void TestQgsFileWidget::toUrl() -QTEST_MAIN( TestQgsFileWidget ) +QGSTEST_MAIN( TestQgsFileWidget ) #include "testqgsfilewidget.moc" diff --git a/tests/src/gui/testqgsfocuswatcher.cpp b/tests/src/gui/testqgsfocuswatcher.cpp index b66d6903f58..377812e3d0c 100644 --- a/tests/src/gui/testqgsfocuswatcher.cpp +++ b/tests/src/gui/testqgsfocuswatcher.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include "qgsfocuswatcher.h" #include @@ -93,5 +93,5 @@ void TestQgsFocusWatcher::testSignals() } -QTEST_MAIN( TestQgsFocusWatcher ) +QGSTEST_MAIN( TestQgsFocusWatcher ) #include "testqgsfocuswatcher.moc" diff --git a/tests/src/gui/testqgsgui.cpp b/tests/src/gui/testqgsgui.cpp index 26521b2cdb9..fc98a85b8bc 100644 --- a/tests/src/gui/testqgsgui.cpp +++ b/tests/src/gui/testqgsgui.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include class TestQgsGui : public QObject @@ -41,5 +41,5 @@ void TestQgsGui::createFileFilter() QCOMPARE( actual, expected ); } -QTEST_MAIN( TestQgsGui ) +QGSTEST_MAIN( TestQgsGui ) #include "testqgsgui.moc" diff --git a/tests/src/gui/testqgskeyvaluewidget.cpp b/tests/src/gui/testqgskeyvaluewidget.cpp index 8483f14ce53..ce43a945bf6 100644 --- a/tests/src/gui/testqgskeyvaluewidget.cpp +++ b/tests/src/gui/testqgskeyvaluewidget.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -72,5 +72,5 @@ class TestQgsKeyValueWidget : public QObject } }; -QTEST_MAIN( TestQgsKeyValueWidget ) +QGSTEST_MAIN( TestQgsKeyValueWidget ) #include "testqgskeyvaluewidget.moc" diff --git a/tests/src/gui/testqgslistwidget.cpp b/tests/src/gui/testqgslistwidget.cpp index 394157dd9da..d576ea2950d 100644 --- a/tests/src/gui/testqgslistwidget.cpp +++ b/tests/src/gui/testqgslistwidget.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -122,5 +122,5 @@ class TestQgsListWidget : public QObject } }; -QTEST_MAIN( TestQgsListWidget ) +QGSTEST_MAIN( TestQgsListWidget ) #include "testqgslistwidget.moc" diff --git a/tests/src/gui/testqgsmapcanvas.cpp b/tests/src/gui/testqgsmapcanvas.cpp index 8924e4f8db8..56d3955b400 100644 --- a/tests/src/gui/testqgsmapcanvas.cpp +++ b/tests/src/gui/testqgsmapcanvas.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -402,5 +402,5 @@ void TestQgsMapCanvas::testShiftZoom() QGSCOMPARENEAR( mCanvas->extent().height(), originalHeight, 0.00001 ); } -QTEST_MAIN( TestQgsMapCanvas ) +QGSTEST_MAIN( TestQgsMapCanvas ) #include "testqgsmapcanvas.moc" diff --git a/tests/src/gui/testqgsmaptoolzoom.cpp b/tests/src/gui/testqgsmaptoolzoom.cpp index 8a33f5e4967..f1e5cc892b6 100644 --- a/tests/src/gui/testqgsmaptoolzoom.cpp +++ b/tests/src/gui/testqgsmaptoolzoom.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -97,7 +97,7 @@ void TestQgsMapToolZoom::zeroDragArea() QVERIFY2( before != after, "Extents didn't change" ); } -QTEST_MAIN( TestQgsMapToolZoom ) +QGSTEST_MAIN( TestQgsMapToolZoom ) #include "testqgsmaptoolzoom.moc" diff --git a/tests/src/gui/testqgsquickprint.cpp b/tests/src/gui/testqgsquickprint.cpp index 05aab48082d..20ba60a704f 100644 --- a/tests/src/gui/testqgsquickprint.cpp +++ b/tests/src/gui/testqgsquickprint.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -173,5 +173,5 @@ bool TestQgsQuickPrint::imageCheck( QString theTestType ) return myResultFlag; } -QTEST_MAIN( TestQgsQuickPrint ) +QGSTEST_MAIN( TestQgsQuickPrint ) #include "testqgsquickprint.moc" diff --git a/tests/src/gui/testqgsrasterhistogram.cpp b/tests/src/gui/testqgsrasterhistogram.cpp index dd65895be65..f2f356f4b57 100644 --- a/tests/src/gui/testqgsrasterhistogram.cpp +++ b/tests/src/gui/testqgsrasterhistogram.cpp @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -293,5 +293,5 @@ int TestRasterHistogram::testFile( QString theTestType, } -QTEST_MAIN( TestRasterHistogram ) +QGSTEST_MAIN( TestRasterHistogram ) #include "testqgsrasterhistogram.moc" diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp index b8acbd1b305..339329a8e18 100644 --- a/tests/src/gui/testqgsrubberband.cpp +++ b/tests/src/gui/testqgsrubberband.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include #include @@ -223,7 +223,7 @@ void TestQgsRubberband::testClose() } -QTEST_MAIN( TestQgsRubberband ) +QGSTEST_MAIN( TestQgsRubberband ) #include "testqgsrubberband.moc" diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp index 1028b6fff4e..fadffb7f7ea 100644 --- a/tests/src/gui/testqgsscalecombobox.cpp +++ b/tests/src/gui/testqgsscalecombobox.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include "qgstest.h" class TestQgsScaleComboBox : public QObject { @@ -168,5 +168,5 @@ void TestQgsScaleComboBox::cleanup() delete s; } -QTEST_MAIN( TestQgsScaleComboBox ) +QGSTEST_MAIN( TestQgsScaleComboBox ) #include "testqgsscalecombobox.moc" diff --git a/tests/src/gui/testqgsspinbox.cpp b/tests/src/gui/testqgsspinbox.cpp index ce8497f262d..397dce54795 100644 --- a/tests/src/gui/testqgsspinbox.cpp +++ b/tests/src/gui/testqgsspinbox.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include @@ -144,5 +144,5 @@ void TestQgsSpinBox::expression() delete spinBox; } -QTEST_MAIN( TestQgsSpinBox ) +QGSTEST_MAIN( TestQgsSpinBox ) #include "testqgsspinbox.moc" diff --git a/tests/src/gui/testqgssqlcomposerdialog.cpp b/tests/src/gui/testqgssqlcomposerdialog.cpp index ee296be3e52..a8786fbb76b 100644 --- a/tests/src/gui/testqgssqlcomposerdialog.cpp +++ b/tests/src/gui/testqgssqlcomposerdialog.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include "qgstest.h" #include #include @@ -464,5 +464,5 @@ void TestQgsSQLComposerDialog::testJoins() QCOMPARE( table->item( 0, 0 ) != nullptr, true ); } -QTEST_MAIN( TestQgsSQLComposerDialog ) +QGSTEST_MAIN( TestQgsSQLComposerDialog ) #include "testqgssqlcomposerdialog.moc" diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt index 0e2619397d1..892c9b0b8fd 100644 --- a/tests/src/providers/CMakeLists.txt +++ b/tests/src/providers/CMakeLists.txt @@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/providers/wms ${CMAKE_SOURCE_DIR}/src/providers/postgres + ${CMAKE_SOURCE_DIR}/src/test ) INCLUDE_DIRECTORIES(SYSTEM ${QT_INCLUDE_DIR} diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp index 858e8524feb..eea1a75d73e 100644 --- a/tests/src/providers/grass/testqgsgrassprovider.cpp +++ b/tests/src/providers/grass/testqgsgrassprovider.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include "qgstest.h" #include #include @@ -1686,5 +1686,5 @@ bool TestQgsGrassProvider::compare( QString uri, QgsVectorLayer *expectedLayer, return sharedOk && independentOk; } -QTEST_MAIN( TestQgsGrassProvider ) +QGSTEST_MAIN( TestQgsGrassProvider ) #include "testqgsgrassprovider.moc" diff --git a/tests/src/providers/testqgsgdalprovider.cpp b/tests/src/providers/testqgsgdalprovider.cpp index e72aa6ac373..6246451f1eb 100644 --- a/tests/src/providers/testqgsgdalprovider.cpp +++ b/tests/src/providers/testqgsgdalprovider.cpp @@ -15,7 +15,7 @@ #include -#include +#include "qgstest.h" #include #include #include @@ -196,5 +196,5 @@ void TestQgsGdalProvider::isRepresentableValue() QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits::max(), Qgis::Float64 ), true ); } -QTEST_MAIN( TestQgsGdalProvider ) +QGSTEST_MAIN( TestQgsGdalProvider ) #include "testqgsgdalprovider.moc" diff --git a/tests/src/providers/testqgspostgresconn.cpp b/tests/src/providers/testqgspostgresconn.cpp index 7907e61a3fa..855dc0960dc 100644 --- a/tests/src/providers/testqgspostgresconn.cpp +++ b/tests/src/providers/testqgspostgresconn.cpp @@ -1,4 +1,4 @@ -#include +#include "qgstest.h" #include #include @@ -42,5 +42,5 @@ class TestQgsPostgresConn: public QObject }; -QTEST_MAIN( TestQgsPostgresConn ) +QGSTEST_MAIN( TestQgsPostgresConn ) #include "testqgspostgresconn.moc" diff --git a/tests/src/providers/testqgspostgresprovider.cpp b/tests/src/providers/testqgspostgresprovider.cpp index 999da898d30..23fb4b3d88b 100644 --- a/tests/src/providers/testqgspostgresprovider.cpp +++ b/tests/src/providers/testqgspostgresprovider.cpp @@ -1,4 +1,4 @@ -#include +#include "qgstest.h" #include #include @@ -67,5 +67,5 @@ class TestQgsPostgresProvider: public QObject }; -QTEST_MAIN( TestQgsPostgresProvider ) +QGSTEST_MAIN( TestQgsPostgresProvider ) #include "testqgspostgresprovider.moc" diff --git a/tests/src/providers/testqgswcsprovider.cpp b/tests/src/providers/testqgswcsprovider.cpp index 3230a756e0c..30c41d1538e 100644 --- a/tests/src/providers/testqgswcsprovider.cpp +++ b/tests/src/providers/testqgswcsprovider.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include -#include +#include "qgstest.h" #include #include #include @@ -160,5 +160,5 @@ bool TestQgsWcsProvider::read( const QString& theIdentifier, const QString& theW return ok; } -QTEST_MAIN( TestQgsWcsProvider ) +QGSTEST_MAIN( TestQgsWcsProvider ) #include "testqgswcsprovider.moc" diff --git a/tests/src/providers/testqgswmscapabilities.cpp b/tests/src/providers/testqgswmscapabilities.cpp index 099d8e87d9d..2d51d6794ef 100644 --- a/tests/src/providers/testqgswmscapabilities.cpp +++ b/tests/src/providers/testqgswmscapabilities.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include #include -#include +#include "qgstest.h" #include #include @@ -80,5 +80,5 @@ class TestQgsWmsCapabilities: public QObject }; -QTEST_MAIN( TestQgsWmsCapabilities ) +QGSTEST_MAIN( TestQgsWmsCapabilities ) #include "testqgswmscapabilities.moc" diff --git a/tests/src/providers/testqgswmsprovider.cpp b/tests/src/providers/testqgswmsprovider.cpp index c14e92bbbf3..8dc99967aac 100644 --- a/tests/src/providers/testqgswmsprovider.cpp +++ b/tests/src/providers/testqgswmsprovider.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include #include -#include +#include "qgstest.h" #include #include @@ -79,5 +79,5 @@ class TestQgsWmsProvider: public QObject QgsWmsCapabilities* mCapabilities; }; -QTEST_MAIN( TestQgsWmsProvider ) +QGSTEST_MAIN( TestQgsWmsProvider ) #include "testqgswmsprovider.moc"