diff options
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 33 | ||||
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp | 29 |
3 files changed, 18 insertions, 46 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index b3906cc247..0cb2ef474d 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -16,7 +16,7 @@ SUBDIRS += \ printsupport \ cmake -wince*: SUBDIRS -= printsupport +wince*|contains(DEFINES, QT_NO_PRINTER): SUBDIRS -= printsupport cross_compile: SUBDIRS -= tools isEmpty(QT.opengl.name): SUBDIRS -= opengl !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 6977bbe8b4..c8667822ae 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -81,20 +81,18 @@ class tst_QPrinter : public QObject { Q_OBJECT -#ifdef QT_NO_PRINTER -public slots: - void initTestCase(); -#else private slots: void getSetCheck(); // Add your testfunctions and testdata create functions here +#ifdef Q_OS_WIN void testPageSize(); + void testNonExistentPrinter(); +#endif void testPageRectAndPaperRect(); void testPageRectAndPaperRect_data(); void testSetOptions(); void testMargins_data(); void testMargins(); - void testNonExistentPrinter(); void testPageSetupDialog(); void testMulitpleSets_data(); void testMulitpleSets(); @@ -115,17 +113,8 @@ private slots: void taskQTBUG4497_reusePrinterOnDifferentFiles(); void testPdfTitle(); -#endif }; -#ifdef QT_NO_PRINTER -void tst_QPrinter::initTestCase() -{ - QSKIP("This test requires printing support"); -} - -#else - // Testing get/set functions void tst_QPrinter::getSetCheck() { @@ -233,11 +222,10 @@ void tst_QPrinter::testPageSetupDialog() } } +#ifdef Q_OS_WIN +// QPrinter::winPageSize(): Windows only. void tst_QPrinter::testPageSize() { -#ifndef Q_OS_WIN - QSKIP("QPrinter::winPageSize(): Windows only."); -#else QPrinter prn; prn.setPageSize(QPrinter::Letter); @@ -255,8 +243,8 @@ void tst_QPrinter::testPageSize() prn.setWinPageSize(DMPAPER_A4); MYCOMPARE(prn.winPageSize(), DMPAPER_A4); MYCOMPARE(prn.pageSize(), QPrinter::A4); -#endif // Q_OS_WIN } +#endif // Q_OS_WIN void tst_QPrinter::testPageRectAndPaperRect_data() { @@ -397,11 +385,10 @@ void tst_QPrinter::testMargins() QFile::remove("silly"); } +#ifdef Q_OS_WIN +// QPrinter::testNonExistentPrinter() is not relevant for this platform void tst_QPrinter::testNonExistentPrinter() { -#ifndef Q_OS_WIN - QSKIP("QPrinter::testNonExistentPrinter() is not relevant for this platform"); -#else QPrinter printer; QPainter painter; @@ -429,8 +416,8 @@ void tst_QPrinter::testNonExistentPrinter() QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmPhysicalDpiY), 0); QVERIFY(!painter.begin(&printer)); -#endif } +#endif void tst_QPrinter::testMulitpleSets_data() { @@ -1047,7 +1034,5 @@ void tst_QPrinter::testPdfTitle() QVERIFY(file.readAll().contains(QByteArray(expected, 26))); } -#endif - QTEST_MAIN(tst_QPrinter) #include "tst_qprinter.moc" diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 3427a122ee..63ed70045a 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include <QtTest/QtTest> #include <QtGlobal> #include <QtAlgorithms> @@ -57,12 +56,11 @@ class tst_QPrinterInfo : public QObject { Q_OBJECT -public slots: - void initTestCase(); -#ifndef QT_NO_PRINTER private slots: +#ifndef Q_OS_WIN32 void testForDefaultPrinter(); void testForPrinters(); +#endif void testForPaperSizes(); void testConstructors(); void testAssignment(); @@ -75,17 +73,8 @@ private: #ifdef Q_OS_UNIX QString getOutputFromCommand(const QStringList& command); #endif // Q_OS_UNIX -#endif // QT_NO_PRINTER }; -void tst_QPrinterInfo::initTestCase() -{ -#ifdef QT_NO_PRINTER - QSKIP("This test requires printing support"); -#endif // QT_NO_PRINTER -} - -#ifndef QT_NO_PRINTER QString tst_QPrinterInfo::getDefaultPrinterFromSystem() { QString printer; @@ -200,11 +189,10 @@ QString tst_QPrinterInfo::getOutputFromCommand(const QStringList& command) } #endif +// Windows test support not yet implemented +#ifndef Q_OS_WIN32 void tst_QPrinterInfo::testForDefaultPrinter() { -#ifdef Q_OS_WIN32 - QSKIP("Windows test support not yet implemented"); -#endif // Q_OS_WIN32 QString testPrinter = getDefaultPrinterFromSystem(); QString defaultPrinter = QPrinterInfo::defaultPrinter().printerName(); QString availablePrinter; @@ -227,12 +215,12 @@ void tst_QPrinterInfo::testForDefaultPrinter() if (!availablePrinter.isEmpty()) QCOMPARE(availablePrinterDefaults, 1); } +#endif +// Windows test support not yet implemented +#ifndef Q_OS_WIN32 void tst_QPrinterInfo::testForPrinters() { -#ifdef Q_OS_WIN32 - QSKIP("Windows test support not yet implemented"); -#endif // Q_OS_WIN32 QStringList testPrinters = getPrintersFromSystem(); QList<QPrinterInfo> printers = QPrinterInfo::availablePrinters(); @@ -251,6 +239,7 @@ void tst_QPrinterInfo::testForPrinters() for (int i = 0; i < testPrinters.size(); ++i) QCOMPARE(qtPrinters.at(i), testPrinters.at(i)); } +#endif void tst_QPrinterInfo::testForPaperSizes() { @@ -324,7 +313,5 @@ void tst_QPrinterInfo::namedPrinter() } } -#endif // QT_NO_PRINTER - QTEST_MAIN(tst_QPrinterInfo) #include "tst_qprinterinfo.moc" |