diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-04 13:55:08 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 09:27:07 +0100 |
| commit | 7ba57e2630ec4b6b8e426249025ade9c40df463c (patch) | |
| tree | 36a1b28613dfdae70da5141f14bd6ae99475c094 /tests/auto | |
| parent | db34625eaef8eec373a0427f81e91a414dbd05da (diff) | |
Re-enabled passing tests in tst_qprinter
To increase the effective test coverage, this patch
re-enables the tst_qprinter test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: I74cc30dc26b8b83852b3516f8def995eab19cf0f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/painting/qprinter/qprinter.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qprinter/tst_qprinter.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro index fd01471d5b..ebf8edea32 100644 --- a/tests/auto/gui/painting/qprinter/qprinter.pro +++ b/tests/auto/gui/painting/qprinter/qprinter.pro @@ -4,4 +4,3 @@ QT += printsupport widgets testlib SOURCES += tst_qprinter.cpp mac*:CONFIG+=insignificant_test -CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp index 995f4ab113..14c29f74a5 100644 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp @@ -198,6 +198,7 @@ void tst_QPrinter::getSetCheck() obj1.setPageSize(QPrinter::PageSize(QPrinter::A4)); QCOMPARE(QPrinter::PageSize(QPrinter::A4), obj1.pageSize()); obj1.setPageSize(QPrinter::PageSize(QPrinter::Letter)); + QEXPECT_FAIL("", "QTBUG-22562", Abort); QCOMPARE(QPrinter::PageSize(QPrinter::Letter), obj1.pageSize()); obj1.setPageSize(QPrinter::PageSize(QPrinter::Legal)); QCOMPARE(QPrinter::PageSize(QPrinter::Legal), obj1.pageSize()); @@ -520,6 +521,7 @@ void tst_QPrinter::setGetPaperSize() p.setOutputFormat(QPrinter::PdfFormat); QSizeF size(500, 10); p.setPaperSize(size, QPrinter::Millimeter); + QEXPECT_FAIL("", "QTBUG-22562", Abort); QCOMPARE(p.paperSize(QPrinter::Millimeter), size); QSizeF ptSize = p.paperSize(QPrinter::Point); //qDebug() << ptSize; @@ -762,6 +764,7 @@ void tst_QPrinter::valuePreservation() printer.setPageSize(QPrinter::B5); printer.setOutputFormat(newFormat); + QEXPECT_FAIL("", "QTBUG-22562", Abort); QCOMPARE(printer.pageSize(), QPrinter::B5); printer.setOutputFormat(oldFormat); QCOMPARE(printer.pageSize(), QPrinter::B5); @@ -882,6 +885,7 @@ void tst_QPrinter::testCustomPageSizes() p.setPaperSize(customSize, QPrinter::Inch); QSizeF paperSize = p.paperSize(QPrinter::Inch); + QEXPECT_FAIL("", "QTBUG-22562", Abort); QCOMPARE(paperSize, customSize); QPrinter p2(QPrinter::HighResolution); @@ -942,6 +946,7 @@ void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles() QFile file2("out2.ps"); QVERIFY(file2.open(QIODevice::ReadOnly)); + QEXPECT_FAIL("", "QTBUG-22562", Abort); QCOMPARE(file1.readAll(), file2.readAll()); } |