sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Let all tests work with a proper QgsApplication instance

Browse Source
This commit is contained in:
Matthias Kuhn 2016-12-07 14:03:37 +01:00
parent d169487850
commit dfd9833467
155 changed files with 304 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/qgstest.h
View File

@ -16,6 +16,9 @@
#ifndef QGSTEST_H
#define QGSTEST_H
#include <QtTest/QtTest>
#include "qgsapplication.h"
#define QGSTEST_MAIN(TestObject) \
QT_BEGIN_NAMESPACE \
QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \

2
tests/bench/README
View File

@ -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

2
tests/qt_modeltest/tst_modeltest.cpp
View File

@ -314,5 +314,5 @@ void tst_ModelTest::testResetThroughProxy()
}
QTEST_MAIN( tst_ModelTest )
QGSTEST_MAIN( tst_ModelTest )
#include "tst_modeltest.moc"

1
tests/src/analysis/CMakeLists.txt
View File

@ -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}

4
tests/src/analysis/testopenstreetmap.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QtTest/QSignalSpy>
#include <qgsapplication.h>
@ -188,6 +188,6 @@ void TestOpenStreetMap::importAndQueries()
}
QTEST_MAIN( TestOpenStreetMap )
QGSTEST_MAIN( TestOpenStreetMap )
#include "testopenstreetmap.moc"

4
tests/src/analysis/testqgsalignraster.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgsalignraster.h"
#include "qgsapplication.h"
@ -268,6 +268,6 @@ class TestAlignRaster : public QObject
};
QTEST_MAIN( TestAlignRaster )
QGSTEST_MAIN( TestAlignRaster )
#include "testqgsalignraster.moc"

4
tests/src/analysis/testqgsgeometrysnapper.cpp
View File

@ -12,7 +12,7 @@ Email : nyall dot dawson at gmail dot com
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
//header for class being tested
#include "qgsgeometrysnapper.h"
@ -410,5 +410,5 @@ void TestQgsGeometrySnapper::snapPointToPolygon()
}
QTEST_MAIN( TestQgsGeometrySnapper )
QGSTEST_MAIN( TestQgsGeometrySnapper )
#include "testqgsgeometrysnapper.moc"

4
tests/src/analysis/testqgsrastercalculator.cpp
View File

@ -12,7 +12,7 @@ Email : nyall dot dawson at gmail dot com
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgsrastercalculator.h"
#include "qgsrastercalcnode.h"
@ -529,5 +529,5 @@ void TestQgsRasterCalculator::calcWithReprojectedLayers()
delete block;
}
QTEST_MAIN( TestQgsRasterCalculator )
QGSTEST_MAIN( TestQgsRasterCalculator )
#include "testqgsrastercalculator.moc"

4
tests/src/analysis/testqgsvectoranalyzer.cpp
View File

@ -12,7 +12,7 @@ Email : sherman at mrcc dot com
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
//header for class being tested
#include <qgsgeometryanalyzer.h>
@ -141,5 +141,5 @@ void TestQgsVectorAnalyzer::layerExtent()
QVERIFY( mAnalyzer.extent( mpPointLayer, myFileName ) );
}
QTEST_MAIN( TestQgsVectorAnalyzer )
QGSTEST_MAIN( TestQgsVectorAnalyzer )
#include "testqgsvectoranalyzer.moc"

4
tests/src/analysis/testqgszonalstatistics.cpp
View File

@ -14,7 +14,7 @@
***************************************************************************/
#include <QDir>
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgsapplication.h"
#include "qgsfeatureiterator.h"
@ -136,5 +136,5 @@ void TestQgsZonalStatistics::testStatistics()
QCOMPARE( f.attribute( "myqgis2_me" ).toDouble(), 0.833333333333333 );
}
QTEST_MAIN( TestQgsZonalStatistics )
QGSTEST_MAIN( TestQgsZonalStatistics )
#include "testqgszonalstatistics.moc"

4
tests/src/app/testqgisappclipboard.cpp
View File

@ -17,7 +17,7 @@
#include <QSplashScreen>
#include <QString>
#include <QStringList>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <qgisapp.h>
#include <qgsapplication.h>
@ -316,5 +316,5 @@ void TestQgisAppClipboard::clipboardLogic()
QCOMPARE( features.at( 0 ).attribute( "name" ).toString(), QString( "Dinagat Islands" ) );
}
QTEST_MAIN( TestQgisAppClipboard )
QGSTEST_MAIN( TestQgisAppClipboard )
#include "testqgisappclipboard.moc"

4
tests/src/app/testqgisapppython.cpp
View File

@ -17,7 +17,7 @@
#include <QSplashScreen>
#include <QString>
#include <QStringList>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <qgisapp.h>
#include <qgsapplication.h>
@ -94,5 +94,5 @@ void TestQgisAppPython::evalString()
QVERIFY( !mQgisApp->mPythonUtils->evalString( "1+", result ) );
}
QTEST_MAIN( TestQgisAppPython )
QGSTEST_MAIN( TestQgisAppPython )
#include "testqgisapppython.moc"

2
tests/src/app/testqgsattributetable.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsfeatureiterator.h"

4
tests/src/app/testqgsfieldcalculator.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
@ -188,5 +188,5 @@ void TestQgsFieldCalculator::testAreaCalculations()
QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
}
QTEST_MAIN( TestQgsFieldCalculator )
QGSTEST_MAIN( TestQgsFieldCalculator )
#include "testqgsfieldcalculator.moc"

4
tests/src/app/testqgsmaptoolidentifyaction.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
@ -378,7 +378,7 @@ void TestQgsMapToolIdentifyAction::identifyInvalidPolygons()
}
QTEST_MAIN( TestQgsMapToolIdentifyAction )
QGSTEST_MAIN( TestQgsMapToolIdentifyAction )
#include "testqgsmaptoolidentifyaction.moc"

4
tests/src/app/testqgsmaptoolselect.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
@ -152,5 +152,5 @@ void TestQgsMapToolSelect::selectInvalidPolygons()
}
QTEST_MAIN( TestQgsMapToolSelect )
QGSTEST_MAIN( TestQgsMapToolSelect )
#include "testqgsmaptoolselect.moc"

4
tests/src/app/testqgsmeasuretool.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
@ -203,5 +203,5 @@ void TestQgsMeasureTool::testAreaCalculation()
QGSCOMPARENEAR( measured, expected, 0.001 );
}
QTEST_MAIN( TestQgsMeasureTool )
QGSTEST_MAIN( TestQgsMeasureTool )
#include "testqgsmeasuretool.moc"

4
tests/src/app/testqgsvectorlayersaveasdialog.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
@ -133,5 +133,5 @@ void TestQgsVectorLayerSaveAsDialog::testAttributesAsDisplayedValues()
//d.exec();
}
QTEST_MAIN( TestQgsVectorLayerSaveAsDialog )
QGSTEST_MAIN( TestQgsVectorLayerSaveAsDialog )
#include "testqgsvectorlayersaveasdialog.moc"

4
tests/src/core/test_template.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
//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"

4
tests/src/core/testcontrastenhancements.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QApplication>
#include <QDesktopServices>
@ -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"

4
tests/src/core/testmaprendererjob.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include "qgsapplication.h"
@ -289,5 +289,5 @@ void TestQgsMapRendererJob::testCache()
}
QTEST_MAIN( TestQgsMapRendererJob )
QGSTEST_MAIN( TestQgsMapRendererJob )
#include "testmaprendererjob.moc"

4
tests/src/core/testqgis.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QApplication>
@ -293,5 +293,5 @@ void TestQgis::qVariantCompare()
}
QTEST_MAIN( TestQgis )
QGSTEST_MAIN( TestQgis )
#include "testqgis.moc"

4
tests/src/core/testqgs25drenderer.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -159,5 +159,5 @@ bool TestQgs25DRenderer::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgs25DRenderer )
QGSTEST_MAIN( TestQgs25DRenderer )
#include "testqgs25drenderer.moc"

4
tests/src/core/testqgsapplication.cpp
View File

@ -12,7 +12,7 @@ Email : sherman at mrcc dot com
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QPixmap>
#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"

4
tests/src/core/testqgsatlascomposition.cpp
View File

@ -30,7 +30,7 @@
#include "qgsfontutils.h"
#include <QObject>
#include <QtTest/QSignalSpy>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsauthconfig.cpp
View File

@ -13,7 +13,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -242,5 +242,5 @@ void TestQgsAuthConfig::testConfigSslServer()
QCOMPARE( sslconfig2.configString(), confstr );
}
QTEST_MAIN( TestQgsAuthConfig )
QGSTEST_MAIN( TestQgsAuthConfig )
#include "testqgsauthconfig.moc"

4
tests/src/core/testqgsauthcrypto.cpp
View File

@ -13,7 +13,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -118,5 +118,5 @@ void TestQgsAuthCrypto::testPasswordHashKnown()
QVERIFY( QgsAuthCrypto::verifyPasswordKeyHash( smPass, smSalt, smHash ) );
}
QTEST_MAIN( TestQgsAuthCrypto )
QGSTEST_MAIN( TestQgsAuthCrypto )
#include "testqgsauthcrypto.moc"

4
tests/src/core/testqgsauthmanager.cpp
View File

@ -14,7 +14,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QtTest/QSignalSpy>
#include <QObject>
#include <QDesktopServices>
@ -402,5 +402,5 @@ QList<QgsAuthMethodConfig> TestQgsAuthManager::registerAuthConfigs()
return configs;
}
QTEST_MAIN( TestQgsAuthManager )
QGSTEST_MAIN( TestQgsAuthManager )
#include "testqgsauthmanager.moc"

4
tests/src/core/testqgsblendmodes.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -240,5 +240,5 @@ bool TestQgsBlendModes::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsBlendModes )
QGSTEST_MAIN( TestQgsBlendModes )
#include "testqgsblendmodes.moc"

4
tests/src/core/testqgscentroidfillsymbol.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -162,5 +162,5 @@ bool TestQgsCentroidFillSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsCentroidFillSymbol )
QGSTEST_MAIN( TestQgsCentroidFillSymbol )
#include "testqgscentroidfillsymbol.moc"

4
tests/src/core/testqgsclipper.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QFile>
#include <QTextStream>
#include <QObject>
@ -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"

4
tests/src/core/testqgscolorscheme.cpp
View File

@ -18,7 +18,7 @@
#include "qgscolorscheme.h"
#include <QObject>
#include <QSharedPointer>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscolorschemeregistry.cpp
View File

@ -19,7 +19,7 @@
#include "qgscolorscheme.h"
#include <QObject>
#include <QSharedPointer>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposerdd.cpp
View File

@ -29,7 +29,7 @@
#include "qgsdatadefined.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposereffects.cpp
View File

@ -20,7 +20,7 @@
#include "qgsmultirenderchecker.h"
#include "qgscomposershape.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QColor>
#include <QPainter>
@ -122,5 +122,5 @@ void TestQgsComposerEffects::transparency()
QVERIFY( checker.testComposition( mReport ) );
}
QTEST_MAIN( TestQgsComposerEffects )
QGSTEST_MAIN( TestQgsComposerEffects )
#include "testqgscomposereffects.moc"

4
tests/src/core/testqgscomposergroup.cpp
View File

@ -25,7 +25,7 @@
#include <QObject>
#include <QtTest/QSignalSpy>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposerhtml.cpp
View File

@ -26,7 +26,7 @@
#include "qgsvectordataprovider.h"
#include "qgsproject.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
class TestQgsComposerHtml : public QObject
{
@ -324,5 +324,5 @@ void TestQgsComposerHtml::javascriptSetFeature()
}
QTEST_MAIN( TestQgsComposerHtml )
QGSTEST_MAIN( TestQgsComposerHtml )
#include "testqgscomposerhtml.moc"

4
tests/src/core/testqgscomposerlabel.cpp
View File

@ -25,7 +25,7 @@
#include "qgsproject.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposermap.cpp
View File

@ -27,7 +27,7 @@
#include "qgsproject.h"
#include "qgsmapthemecollection.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposermapgrid.cpp
View File

@ -22,7 +22,7 @@
#include "qgscomposermapgrid.h"
#include "qgsfontutils.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposermapoverview.cpp
View File

@ -26,7 +26,7 @@
#include "qgsrasterdataprovider.h"
#include "qgsfontutils.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposermodel.cpp
View File

@ -22,7 +22,7 @@
#include "qgsmapsettings.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QList>
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"

4
tests/src/core/testqgscomposermultiframe.cpp
View File

@ -23,7 +23,7 @@
#include "qgsapplication.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposerobject.cpp
View File

@ -23,7 +23,7 @@
#include "qgsapplication.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposerpaper.cpp
View File

@ -25,7 +25,7 @@
#include "qgslinesymbollayer.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QColor>
#include <QPainter>
@ -166,5 +166,5 @@ void TestQgsComposerPaper::hiddenPages()
QVERIFY( result );
}
QTEST_MAIN( TestQgsComposerPaper )
QGSTEST_MAIN( TestQgsComposerPaper )
#include "testqgscomposerpaper.moc"

4
tests/src/core/testqgscomposerpicture.cpp
View File

@ -20,7 +20,7 @@
#include "qgsmultirenderchecker.h"
#include "qgscomposerpicture.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QColor>
#include <QPainter>
@ -426,5 +426,5 @@ void TestQgsComposerPicture::pictureInvalidExpression()
false, false, QString(), QString() );
}
QTEST_MAIN( TestQgsComposerPicture )
QGSTEST_MAIN( TestQgsComposerPicture )
#include "testqgscomposerpicture.moc"

4
tests/src/core/testqgscomposerrotation.cpp
View File

@ -27,7 +27,7 @@
#include "qgsfontutils.h"
#include "qgsrasterdataprovider.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QColor>
#include <QPainter>
@ -197,5 +197,5 @@ void TestQgsComposerRotation::mapItemRotation()
QVERIFY( checker.testComposition( mReport ) );
}
QTEST_MAIN( TestQgsComposerRotation )
QGSTEST_MAIN( TestQgsComposerRotation )
#include "testqgscomposerrotation.moc"

4
tests/src/core/testqgscomposerscalebar.cpp
View File

@ -28,7 +28,7 @@
#include <QLocale>
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposershapes.cpp
View File

@ -24,7 +24,7 @@
#include "qgssinglesymbolrenderer.h"
#include "qgsfillsymbollayer.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QColor>
#include <QPainter>
@ -159,5 +159,5 @@ void TestQgsComposerShapes::symbol()
QVERIFY( checker.testComposition( mReport ) );
}
QTEST_MAIN( TestQgsComposerShapes )
QGSTEST_MAIN( TestQgsComposerShapes )
#include "testqgscomposershapes.moc"

4
tests/src/core/testqgscomposertablev2.cpp
View File

@ -31,7 +31,7 @@
#include "qgsrelationmanager.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscomposerutils.cpp
View File

@ -22,7 +22,7 @@
#include "qgsdatadefined.h"
#include "qgsfontutils.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QMap>
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"

4
tests/src/core/testqgscomposition.cpp
View File

@ -28,7 +28,7 @@
#include "qgsfillsymbollayer.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsconnectionpool.cpp
View File

@ -24,7 +24,7 @@
#include <QObject>
#include <QTemporaryFile>
#include <QtConcurrentMap>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgscoordinatereferencesystem.cpp
View File

@ -12,7 +12,7 @@ Email : sherman at mrcc dot com
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QPixmap>
#include <qgsapplication.h>
@ -739,5 +739,5 @@ void TestQgsCoordinateReferenceSystem::createFromProj4Invalid()
QVERIFY( !myCrs.createFromProj4( "+proj=longlat +no_defs" ) );
}
QTEST_MAIN( TestQgsCoordinateReferenceSystem )
QGSTEST_MAIN( TestQgsCoordinateReferenceSystem )
#include "testqgscoordinatereferencesystem.moc"

4
tests/src/core/testqgscoordinatetransform.cpp
View File

@ -18,7 +18,7 @@
#include "qgsapplication.h"
#include "qgsrectangle.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsdatadefined.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -323,5 +323,5 @@ void TestQgsDataDefined::expressionOrString()
QCOMPARE( dd.expressionOrField(), QString( "\"field\"" ) );
}
QTEST_MAIN( TestQgsDataDefined )
QGSTEST_MAIN( TestQgsDataDefined )
#include "testqgsdatadefined.moc"

4
tests/src/core/testqgsdataitem.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -178,5 +178,5 @@ void TestQgsDataItem::testDirItemChildren()
}
}
QTEST_MAIN( TestQgsDataItem )
QGSTEST_MAIN( TestQgsDataItem )
#include "testqgsdataitem.moc"

4
tests/src/core/testqgsdatasourceuri.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
//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"

4
tests/src/core/testqgsdiagram.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -224,5 +224,5 @@ bool TestQgsDiagram::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsDiagram )
QGSTEST_MAIN( TestQgsDiagram )
#include "testqgsdiagram.moc"

4
tests/src/core/testqgsdistancearea.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QFile>
#include <QTextStream>
#include <QObject>
@ -332,7 +332,7 @@ void TestQgsDistanceArea::regression14675()
QGSCOMPARENEAR( calc.measureArea( &geom ), 0.83301, 0.02 );
}
QTEST_MAIN( TestQgsDistanceArea )
QGSTEST_MAIN( TestQgsDistanceArea )
#include "testqgsdistancearea.moc"

4
tests/src/core/testqgsellipsemarker.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -221,5 +221,5 @@ bool TestQgsEllipseMarkerSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsEllipseMarkerSymbol )
QGSTEST_MAIN( TestQgsEllipseMarkerSymbol )
#include "testqgsellipsemarker.moc"

4
tests/src/core/testqgsexpression.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QtConcurrentMap>
@ -2680,6 +2680,6 @@ class TestQgsExpression: public QObject
};
QTEST_MAIN( TestQgsExpression )
QGSTEST_MAIN( TestQgsExpression )
#include "testqgsexpression.moc"

4
tests/src/core/testqgsexpressioncontext.cpp
View File

@ -22,7 +22,7 @@
#include "qgsproject.h"
#include "qgscolorscheme.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsfeature.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -519,5 +519,5 @@ void TestQgsFeature::dataStream()
QCOMPARE( resultFeature.isValid(), originalFeature.isValid() );
}
QTEST_MAIN( TestQgsFeature )
QGSTEST_MAIN( TestQgsFeature )
#include "testqgsfeature.moc"

2
tests/src/core/testqgsfield.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>

4
tests/src/core/testqgsfields.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -602,5 +602,5 @@ void TestQgsFields::constIterator()
QCOMPARE( it3 - it, 1 );
}
QTEST_MAIN( TestQgsFields )
QGSTEST_MAIN( TestQgsFields )
#include "testqgsfields.moc"

4
tests/src/core/testqgsfilledmarker.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -191,5 +191,5 @@ bool TestQgsFilledMarkerSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsFilledMarkerSymbol )
QGSTEST_MAIN( TestQgsFilledMarkerSymbol )
#include "testqgsfilledmarker.moc"

4
tests/src/core/testqgsfontmarker.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -188,5 +188,5 @@ bool TestQgsFontMarkerSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsFontMarkerSymbol )
QGSTEST_MAIN( TestQgsFontMarkerSymbol )
#include "testqgsfontmarker.moc"

4
tests/src/core/testqgsfontutils.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -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"

4
tests/src/core/testqgsgeometry.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -4044,5 +4044,5 @@ void TestQgsGeometry::poleOfInaccessibility()
QGSCOMPARENEAR( point.y(), -0.2434, 0.0001 );
}
QTEST_MAIN( TestQgsGeometry )
QGSTEST_MAIN( TestQgsGeometry )
#include "testqgsgeometry.moc"

4
tests/src/core/testqgsgeometryimport.cpp
View File

@ -20,7 +20,7 @@
#include <QPolygonF>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
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"

4
tests/src/core/testqgsgeometryutils.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include "qgsgeometryutils.h"
#include "qgslinestring.h"
@ -540,5 +540,5 @@ void TestQgsGeometryUtils::testAngleThreePoints()
QTEST_MAIN( TestQgsGeometryUtils )
QGSTEST_MAIN( TestQgsGeometryUtils )
#include "testqgsgeometryutils.moc"

4
tests/src/core/testqgsgml.cpp
View File

@ -14,7 +14,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QUrl>
//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"

4
tests/src/core/testqgsgradients.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -294,5 +294,5 @@ bool TestQgsGradients::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsGradients )
QGSTEST_MAIN( TestQgsGradients )
#include "testqgsgradients.moc"

4
tests/src/core/testqgsgraduatedsymbolrenderer.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -137,5 +137,5 @@ void TestQgsGraduatedSymbolRenderer::rangesHaveGaps()
QVERIFY( renderer.rangesHaveGaps() );
}
QTEST_MAIN( TestQgsGraduatedSymbolRenderer )
QGSTEST_MAIN( TestQgsGraduatedSymbolRenderer )
#include "testqgsgraduatedsymbolrenderer.moc"

4
tests/src/core/testqgshistogram.cpp
View File

@ -14,7 +14,7 @@
***************************************************************************/
#include <QDir>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsimageoperation.cpp
View File

@ -18,7 +18,7 @@
#include "qgsimageoperation.h"
#include "qgscolorramp.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgsinvertedpolygonrenderer.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -211,5 +211,5 @@ bool TestQgsInvertedPolygon::imageCheck( const QString& theTestType, const QgsRe
return myResultFlag;
}
QTEST_MAIN( TestQgsInvertedPolygon )
QGSTEST_MAIN( TestQgsInvertedPolygon )
#include "testqgsinvertedpolygonrenderer.moc"

4
tests/src/core/testqgsjsonutils.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <qgsjsonutils.h>
class TestQgsJSONUtils : public QObject
@ -72,5 +72,5 @@ class TestQgsJSONUtils : public QObject
}
};
QTEST_MAIN( TestQgsJSONUtils )
QGSTEST_MAIN( TestQgsJSONUtils )
#include "testqgsjsonutils.moc"

4
tests/src/core/testqgslabelingengine.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <qgsapplication.h>
#include <qgslabelingengine.h>
@ -556,5 +556,5 @@ bool TestQgsLabelingEngine::imageCheck( const QString& testName, QImage &image,
return resultFlag;
}
QTEST_MAIN( TestQgsLabelingEngine )
QGSTEST_MAIN( TestQgsLabelingEngine )
#include "testqgslabelingengine.moc"

4
tests/src/core/testqgslayertree.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <qgsapplication.h>
#include <qgslayertree.h>
@ -483,5 +483,5 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRenderer* renderer )
}
QTEST_MAIN( TestQgsLayerTree )
QGSTEST_MAIN( TestQgsLayerTree )
#include "testqgslayertree.moc"

4
tests/src/core/testqgslegendrenderer.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include "qgsapplication.h"
@ -725,5 +725,5 @@ void TestQgsLegendRenderer::testDiagramSizeLegend()
QgsProject::instance()->removeMapLayer( vl4 );
}
QTEST_MAIN( TestQgsLegendRenderer )
QGSTEST_MAIN( TestQgsLegendRenderer )
#include "testqgslegendrenderer.moc"

4
tests/src/core/testqgslinefillsymbol.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -178,5 +178,5 @@ bool TestQgsLineFillSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsLineFillSymbol )
QGSTEST_MAIN( TestQgsLineFillSymbol )
#include "testqgslinefillsymbol.moc"

4
tests/src/core/testqgsmaplayer.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -152,5 +152,5 @@ void TestQgsMapLayer::isInScaleRange()
}
QTEST_MAIN( TestQgsMapLayer )
QGSTEST_MAIN( TestQgsMapLayer )
#include "testqgsmaplayer.moc"

4
tests/src/core/testqgsmaplayerstylemanager.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include "qgsapplication.h"
@ -203,5 +203,5 @@ void TestQgsMapLayerStyleManager::testSwitchingStyles()
}
QTEST_MAIN( TestQgsMapLayerStyleManager )
QGSTEST_MAIN( TestQgsMapLayerStyleManager )
#include "testqgsmaplayerstylemanager.moc"

4
tests/src/core/testqgsmaprendererjob.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -332,7 +332,7 @@ void TestQgsMapRendererJob::testFourAdjacentTiles()
}
QTEST_MAIN( TestQgsMapRendererJob )
QGSTEST_MAIN( TestQgsMapRendererJob )
#include "testqgsmaprendererjob.moc"

4
tests/src/core/testqgsmaprotation.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -233,5 +233,5 @@ bool TestQgsMapRotation::render( const QString& theTestType )
return result;
}
QTEST_MAIN( TestQgsMapRotation )
QGSTEST_MAIN( TestQgsMapRotation )
#include "testqgsmaprotation.moc"

4
tests/src/core/testqgsmapsettings.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <math.h>
@ -194,5 +194,5 @@ void TestQgsMapSettings::testMapLayerListUtils()
delete vlB;
}
QTEST_MAIN( TestQgsMapSettings )
QGSTEST_MAIN( TestQgsMapSettings )
#include "testqgsmapsettings.moc"

4
tests/src/core/testqgsmaptopixel.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
//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"

4
tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -206,5 +206,5 @@ void TestQgsMapToPixelGeometrySimplifier::testVisvalingam()
QCOMPARE( simplifier.simplify( g ).exportToWkt(), expectedWkt );
}
QTEST_MAIN( TestQgsMapToPixelGeometrySimplifier )
QGSTEST_MAIN( TestQgsMapToPixelGeometrySimplifier )
#include "testqgsmaptopixelgeometrysimplifier.moc"

4
tests/src/core/testqgsmarkerlinesymbol.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -214,5 +214,5 @@ bool TestQgsMarkerLineSymbol::render( const QString& theTestType )
return result;
}
QTEST_MAIN( TestQgsMarkerLineSymbol )
QGSTEST_MAIN( TestQgsMarkerLineSymbol )
#include "testqgsmarkerlinesymbol.moc"

4
tests/src/core/testqgsnetworkcontentfetcher.cpp
View File

@ -18,7 +18,7 @@
#include "qgsnetworkcontentfetcher.h"
#include "qgsapplication.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QNetworkReply>
class TestQgsNetworkContentFetcher : public QObject
@ -116,5 +116,5 @@ void TestQgsNetworkContentFetcher::contentLoaded()
mLoaded = true;
}
QTEST_MAIN( TestQgsNetworkContentFetcher )
QGSTEST_MAIN( TestQgsNetworkContentFetcher )
#include "testqgsnetworkcontentfetcher.moc"

4
tests/src/core/testqgsogcutils.cpp
View File

@ -14,7 +14,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QSharedPointer>
//qgis includes...
@ -1023,5 +1023,5 @@ void TestQgsOgcUtils::testSQLStatementToOgcFilter_data()
"</fes:Filter>" );
}
QTEST_MAIN( TestQgsOgcUtils )
QGSTEST_MAIN( TestQgsOgcUtils )
#include "testqgsogcutils.moc"

4
tests/src/core/testqgsogrutils.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -389,5 +389,5 @@ void TestQgsOgrUtils::stringToFields()
QTEST_MAIN( TestQgsOgrUtils )
QGSTEST_MAIN( TestQgsOgrUtils )
#include "testqgsogrutils.moc"

4
tests/src/core/testqgspainteffect.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -945,5 +945,5 @@ bool TestQgsPaintEffect::mapRenderCheck( const QString& testName, QgsMapSettings
return result;
}
QTEST_MAIN( TestQgsPaintEffect )
QGSTEST_MAIN( TestQgsPaintEffect )
#include "testqgspainteffect.moc"

4
tests/src/core/testqgspainteffectregistry.cpp
View File

@ -21,7 +21,7 @@
#include "qgsrendercontext.h"
#include <QObject>
#include <QtTest/QtTest>
#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"

4
tests/src/core/testqgspallabeling.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -170,5 +170,5 @@ void TestQgsPalLabeling::graphemes()
<< expected2Pt11 );
}
QTEST_MAIN( TestQgsPalLabeling )
QGSTEST_MAIN( TestQgsPalLabeling )
#include "testqgspallabeling.moc"

4
tests/src/core/testqgspoint.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QApplication>
@ -760,5 +760,5 @@ void TestQgsPoint::vector()
QCOMPARE( v1.y(), 3.0 );
}
QTEST_MAIN( TestQgsPoint )
QGSTEST_MAIN( TestQgsPoint )
#include "testqgspoint.moc"

4
tests/src/core/testqgspointlocator.cpp
View File

@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
@ -306,6 +306,6 @@ class TestQgsPointLocator : public QObject
}
};
QTEST_MAIN( TestQgsPointLocator )
QGSTEST_MAIN( TestQgsPointLocator )
#include "testqgspointlocator.moc"

4
tests/src/core/testqgspointpatternfillsymbol.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <QtTest/QtTest>
#include "qgstest.h"
#include <QObject>
#include <QString>
#include <QStringList>
@ -180,5 +180,5 @@ bool TestQgsPointPatternFillSymbol::imageCheck( const QString& theTestType )
return myResultFlag;
}
QTEST_MAIN( TestQgsPointPatternFillSymbol )
QGSTEST_MAIN( TestQgsPointPatternFillSymbol )
#include "testqgspointpatternfillsymbol.moc"

Some files were not shown because too many files have changed in this diff Show More