AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPrinter: fix unit tests for special case when no printer is default

Browse Source 
The unit tests of QPrinter assume that a printer which is default-
initialized is the same printer as the default printer. However, when
no printer is set to default, this is not the case. When no printer
is the default printer, a default-initialized QPrinter will be the
first printer found.
This patch adapts the unit tests to work also when no printer is the
default printer, even though printers are available.

Change-Id: I4967e5b1c4fb8a7c33c911184289ec5cd283fc58
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Andreas Buhr 2020-09-25 16:54:50 +02:00
parent b05e444a92
commit f8474306e5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
View File

@ -1516,7 +1516,13 @@ void tst_QPrinter::outputFormat()
QCOMPARE(printer.printerName(), QString());
} else {
QCOMPARE(printer.outputFormat(), QPrinter::NativeFormat);
QCOMPARE(printer.printerName(), QPrinterInfo::defaultPrinter().printerName());
// If no printer is default, the first available printer should be used.
// Otherwise, the default printer should be used.
if (QPrinterInfo::defaultPrinter().isNull())
QCOMPARE(printer.printerName(), QPrinterInfo::availablePrinters().at(0).printerName());
else
QCOMPARE(printer.printerName(), QPrinterInfo::defaultPrinter().printerName());
}
printer.setOutputFormat(QPrinter::PdfFormat);