From 041abb93169668b8f6ebac128050d4507e000e16 Mon Sep 17 00:00:00 2001 From: John Layt Date: Sun, 29 Jul 2012 16:27:21 +0100 Subject: QPrintSupport: Move QAbstractPrintDialog test into QPrintSupport Move the test for QAbstractPrintDialog from widgets into printsupport Change-Id: Ia7595fa650a7ad565df3090207500ed06564e842 Reviewed-by: Marc Mutz --- tests/auto/printsupport/dialogs/dialogs.pro | 3 + .../dialogs/qabstractprintdialog/.gitignore | 1 + .../qabstractprintdialog/qabstractprintdialog.pro | 9 ++ .../tst_qabstractprintdialog.cpp | 144 +++++++++++++++++++++ tests/auto/printsupport/printsupport.pro | 1 + tests/auto/widgets/dialogs/dialogs.pro | 3 - .../dialogs/qabstractprintdialog/.gitignore | 1 - .../qabstractprintdialog/qabstractprintdialog.pro | 9 -- .../tst_qabstractprintdialog.cpp | 144 --------------------- 9 files changed, 158 insertions(+), 157 deletions(-) create mode 100644 tests/auto/printsupport/dialogs/dialogs.pro create mode 100644 tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore create mode 100644 tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro create mode 100644 tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp delete mode 100644 tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore delete mode 100644 tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro delete mode 100644 tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp (limited to 'tests') diff --git a/tests/auto/printsupport/dialogs/dialogs.pro b/tests/auto/printsupport/dialogs/dialogs.pro new file mode 100644 index 0000000000..419bd13ccf --- /dev/null +++ b/tests/auto/printsupport/dialogs/dialogs.pro @@ -0,0 +1,3 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractprintdialog \ diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore b/tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore new file mode 100644 index 0000000000..a768494da5 --- /dev/null +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore @@ -0,0 +1 @@ +tst_qabstractprintdialog diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro new file mode 100644 index 0000000000..2e9ae33592 --- /dev/null +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro @@ -0,0 +1,9 @@ +############################################################ +# Project file for autotest for file qabstractprintdialog.h +############################################################ + +CONFIG += testcase +CONFIG += parallel_test +TARGET = tst_qabstractprintdialog +QT += widgets printsupport testlib +SOURCES += tst_qabstractprintdialog.cpp diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp new file mode 100644 index 0000000000..c79a4a97ef --- /dev/null +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include + +#include +#include +#include +#include + +class tst_QAbstractPrintDialog : public QObject +{ +Q_OBJECT + +#if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) +public slots: + void initTestCase(); +#else +private slots: + void getSetCheck(); + void setMinMax(); + void setFromTo(); +#endif +}; + +#if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) +void tst_QAbstractPrintDialog::initTestCase() +{ + QSKIP("This test requires printing and print dialog support"); +} + +#else + +class MyAbstractPrintDialog : public QAbstractPrintDialog +{ +public: + MyAbstractPrintDialog(QPrinter *p) : QAbstractPrintDialog(p) {} + int exec() { return 0; } +}; + +// Testing get/set functions +void tst_QAbstractPrintDialog::getSetCheck() +{ + QPrinter printer; + MyAbstractPrintDialog 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()); + + // PrintRange QAbstractPrintDialog::printRange() + // void QAbstractPrintDialog::setPrintRange(PrintRange) + obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::AllPages)); + QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::AllPages), obj1.printRange()); + obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::Selection)); + QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::Selection), obj1.printRange()); + obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::PageRange)); + QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::PageRange), obj1.printRange()); +} + +void tst_QAbstractPrintDialog::setMinMax() +{ + QPrinter printer; + MyAbstractPrintDialog obj1(&printer); + obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None)); + QEXPECT_FAIL("", "QTBUG-22637", Abort); + QCOMPARE(obj1.minPage(), 1); + QCOMPARE(obj1.maxPage(), INT_MAX); + QVERIFY(!obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); + obj1.setMinMax(2,5); + QCOMPARE(obj1.minPage(), 2); + QCOMPARE(obj1.maxPage(), 5); + QVERIFY(obj1.enabledOptions() & QAbstractPrintDialog::PrintPageRange); + QVERIFY(obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); +} + +void tst_QAbstractPrintDialog::setFromTo() +{ + QPrinter printer; + MyAbstractPrintDialog obj1(&printer); + QCOMPARE(obj1.fromPage(), 0); + QCOMPARE(obj1.toPage(), 0); + obj1.setMinMax(0,0); + QCOMPARE(obj1.minPage(), 0); + QCOMPARE(obj1.maxPage(), 0); + obj1.setFromTo(20,50); + QCOMPARE(obj1.fromPage(), 20); + QCOMPARE(obj1.toPage(), 50); + QCOMPARE(obj1.minPage(), 1); + QCOMPARE(obj1.maxPage(), 50); +} + +#endif + +QTEST_MAIN(tst_QAbstractPrintDialog) +#include "tst_qabstractprintdialog.moc" diff --git a/tests/auto/printsupport/printsupport.pro b/tests/auto/printsupport/printsupport.pro index 69ba296738..062f46980a 100644 --- a/tests/auto/printsupport/printsupport.pro +++ b/tests/auto/printsupport/printsupport.pro @@ -1,3 +1,4 @@ TEMPLATE=subdirs SUBDIRS=\ + dialogs \ kernel \ diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index acff1df5ba..c5f2c409dd 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -1,6 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ - qabstractprintdialog \ qcolordialog \ qdialog \ qerrormessage \ @@ -14,8 +13,6 @@ SUBDIRS=\ qsidebar \ qwizard \ -wince*|!qtHaveModule(printsupport):SUBDIRS -= qabstractprintdialog - !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsidebar \ diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore b/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore deleted file mode 100644 index a768494da5..0000000000 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qabstractprintdialog diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro deleted file mode 100644 index 2e9ae33592..0000000000 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro +++ /dev/null @@ -1,9 +0,0 @@ -############################################################ -# Project file for autotest for file qabstractprintdialog.h -############################################################ - -CONFIG += testcase -CONFIG += parallel_test -TARGET = tst_qabstractprintdialog -QT += widgets printsupport testlib -SOURCES += tst_qabstractprintdialog.cpp diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp deleted file mode 100644 index c79a4a97ef..0000000000 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include - -#include -#include -#include -#include - -class tst_QAbstractPrintDialog : public QObject -{ -Q_OBJECT - -#if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) -public slots: - void initTestCase(); -#else -private slots: - void getSetCheck(); - void setMinMax(); - void setFromTo(); -#endif -}; - -#if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) -void tst_QAbstractPrintDialog::initTestCase() -{ - QSKIP("This test requires printing and print dialog support"); -} - -#else - -class MyAbstractPrintDialog : public QAbstractPrintDialog -{ -public: - MyAbstractPrintDialog(QPrinter *p) : QAbstractPrintDialog(p) {} - int exec() { return 0; } -}; - -// Testing get/set functions -void tst_QAbstractPrintDialog::getSetCheck() -{ - QPrinter printer; - MyAbstractPrintDialog 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()); - - // PrintRange QAbstractPrintDialog::printRange() - // void QAbstractPrintDialog::setPrintRange(PrintRange) - obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::AllPages)); - QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::AllPages), obj1.printRange()); - obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::Selection)); - QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::Selection), obj1.printRange()); - obj1.setPrintRange(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::PageRange)); - QCOMPARE(QAbstractPrintDialog::PrintRange(QAbstractPrintDialog::PageRange), obj1.printRange()); -} - -void tst_QAbstractPrintDialog::setMinMax() -{ - QPrinter printer; - MyAbstractPrintDialog obj1(&printer); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None)); - QEXPECT_FAIL("", "QTBUG-22637", Abort); - QCOMPARE(obj1.minPage(), 1); - QCOMPARE(obj1.maxPage(), INT_MAX); - QVERIFY(!obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); - obj1.setMinMax(2,5); - QCOMPARE(obj1.minPage(), 2); - QCOMPARE(obj1.maxPage(), 5); - QVERIFY(obj1.enabledOptions() & QAbstractPrintDialog::PrintPageRange); - QVERIFY(obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); -} - -void tst_QAbstractPrintDialog::setFromTo() -{ - QPrinter printer; - MyAbstractPrintDialog obj1(&printer); - QCOMPARE(obj1.fromPage(), 0); - QCOMPARE(obj1.toPage(), 0); - obj1.setMinMax(0,0); - QCOMPARE(obj1.minPage(), 0); - QCOMPARE(obj1.maxPage(), 0); - obj1.setFromTo(20,50); - QCOMPARE(obj1.fromPage(), 20); - QCOMPARE(obj1.toPage(), 50); - QCOMPARE(obj1.minPage(), 1); - QCOMPARE(obj1.maxPage(), 50); -} - -#endif - -QTEST_MAIN(tst_QAbstractPrintDialog) -#include "tst_qabstractprintdialog.moc" -- cgit v1.2.3