Added QTBUG-22296 to QEXPECT_FAILs

Change-Id: I6c619cea64a14d957077813256c7d4f7ff6a4220
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
Jo Asplin 2011-11-10 11:00:02 +01:00 committed by Qt by Nokia
parent 1505508742
commit 51ae37d8c4

View File

@ -198,7 +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);
QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
QCOMPARE(QPrinter::PageSize(QPrinter::Letter), obj1.pageSize());
obj1.setPageSize(QPrinter::PageSize(QPrinter::Legal));
QCOMPARE(QPrinter::PageSize(QPrinter::Legal), obj1.pageSize());
@ -521,7 +521,7 @@ void tst_QPrinter::setGetPaperSize()
p.setOutputFormat(QPrinter::PdfFormat);
QSizeF size(500, 10);
p.setPaperSize(size, QPrinter::Millimeter);
QEXPECT_FAIL("", "QTBUG-22562", Abort);
QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
QCOMPARE(p.paperSize(QPrinter::Millimeter), size);
QSizeF ptSize = p.paperSize(QPrinter::Point);
//qDebug() << ptSize;
@ -764,7 +764,7 @@ void tst_QPrinter::valuePreservation()
printer.setPageSize(QPrinter::B5);
printer.setOutputFormat(newFormat);
QEXPECT_FAIL("", "QTBUG-22562", Abort);
QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
QCOMPARE(printer.pageSize(), QPrinter::B5);
printer.setOutputFormat(oldFormat);
QCOMPARE(printer.pageSize(), QPrinter::B5);
@ -885,7 +885,7 @@ void tst_QPrinter::testCustomPageSizes()
p.setPaperSize(customSize, QPrinter::Inch);
QSizeF paperSize = p.paperSize(QPrinter::Inch);
QEXPECT_FAIL("", "QTBUG-22562", Abort);
QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
QCOMPARE(paperSize, customSize);
QPrinter p2(QPrinter::HighResolution);
@ -946,7 +946,7 @@ void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles()
QFile file2("out2.ps");
QVERIFY(file2.open(QIODevice::ReadOnly));
QEXPECT_FAIL("", "QTBUG-22562", Abort);
QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
QCOMPARE(file1.readAll(), file2.readAll());
}