diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-23 11:57:17 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 09:38:12 +0100 |
commit | c64ae4f1615f0fe9322ffcb09e50e360068fd11a (patch) | |
tree | 2e6bec67c939e226e0efa46f966b5e990aa8abb2 /tests | |
parent | 2564c403a1fbcf110475b071c3b60eca1991a455 (diff) |
Long live the qtimageformats module
This module contains plugins for image formats that aren't part of
the "core" (qtbase) offering, starting with mng.
Task-number: QTBUG-21869
Change-Id: I85e51ed6f84c07419b1676f9def234c36f10141f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: aavit <qt_aavit@ovi.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pro | 3 | ||||
-rw-r--r-- | tests/auto/mng/mng.pro | 11 | ||||
-rw-r--r-- | tests/auto/mng/tst_qmng.cpp | 104 | ||||
-rw-r--r-- | tests/benchmarks/benchmarks.pro | 3 | ||||
-rw-r--r-- | tests/benchmarks/mng/mng.pro | 10 | ||||
-rw-r--r-- | tests/benchmarks/mng/tst_qmng.cpp | 108 | ||||
-rw-r--r-- | tests/shared/images/mng.qrc | 9 | ||||
-rw-r--r-- | tests/shared/images/mng/animation.mng | bin | 0 -> 5464 bytes | |||
-rw-r--r-- | tests/shared/images/mng/ball.mng | bin | 0 -> 34394 bytes | |||
-rw-r--r-- | tests/shared/images/mng/corrupt.mng | bin | 0 -> 183 bytes | |||
-rw-r--r-- | tests/shared/images/mng/dutch.mng | bin | 0 -> 18534 bytes | |||
-rw-r--r-- | tests/shared/images/mng/fire.mng | bin | 0 -> 44430 bytes | |||
-rw-r--r-- | tests/tests.pro | 2 |
13 files changed, 250 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 0000000..5279d05 --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = +contains(QT_CONFIG, system-zlib): SUBDIRS += mng diff --git a/tests/auto/mng/mng.pro b/tests/auto/mng/mng.pro new file mode 100644 index 0000000..fcd0718 --- /dev/null +++ b/tests/auto/mng/mng.pro @@ -0,0 +1,11 @@ +TEMPLATE = app +TARGET = tst_qmng +DEPENDPATH += . +INCLUDEPATH += . + +QT = core gui testlib +CONFIG -= app_bundle +CONFIG += testcase + +SOURCES += tst_qmng.cpp +RESOURCES += $$PWD/../../shared/images/mng.qrc diff --git a/tests/auto/mng/tst_qmng.cpp b/tests/auto/mng/tst_qmng.cpp new file mode 100644 index 0000000..6db59fb --- /dev/null +++ b/tests/auto/mng/tst_qmng.cpp @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtAddOn.JsonDb module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QtTest/QtTest> +#include <QtGui/QtGui> + +class tst_qmng: public QObject +{ + Q_OBJECT + +private slots: + void readImage_data(); + void readImage(); + void readCorruptImage_data(); + void readCorruptImage(); +}; + +void tst_qmng::readImage_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QSize>("size"); + + QTest::newRow("animation") << QString("animation.mng") << QSize(100, 100); + QTest::newRow("ball") << QString("ball.mng") << QSize(32, 32); + QTest::newRow("dutch") << QString("dutch.mng") << QSize(352, 264); + QTest::newRow("fire") << QString("fire.mng") << QSize(30, 60); +} + +void tst_qmng::readImage() +{ + QFETCH(QString, fileName); + QFETCH(QSize, size); + + QString path = QString(":/mng/") + fileName; + QImageReader reader(path); + QVERIFY(reader.canRead()); + QImage image = reader.read(); + QVERIFY(!image.isNull()); + QCOMPARE(image.size(), size); +} + +void tst_qmng::readCorruptImage_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QString>("message"); + + QTest::newRow("corrupt") + << QString("corrupt.mng") + << QString("MNG error 901: Application signalled I/O error; chunk IHDR; subcode 0:0"); +} + +void tst_qmng::readCorruptImage() +{ + QFETCH(QString, fileName); + QFETCH(QString, message); + + QString path = QString(":/mng/") + fileName; + QImageReader reader(path); + if (!message.isEmpty()) + QTest::ignoreMessage(QtWarningMsg, message.toLatin1()); + QVERIFY(reader.canRead()); + QImage image = reader.read(); + QVERIFY(image.isNull()); +} + +QTEST_MAIN(tst_qmng) +#include "tst_qmng.moc" diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro new file mode 100644 index 0000000..bd41748 --- /dev/null +++ b/tests/benchmarks/benchmarks.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = \ + mng diff --git a/tests/benchmarks/mng/mng.pro b/tests/benchmarks/mng/mng.pro new file mode 100644 index 0000000..13b0bbf --- /dev/null +++ b/tests/benchmarks/mng/mng.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +TARGET = tst_bench_qmng +DEPENDPATH += . +INCLUDEPATH += . + +QT = core gui testlib +CONFIG -= app_bundle + +SOURCES += tst_qmng.cpp +RESOURCES += $$PWD/../../shared/images/mng.qrc diff --git a/tests/benchmarks/mng/tst_qmng.cpp b/tests/benchmarks/mng/tst_qmng.cpp new file mode 100644 index 0000000..0b3e3bd --- /dev/null +++ b/tests/benchmarks/mng/tst_qmng.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtAddOn.JsonDb module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QtTest/QtTest> +#include <QtGui/QtGui> + +class tst_qmng: public QObject +{ + Q_OBJECT + +private slots: + void readImage_data(); + void readImage(); + void readCorruptImage_data(); + void readCorruptImage(); +}; + +void tst_qmng::readImage_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QSize>("size"); + + QTest::newRow("animation") << QString("animation.mng") << QSize(100, 100); + QTest::newRow("ball") << QString("ball.mng") << QSize(32, 32); + QTest::newRow("dutch") << QString("dutch.mng") << QSize(352, 264); + QTest::newRow("fire") << QString("fire.mng") << QSize(30, 60); +} + +void tst_qmng::readImage() +{ + QFETCH(QString, fileName); + QFETCH(QSize, size); + + QString path = QString(":/mng/") + fileName; + QBENCHMARK { + QImageReader reader(path); + QVERIFY(reader.canRead()); + QImage image = reader.read(); + QVERIFY(!image.isNull()); + QCOMPARE(image.size(), size); + } +} + +void tst_qmng::readCorruptImage_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QString>("message"); + + QTest::newRow("corrupt") + << QString("corrupt.mng") + << QString("MNG error 901: Application signalled I/O error; chunk IHDR; subcode 0:0"); +} + +void tst_qmng::readCorruptImage() +{ + QFETCH(QString, fileName); + QFETCH(QString, message); + + QString path = QString(":/mng/") + fileName; + QBENCHMARK { + QImageReader reader(path); + if (!message.isEmpty()) + QTest::ignoreMessage(QtWarningMsg, message.toLatin1()); + QVERIFY(reader.canRead()); + QImage image = reader.read(); + QVERIFY(image.isNull()); + } +} + +QTEST_MAIN(tst_qmng) +#include "tst_qmng.moc" diff --git a/tests/shared/images/mng.qrc b/tests/shared/images/mng.qrc new file mode 100644 index 0000000..8bca94e --- /dev/null +++ b/tests/shared/images/mng.qrc @@ -0,0 +1,9 @@ +<RCC> + <qresource prefix="/"> + <file>mng/animation.mng</file> + <file>mng/ball.mng</file> + <file>mng/corrupt.mng</file> + <file>mng/fire.mng</file> + <file>mng/dutch.mng</file> + </qresource> +</RCC> diff --git a/tests/shared/images/mng/animation.mng b/tests/shared/images/mng/animation.mng Binary files differnew file mode 100644 index 0000000..12b688a --- /dev/null +++ b/tests/shared/images/mng/animation.mng diff --git a/tests/shared/images/mng/ball.mng b/tests/shared/images/mng/ball.mng Binary files differnew file mode 100644 index 0000000..8154478 --- /dev/null +++ b/tests/shared/images/mng/ball.mng diff --git a/tests/shared/images/mng/corrupt.mng b/tests/shared/images/mng/corrupt.mng Binary files differnew file mode 100644 index 0000000..17fd43a --- /dev/null +++ b/tests/shared/images/mng/corrupt.mng diff --git a/tests/shared/images/mng/dutch.mng b/tests/shared/images/mng/dutch.mng Binary files differnew file mode 100644 index 0000000..4917fde --- /dev/null +++ b/tests/shared/images/mng/dutch.mng diff --git a/tests/shared/images/mng/fire.mng b/tests/shared/images/mng/fire.mng Binary files differnew file mode 100644 index 0000000..c6695c8 --- /dev/null +++ b/tests/shared/images/mng/fire.mng diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..6b6bdac --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = auto benchmarks |