From abc2ac2de1040ff55e761a6be5c66111fed1b018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= Date: Mon, 27 Jul 2026 14:27:02 +0200 Subject: [PATCH] autotests: allow JPG as test source In special cases, JPG with fuzziness value can be used instead of big PNG files. --- autotests/templateimage.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/autotests/templateimage.cpp b/autotests/templateimage.cpp index 1b25832..22b0a32 100644 --- a/autotests/templateimage.cpp +++ b/autotests/templateimage.cpp @@ -14,7 +14,7 @@ #include #include -static QJsonObject searchObject(const QFileInfo& file) +static QJsonObject searchObject(const QFileInfo &file) { auto fi = QFileInfo(QStringLiteral("%1.json").arg(file.filePath())); if (!fi.exists()) { @@ -56,17 +56,15 @@ static QJsonObject searchObject(const QFileInfo& file) return {}; } - -TemplateImage::TemplateImage(const QFileInfo &fi) : - m_fi(fi) +TemplateImage::TemplateImage(const QFileInfo &fi) + : m_fi(fi) { - } bool TemplateImage::isTemplate() const { auto list = suffixes(); - for (auto&& suffix : list) { + for (auto &&suffix : list) { if (!m_fi.suffix().compare(suffix, Qt::CaseInsensitive)) return true; } @@ -87,7 +85,7 @@ bool TemplateImage::skipSequentialDeviceTest() const return obj.value("skipSequential").toBool(); } -QFileInfo TemplateImage::compareImage(TestFlags &flags, QString& comment) const +QFileInfo TemplateImage::compareImage(TestFlags &flags, QString &comment) const { auto fi = jsonImage(flags, comment); if ((flags & TestFlag::SkipTest) == TestFlag::SkipTest) { @@ -99,7 +97,7 @@ QFileInfo TemplateImage::compareImage(TestFlags &flags, QString& comment) const return legacyImage(); } -bool TemplateImage::checkOptionaInfo(const QImage& image, QString& error) const +bool TemplateImage::checkOptionaInfo(const QImage &image, QString &error) const { auto obj = searchObject(m_fi); if (obj.isEmpty()) { @@ -196,13 +194,13 @@ bool TemplateImage::perceptiveFuzziness() const QStringList TemplateImage::suffixes() { - return QStringList({"png", "tif", "tiff", "json"}); + return QStringList({"png", "tif", "tiff", "json", "jpg"}); } QFileInfo TemplateImage::legacyImage() const { auto list = suffixes(); - for (auto&& suffix : list) { + for (auto &&suffix : list) { auto fi = QFileInfo(QStringLiteral("%1/%2.%3").arg(m_fi.path(), m_fi.completeBaseName(), suffix)); if (fi.exists()) { return fi; @@ -211,7 +209,7 @@ QFileInfo TemplateImage::legacyImage() const return {}; } -QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const +QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString &comment) const { flags = TestFlag::None; @@ -224,7 +222,7 @@ QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const auto unsupportedFormat = obj.value("unsupportedFormat").toBool(); comment = obj.value("comment").toString(); - if(obj.value("disableAutoTransform").toBool()) { + if (obj.value("disableAutoTransform").toBool()) { flags |= TestFlag::DisableAutotransform; } @@ -235,4 +233,3 @@ QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const return QFileInfo(QStringLiteral("%1/%2").arg(m_fi.path(), name)); } -