summaryrefslogtreecommitdiffstats
path: root/tests/auto/printsupport
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/printsupport')
-rw-r--r--tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp77
-rw-r--r--tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp36
2 files changed, 58 insertions, 55 deletions
diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
index 7f874a843d..01772b2d02 100644
--- a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
@@ -33,7 +33,7 @@
#include <qdebug.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
#if QT_CONFIG(printdialog)
-#include <qabstractprintdialog.h>
+#include <qprintdialog.h>
#include <qprinter.h>
#endif
@@ -60,31 +60,63 @@ void tst_QAbstractPrintDialog::initTestCase()
#else
-class MyAbstractPrintDialog : public QAbstractPrintDialog
+class MyPrintDialog : public QPrintDialog
{
public:
- MyAbstractPrintDialog(QPrinter *p) : QAbstractPrintDialog(p) {}
+ MyPrintDialog(QPrinter *p)
+ : QPrintDialog(p)
+ {
+ }
int exec() { return 0; }
+
+ void resetAllOptions()
+ {
+ setOption(QAbstractPrintDialog::PrintToFile, false);
+ setOption(QAbstractPrintDialog::PrintSelection, false);
+ setOption(QAbstractPrintDialog::PrintPageRange, false);
+ setOption(QAbstractPrintDialog::PrintShowPageSize, false);
+ setOption(QAbstractPrintDialog::PrintCollateCopies, false);
+ setOption(QAbstractPrintDialog::PrintCurrentPage, false);
+ }
};
// Testing get/set functions
void tst_QAbstractPrintDialog::getSetCheck()
{
QPrinter printer;
- MyAbstractPrintDialog obj1(&printer);
+ MyPrintDialog obj1(&printer);
QCOMPARE(obj1.printer(), &printer);
- // PrintDialogOptions QAbstractPrintDialog::enabledOptions()
- // void QAbstractPrintDialog::setEnabledOptions(PrintDialogOptions)
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None));
- QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None), obj1.enabledOptions());
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintToFile));
- QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintToFile), obj1.enabledOptions());
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection));
- QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection), obj1.enabledOptions());
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintPageRange));
- QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintPageRange), obj1.enabledOptions());
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintCollateCopies));
- QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintCollateCopies), obj1.enabledOptions());
+
+ // QPrintDialog::options APIs
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile
+ |QAbstractPrintDialog::PrintPageRange
+ |QAbstractPrintDialog::PrintShowPageSize
+ |QAbstractPrintDialog::PrintCollateCopies);
+ obj1.setOptions(QAbstractPrintDialog::PrintSelection
+ |QAbstractPrintDialog::PrintCurrentPage);
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintSelection
+ |QAbstractPrintDialog::PrintCurrentPage);
+ obj1.resetAllOptions();
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintDialogOptions());
+
+ obj1.setOption(QAbstractPrintDialog::PrintToFile);
+ QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintToFile));
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile);
+ obj1.setOption(QAbstractPrintDialog::PrintSelection);
+ QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintSelection));
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile
+ |QAbstractPrintDialog::PrintSelection);
+ obj1.setOption(QAbstractPrintDialog::PrintPageRange);
+ QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintPageRange));
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile
+ |QAbstractPrintDialog::PrintSelection
+ |QAbstractPrintDialog::PrintPageRange);
+ obj1.setOption(QAbstractPrintDialog::PrintCollateCopies);
+ QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintCollateCopies));
+ QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile
+ |QAbstractPrintDialog::PrintSelection
+ |QAbstractPrintDialog::PrintPageRange
+ |QAbstractPrintDialog::PrintCollateCopies);
// PrintRange QAbstractPrintDialog::printRange()
// void QAbstractPrintDialog::setPrintRange(PrintRange)
@@ -99,22 +131,23 @@ void tst_QAbstractPrintDialog::getSetCheck()
void tst_QAbstractPrintDialog::setMinMax()
{
QPrinter printer;
- MyAbstractPrintDialog obj1(&printer);
- obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None));
+ MyPrintDialog obj1(&printer);
+ obj1.resetAllOptions();
+
QCOMPARE(obj1.minPage(), 0);
QCOMPARE(obj1.maxPage(), INT_MAX);
- QVERIFY(!obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange));
+ QVERIFY(!obj1.testOption(QAbstractPrintDialog::PrintPageRange));
obj1.setMinMax(2,5);
QCOMPARE(obj1.minPage(), 2);
QCOMPARE(obj1.maxPage(), 5);
- QVERIFY(obj1.enabledOptions() & QAbstractPrintDialog::PrintPageRange);
- QVERIFY(obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange));
+ QVERIFY(obj1.options() & QAbstractPrintDialog::PrintPageRange);
+ QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintPageRange));
}
void tst_QAbstractPrintDialog::setFromTo()
{
QPrinter printer;
- MyAbstractPrintDialog obj1(&printer);
+ MyPrintDialog obj1(&printer);
QCOMPARE(obj1.fromPage(), 0);
QCOMPARE(obj1.toPage(), 0);
obj1.setMinMax(0,0);
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index d6c236e76e..fef7c4905d 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -65,7 +65,6 @@ private slots:
#if QT_CONFIG(printer)
void testPageRectAndPaperRect();
void testPageRectAndPaperRect_data();
- void testSetOptions();
void testMargins_data();
void testMargins();
void testPageSetupDialog();
@@ -135,8 +134,6 @@ void tst_QPrinter::initTestCase()
#if QT_CONFIG(printer)
-#define MYCOMPARE(a, b) QCOMPARE(QVariant((int)a), QVariant((int)b))
-
void tst_QPrinter::testPageSetupDialog()
{
// Make sure this doesn't crash at least
@@ -259,33 +256,6 @@ void tst_QPrinter::testPageRectAndPaperRect()
QVERIFY(printer->pageLayout().orientation() != QPageLayout::Portrait || pageRect.width() < pageRect.height());
}
-void tst_QPrinter::testSetOptions()
-{
- QPrinter prn;
- QPrintDialog dlg(&prn);
-
- // Verify default values
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), true);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true);
-
- dlg.setEnabledOptions(QAbstractPrintDialog::PrintPageRange);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true);
-
- dlg.setEnabledOptions((QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection
- | QAbstractPrintDialog::PrintPageRange)));
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true);
-
- dlg.setEnabledOptions(QAbstractPrintDialog::PrintSelection);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true);
- MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), false);
-}
-
void tst_QPrinter::testMargins_data()
{
QTest::addColumn<PrinterPtr>("printer");
@@ -556,7 +526,7 @@ void tst_QPrinter::printDialogCompleter()
if (dialog.printer()->outputFormat() != QPrinter::NativeFormat)
QSKIP("Dialog cannot be used with non-native formats");
#endif
- dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile);
+ dialog.setOption(QAbstractPrintDialog::PrintToFile);
dialog.show();
QVERIFY(QTest::qWaitForWindowActive(&dialog));
@@ -625,11 +595,11 @@ void tst_QPrinter::testCurrentPage()
QPrintDialog dialog(&printer);
// Test default Current Page option to off
- QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), false);
+ QVERIFY(!dialog.testOption(QPrintDialog::PrintCurrentPage));
// Test enable Current Page option
dialog.setOption(QPrintDialog::PrintCurrentPage);
- QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), true);
+ QVERIFY(dialog.testOption(QPrintDialog::PrintCurrentPage));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:47:30 +0000