From b2f450146055360e6a25e80bc91753dd4d766bb1 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 14 May 2019 11:10:37 +0200 Subject: Make QSvgGenerator test pass on Android Platforms like Android require assets to be bundled with the app. We include the reference SVGs as resources to work around this. Task-number: QTBUG-73623 Change-Id: Id9cc7a7d575da5adbe73a3392419fd74a1ec1bbd Reviewed-by: BogDan Vatra --- tests/auto/qsvggenerator/qsvggenerator.pro | 3 ++- tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') 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()); -- cgit v1.2.1 From b540b304a39739ce1d630eb7a93b91926d25cbde Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 25 Jun 2019 08:05:39 +0200 Subject: Android: Fix QSVGPlugin test Assets have to be included in the resources in order to be accessible when testing on a remote device. Task-number: QTBUG-73625 Change-Id: I80332b6492bffc01c0157918b9e6abbc2b87a43b Reviewed-by: BogDan Vatra --- tests/auto/qsvgplugin/qsvgplugin.pro | 1 - tests/auto/qsvgplugin/tst_qsvgplugin.cpp | 33 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'tests') 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("imageHeight"); QTest::addColumn("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\"")); -- cgit v1.2.1 From 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 25 Jun 2019 08:11:19 +0200 Subject: Android: Skip QSVGRenderer test These tests require access to local file system and are not written to be portable to remote devices. Since there is no real platform-dependency in this, testing them on other platforms is sufficient, so we will just skip it on Android rather than spend time on it. Task-number: QTBUG-73624 Change-Id: Ic11b69d2eb73e0cd264b153c9870dd7923e1336d Reviewed-by: BogDan Vatra --- tests/auto/auto.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') 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 -- cgit v1.2.1