diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:02:36 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:02:42 +0200 |
commit | a6de6b295ad99cf1830a91c9f87a359bc84658a8 (patch) | |
tree | 4ed90847de1d7f1090986c8cf47d2ead11ea58e3 /tests | |
parent | 4048798d0b9e7b86f91ebedda688dca949812163 (diff) | |
parent | 5708e70eb68cd7165c5bdcc1839c8d0129888833 (diff) | |
download | qtsvg-a6de6b295ad99cf1830a91c9f87a359bc84658a8.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pro | 3 | ||||
-rw-r--r-- | tests/auto/qsvggenerator/qsvggenerator.pro | 3 | ||||
-rw-r--r-- | tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qsvgplugin/qsvgplugin.pro | 1 | ||||
-rw-r--r-- | tests/auto/qsvgplugin/tst_qsvgplugin.cpp | 33 |
5 files changed, 22 insertions, 20 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e2d84ec..925e4cd 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,12 +3,13 @@ qtHaveModule(widgets) { SUBDIRS = \ qsvgdevice \ qsvggenerator \ - qsvgrenderer \ qsvgplugin \ qicon_svg \ cmake \ installed_cmake + !android: SUBDIRS += qsvgrenderer + installed_cmake.depends = cmake } !cross_compile: SUBDIRS += host.pro diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro index fd0edfa..1b6f329 100644 --- a/tests/auto/qsvggenerator/qsvggenerator.pro +++ b/tests/auto/qsvggenerator/qsvggenerator.pro @@ -4,4 +4,5 @@ QT += svg xml testlib widgets gui-private SOURCES += tst_qsvggenerator.cpp -DEFINES += SRCDIR=\\\"$$PWD/\\\" +RESOURCES += referenceSvgs/fileName_output.svg \ + referenceSvgs/radial_gradient.svg diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp index b55b687..9217a5b 100644 --- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp +++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp @@ -122,7 +122,7 @@ static void checkFile(const QString &fileName) QFile file(fileName); QVERIFY(file.open(QIODevice::ReadOnly)); - QFile referenceFile(SRCDIR "referenceSvgs/" + fileName); + QFile referenceFile(QFINDTESTDATA("referenceSvgs/" + fileName)); QVERIFY(referenceFile.open(QIODevice::ReadOnly)); compareWithoutFontInfo(file.readAll(), referenceFile.readAll()); diff --git a/tests/auto/qsvgplugin/qsvgplugin.pro b/tests/auto/qsvgplugin/qsvgplugin.pro index 3fec52e..657b511 100644 --- a/tests/auto/qsvgplugin/qsvgplugin.pro +++ b/tests/auto/qsvgplugin/qsvgplugin.pro @@ -5,4 +5,3 @@ QT += svg testlib widgets gui-private SOURCES += tst_qsvgplugin.cpp RESOURCES += resources.qrc -DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp index da49b75..e1f84f3 100644 --- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp +++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp @@ -79,18 +79,18 @@ void tst_QSvgPlugin::checkSize_data() QTest::addColumn<int>("imageHeight"); QTest::addColumn<int>("imageWidth"); - QTest::newRow("square") << SRCDIR "square.svg" << 50 << 50; - QTest::newRow("square_size") << SRCDIR "square_size.svg" << 200 << 200; - QTest::newRow("square_size_viewbox") << SRCDIR "square_size_viewbox.svg" << 200 << 200; - QTest::newRow("square_viewbox") << SRCDIR "square_viewbox.svg" << 100 << 100; - QTest::newRow("tall") << SRCDIR "tall.svg" << 50 << 25; - QTest::newRow("tall_size") << SRCDIR "tall_size.svg" << 200 << 100; - QTest::newRow("tall_size_viewbox") << SRCDIR "tall_size_viewbox.svg" << 200 << 100; - QTest::newRow("tall_viewbox") << SRCDIR "tall_viewbox.svg" << 100 << 50; - QTest::newRow("wide") << SRCDIR "wide.svg" << 25 << 50; - QTest::newRow("wide_size") << SRCDIR "wide_size.svg" << 100 << 200; - QTest::newRow("wide_size_viewbox") << SRCDIR "wide_size_viewbox.svg" << 100 << 200; - QTest::newRow("wide_viewbox") << SRCDIR "wide_viewbox.svg" << 50 << 100; + QTest::newRow("square") << QFINDTESTDATA("square.svg") << 50 << 50; + QTest::newRow("square_size") << QFINDTESTDATA("square_size.svg") << 200 << 200; + QTest::newRow("square_size_viewbox") << QFINDTESTDATA("square_size_viewbox.svg") << 200 << 200; + QTest::newRow("square_viewbox") << QFINDTESTDATA("square_viewbox.svg") << 100 << 100; + QTest::newRow("tall") << QFINDTESTDATA("tall.svg") << 50 << 25; + QTest::newRow("tall_size") << QFINDTESTDATA("tall_size.svg") << 200 << 100; + QTest::newRow("tall_size_viewbox") << QFINDTESTDATA("tall_size_viewbox.svg") << 200 << 100; + QTest::newRow("tall_viewbox") << QFINDTESTDATA("tall_viewbox.svg") << 100 << 50; + QTest::newRow("wide") << QFINDTESTDATA("wide.svg") << 25 << 50; + QTest::newRow("wide_size") << QFINDTESTDATA("wide_size.svg") << 100 << 200; + QTest::newRow("wide_size_viewbox") << QFINDTESTDATA("wide_size_viewbox.svg") << 100 << 200; + QTest::newRow("wide_viewbox") << QFINDTESTDATA("wide_viewbox.svg") << 50 << 100; } void tst_QSvgPlugin::checkSize() @@ -116,7 +116,8 @@ void tst_QSvgPlugin::checkSize() void tst_QSvgPlugin::checkImageInclude() { - const QString filename(SRCDIR "imageInclude.svg"); + const QString filename(QFINDTESTDATA("imageInclude.svg")); + const QString path = filename.left(filename.size() - strlen("imageInclude.svg")); QFile file(filename); file.open(QIODevice::ReadOnly); @@ -132,9 +133,9 @@ void tst_QSvgPlugin::checkImageInclude() file.close(); QCOMPARE(logMessages.size(), 8); - QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(SRCDIR)); - QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(SRCDIR)); - QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(SRCDIR)); + QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(path)); + QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(path)); + QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(path)); QCOMPARE(logMessages.at(3), QString("Could not create image from \"%1notExisting.svg\"").arg(QDir::rootPath())); QCOMPARE(logMessages.at(4), QLatin1String("Could not create image from \":/notExisting.svg\"")); QCOMPARE(logMessages.at(5), QLatin1String("Could not create image from \"qrc:///notExisting.svg\"")); |