Commit be939e0a authored by Boudewijn Rempt's avatar Boudewijn Rempt

Port away from qtest_kde.h to QTest

parent a83fe323
......@@ -49,20 +49,20 @@ calligra_add_benchmark(KisLowMemoryBenchmark TESTNAME krita-benchmarks-KisLowMem
calligra_add_benchmark(KisFilterSelectionsBenchmark TESTNAME krita-image-KisFilterSelectionsBenchmark ${kis_filter_selections_benchmark_SRCS})
calligra_add_benchmark(KisCompositionBenchmark TESTNAME krita-benchmarks-KisComposition ${kis_composition_benchmark_SRCS})
target_link_libraries(KisDatamanagerBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisHLineIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisVLineIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisRandomIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisProjectionBenchmark kritaimage KF5::KDELibs4Support kritaui Qt5::Test)
target_link_libraries(KisBContrastBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisBlurBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisLevelFilterBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisPainterBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisStrokeBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFastMathBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFloodfillBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisGradientBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisLowMemoryBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFilterSelectionsBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisCompositionBenchmark kritaimage KF5::KDELibs4Support Qt5::Test ${LINK_VC_LIB})
target_link_libraries(KisMaskGeneratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisDatamanagerBenchmark kritaimage Qt5::Test)
target_link_libraries(KisHLineIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisVLineIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisRandomIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisProjectionBenchmark kritaimage kritaui Qt5::Test)
target_link_libraries(KisBContrastBenchmark kritaimage Qt5::Test)
target_link_libraries(KisBlurBenchmark kritaimage Qt5::Test)
target_link_libraries(KisLevelFilterBenchmark kritaimage Qt5::Test)
target_link_libraries(KisPainterBenchmark kritaimage Qt5::Test)
target_link_libraries(KisStrokeBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFastMathBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFloodfillBenchmark kritaimage Qt5::Test)
target_link_libraries(KisGradientBenchmark kritaimage Qt5::Test)
target_link_libraries(KisLowMemoryBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFilterSelectionsBenchmark kritaimage Qt5::Test)
target_link_libraries(KisCompositionBenchmark kritaimage Qt5::Test ${LINK_VC_LIB})
target_link_libraries(KisMaskGeneratorBenchmark kritaimage Qt5::Test)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_bcontrast_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -96,4 +96,4 @@ void KisBContrastBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisBContrastBenchmark, GUI)
QTEST_MAIN(KisBContrastBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_blur_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -88,4 +88,4 @@ void KisBlurBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisBlurBenchmark, GUI)
QTEST_MAIN(KisBlurBenchmark)
......@@ -19,7 +19,7 @@
#include "kis_composition_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpace.h>
#include <KoCompositeOp.h>
......@@ -859,5 +859,5 @@ void KisCompositionBenchmark::benchmarkFloatIntUint()
#endif
}
QTEST_KDEMAIN(KisCompositionBenchmark, GUI)
QTEST_MAIN(KisCompositionBenchmark)
......@@ -19,7 +19,7 @@
#include "kis_datamanager_benchmark.h"
#include "kis_benchmark_values.h"
#include <qtest_kde.h>
#include <QTest>
#include <kis_datamanager.h>
// RGBA
......@@ -199,4 +199,4 @@ void KisDatamanagerBenchmark::benchmarkMemCpy()
}
QTEST_KDEMAIN(KisDatamanagerBenchmark, GUI)
QTEST_MAIN(KisDatamanagerBenchmark)
......@@ -18,7 +18,7 @@
#include "kis_fast_math_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include <kis_fast_math.h>
......@@ -54,5 +54,5 @@ void KisFastMathBenchmark::benchmarkLibCAtan2()
}
}
QTEST_KDEMAIN(KisFastMathBenchmark, GUI)
QTEST_MAIN(KisFastMathBenchmark)
......@@ -20,7 +20,7 @@
#include "kis_painter.h"
#include <qtest_kde.h>
#include <QTest>
#include "testutil.h"
#include "kis_selection.h"
#include "kis_transaction.h"
......@@ -291,4 +291,4 @@ void KisFilterSelectionsBenchmark::testBitBltSelections(int num)
dbgKrita << "bitBlt with sel:\t\t\t" << avTime;
}
QTEST_KDEMAIN(KisFilterSelectionsBenchmark, GUI)
QTEST_MAIN(KisFilterSelectionsBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <kundo2command.h>
#include "kis_benchmark_values.h"
......@@ -111,4 +111,4 @@ void KisFloodFillBenchmark::cleanupTestCase()
}
QTEST_KDEMAIN(KisFloodFillBenchmark, NoGUI)
QTEST_MAIN(KisFloodFillBenchmark)
......@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <kundo2command.h>
#include "kis_benchmark_values.h"
......@@ -89,4 +89,4 @@ void KisGradientBenchmark::cleanupTestCase()
}
QTEST_KDEMAIN(KisGradientBenchmark, NoGUI)
QTEST_MAIN(KisGradientBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <qtest_kde.h>
#include <QTest>
#include "kis_iterator_ng.h"
......@@ -191,4 +191,4 @@ void KisHLineIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy(){
QTEST_KDEMAIN(KisHLineIteratorBenchmark, GUI)
QTEST_MAIN(KisHLineIteratorBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_level_filter_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -101,4 +101,4 @@ void KisLevelFilterBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisLevelFilterBenchmark, GUI)
QTEST_MAIN(KisLevelFilterBenchmark)
......@@ -18,7 +18,7 @@
#include "kis_low_memory_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_benchmark_values.h"
......@@ -228,4 +228,4 @@ void KisLowMemoryBenchmark::memory2000History100Pool500HugeBrush()
2000, 600, 500, 0);
}
QTEST_KDEMAIN(KisLowMemoryBenchmark, GUI)
QTEST_MAIN(KisLowMemoryBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <config-vc.h>
#ifdef HAVE_VC
......@@ -75,4 +75,4 @@ void KisMaskGeneratorBenchmark::benchmarkSquare()
}
}
QTEST_KDEMAIN(KisMaskGeneratorBenchmark, GUI)
QTEST_MAIN(KisMaskGeneratorBenchmark)
......@@ -25,7 +25,7 @@ inline double drand48()
}
#endif
#include <qtest_kde.h>
#include <QTest>
#include <QImage>
#include <kis_debug.h>
......@@ -275,4 +275,4 @@ void KisPainterBenchmark::benchmarkDrawScanLine()
#endif
}
QTEST_KDEMAIN(KisPainterBenchmark, NoGUI)
QTEST_MAIN(KisPainterBenchmark)
......@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_projection_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -59,4 +59,4 @@ void KisProjectionBenchmark::benchmarkLoading()
}
QTEST_KDEMAIN(KisProjectionBenchmark, GUI)
QTEST_MAIN(KisProjectionBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <qtest_kde.h>
#include <QTest>
#include <kis_random_accessor_ng.h>
......@@ -235,4 +235,4 @@ void KisRandomIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()
}
QTEST_KDEMAIN(KisRandomIteratorBenchmark, GUI)
QTEST_MAIN(KisRandomIteratorBenchmark)
......@@ -26,7 +26,7 @@ inline double drand48()
}
#endif
#include <qtest_kde.h>
#include <QTest>
#include "kis_stroke_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -510,4 +510,4 @@ void KisStrokeBenchmark::benchmarkRand()
}
QTEST_KDEMAIN(KisStrokeBenchmark, GUI)
QTEST_MAIN(KisStrokeBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <kis_iterator_ng.h>
#include <qtest_kde.h>
#include <QTest>
void KisVLineIteratorBenchmark::initTestCase()
......@@ -166,4 +166,4 @@ void KisVLineIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()
}
QTEST_KDEMAIN(KisVLineIteratorBenchmark, GUI)
QTEST_MAIN(KisVLineIteratorBenchmark)
This diff is collapsed.
......@@ -18,7 +18,7 @@
#include "kis_adjustment_layer_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpace.h>
......@@ -114,4 +114,4 @@ void KisAdjustmentLayerTest::testSelectionParent()
}
}
QTEST_KDEMAIN(KisAdjustmentLayerTest, GUI)
QTEST_MAIN(KisAdjustmentLayerTest)
......@@ -18,7 +18,7 @@
#include "kis_annotation_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_annotation.h"
void KisAnnotationTest::testCreation()
......@@ -29,4 +29,4 @@ void KisAnnotationTest::testCreation()
}
QTEST_KDEMAIN(KisAnnotationTest, GUI)
QTEST_MAIN(KisAnnotationTest)
......@@ -22,7 +22,7 @@
#include "kis_full_refresh_walker.h"
#include "kis_async_merger.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpaceRegistry.h>
#include <KoColorSpace.h>
#include "kis_image.h"
......@@ -287,5 +287,5 @@ void KisAsyncMergerTest::testSubgraphingWithoutUpdatingParent()
}
}
QTEST_KDEMAIN(KisAsyncMergerTest, NoGUI)
QTEST_MAIN(KisAsyncMergerTest)
......@@ -17,7 +17,7 @@
*/
#include "kis_base_node_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <limits.h>
#include "kis_types.h"
#include "kis_global.h"
......@@ -120,6 +120,6 @@ void KisBaseNodeTest::testProperties()
}
}
QTEST_KDEMAIN(KisBaseNodeTest, GUI)
QTEST_MAIN(KisBaseNodeTest)
......@@ -18,7 +18,7 @@
#include "kis_basic_math_toolbox_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_basic_math_toolbox.h"
void KisBasicMathToolboxTest::testCreation()
......@@ -27,4 +27,4 @@ void KisBasicMathToolboxTest::testCreation()
}
QTEST_KDEMAIN(KisBasicMathToolboxTest, GUI)
QTEST_MAIN(KisBasicMathToolboxTest)
......@@ -18,7 +18,7 @@
#include "kis_bookmarked_configuration_manager_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_bookmarked_configuration_manager.h"
#include "kis_serializable_configuration.h"
......@@ -60,4 +60,4 @@ void KisBookmarkedConfigurationManagerTest::testCreation()
}
QTEST_KDEMAIN(KisBookmarkedConfigurationManagerTest, GUI)
QTEST_MAIN(KisBookmarkedConfigurationManagerTest)
......@@ -18,7 +18,7 @@
#include "kis_bsplines_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <cmath>
......@@ -178,4 +178,4 @@ void KisBSplinesTest::testNU2D()
}
QTEST_KDEMAIN(KisBSplinesTest, GUI)
QTEST_MAIN(KisBSplinesTest)
......@@ -18,7 +18,7 @@
#include "kis_cage_transform_worker_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoProgressUpdater.h>
#include <KoUpdater.h>
......@@ -327,4 +327,4 @@ void KisCageTransformWorkerTest::testAngleBetweenVectors()
QCOMPARE(t.map(b1), b2);
}
QTEST_KDEMAIN(KisCageTransformWorkerTest, GUI)
QTEST_MAIN(KisCageTransformWorkerTest)
......@@ -18,7 +18,7 @@
#include "kis_change_profile_visitor_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_change_profile_visitor.h"
#include "KoColorSpace.h"
#include "KoColorSpaceRegistry.h"
......@@ -32,4 +32,4 @@ void KisChangeProfileVisitorTest::testCreation()
}
QTEST_KDEMAIN(KisChangeProfileVisitorTest, GUI)
QTEST_MAIN(KisChangeProfileVisitorTest)
......@@ -18,7 +18,7 @@
#include "kis_clone_layer_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColor.h>
#include <KoColorSpace.h>
......@@ -391,4 +391,4 @@ void KisCloneLayerTest::testCyclingGroupLayer()
testCyclingCase(t, t.cloneOfGroup2, t.cloneOfGroup1, false);
}
QTEST_KDEMAIN(KisCloneLayerTest, GUI)
QTEST_MAIN(KisCloneLayerTest)
......@@ -18,7 +18,7 @@
#include "kis_colorspace_convert_visitor_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorTransformation.h>
#include <KoColorSpace.h>
#include <KoColorSpaceRegistry.h>
......@@ -43,4 +43,4 @@ void KisColorSpaceConvertVisitorTest::testCreation()
}
QTEST_KDEMAIN(KisColorSpaceConvertVisitorTest, GUI)
QTEST_MAIN(KisColorSpaceConvertVisitorTest)
......@@ -18,7 +18,7 @@
#include "kis_convolution_painter_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <QBitArray>
......@@ -437,4 +437,4 @@ void KisConvolutionPainterTest::testGaussianDetailsFFTW()
testGaussianDetails(true);
}
QTEST_KDEMAIN(KisConvolutionPainterTest, GUI)
QTEST_MAIN(KisConvolutionPainterTest)
......@@ -17,7 +17,7 @@
*/
#include "kis_count_visitor_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <QStringList>
#include <KoProperties.h>
......@@ -142,6 +142,6 @@ void KisCountVisitorTest::testCounting()
}
}
QTEST_KDEMAIN(KisCountVisitorTest, NoGUI)
QTEST_MAIN(KisCountVisitorTest)
......@@ -18,7 +18,7 @@
#include "kis_crop_processing_visitor_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpaceRegistry.h>
#include "processing/kis_crop_processing_visitor.h"
#include "commands_new/kis_processing_command.h"
......@@ -134,4 +134,4 @@ void KisCropProcessingVisitorTest::testWrappedInCommand()
QCOMPARE(image1, image5);
}
QTEST_KDEMAIN(KisCropProcessingVisitorTest, GUI)
QTEST_MAIN(KisCropProcessingVisitorTest)
......@@ -17,7 +17,7 @@
*/
#include "kis_cs_conversion_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <QTime>
......@@ -97,6 +97,6 @@ void KisCsConversionTest::testColorSpaceConversion()
}
}
QTEST_KDEMAIN(KisCsConversionTest, GUI)
QTEST_MAIN(KisCsConversionTest)
......@@ -18,7 +18,7 @@
#include "kis_cubic_curve_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_cubic_curve.h"
......@@ -184,4 +184,4 @@ void KisCubicCurveTest::testTransfer()
}
}
QTEST_KDEMAIN(KisCubicCurveTest, GUI)
QTEST_MAIN(KisCubicCurveTest)
......@@ -18,7 +18,7 @@
#include "kis_datamanager_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_datamanager.h"
void KisDataManagerTest::testCreation()
......@@ -100,4 +100,4 @@ void KisDataManagerTest::testDefaultPixel()
//
//void KisDataManagerTest::testThreadedReadWriteAccess() {}
QTEST_KDEMAIN(KisDataManagerTest, GUI)
QTEST_MAIN(KisDataManagerTest)
......@@ -18,7 +18,7 @@
#include "kis_dom_utils_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_dom_utils.h"
#include "kis_debug.h"
......@@ -155,4 +155,4 @@ void KisDomUtilsTest::testG2R()
checkLoadData(xmlData);
}
QTEST_KDEMAIN(KisDomUtilsTest, GUI)
QTEST_MAIN(KisDomUtilsTest)
......@@ -17,7 +17,7 @@
*/
#include "kis_effect_mask_test.h"
#include <qtest_kde.h>
#include <QTest>
void KisEffectMaskTest::testCreation()
......@@ -37,6 +37,6 @@ void KisEffectMaskTest::testCaching()
}
QTEST_KDEMAIN(KisEffectMaskTest, NoGUI)
QTEST_MAIN(KisEffectMaskTest)
......@@ -18,7 +18,7 @@
#include "kis_fast_math_test.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_fast_math.h"
void KisFastMathTest::testAtan2()
......@@ -40,4 +40,4 @@ void KisFastMathTest::testAtan2()
}
QTEST_KDEMAIN(KisFastMathTest, GUI)
QTEST_MAIN(KisFastMathTest)
......@@ -18,7 +18,7 @@
#include "kis_fill_interval_map_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <floodfill/kis_fill_interval_map.h>
#include <floodfill/kis_fill_interval_map_p.h>
......@@ -57,4 +57,4 @@ void KisFillIntervalMapTest::test()
QCOMPARE(range.beginIt->end, 30);
}
QTEST_KDEMAIN(KisFillIntervalMapTest, GUI)
QTEST_MAIN(KisFillIntervalMapTest)
......@@ -18,7 +18,7 @@
#include "kis_fill_interval_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <floodfill/kis_fill_interval.h>
......@@ -34,4 +34,4 @@ void KisFillIntervalTest::testIsValid()
QVERIFY(!i2.isValid());
}
QTEST_KDEMAIN(KisFillIntervalTest, GUI)
QTEST_MAIN(KisFillIntervalTest)
......@@ -20,7 +20,7 @@
#include "testutil.h"