diff options
18 files changed, 363 insertions, 12 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 7a655d6208..f9434d58bd 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -1,13 +1,9 @@ -# The tests in this .pro file _MUST_ use QtCore only (i.e. QT=core). -# The test system is allowed to run these tests before the test of Qt has -# been compiled. - TEMPLATE=subdirs SUBDIRS=\ + corelib \ collections \ exceptionsafety \ q_func_info \ - qanimationgroup \ qatomicint \ qatomicpointer \ qbitarray \ @@ -62,7 +58,6 @@ SUBDIRS=\ qscopedpointer \ qscopedvaluerollback \ qsemaphore \ - qsequentialanimationgroup \ qset \ qsharedpointer \ qsignalspy \ diff --git a/tests/auto/corelib/animation/animation.pro b/tests/auto/corelib/animation/animation.pro new file mode 100644 index 0000000000..0d852acc60 --- /dev/null +++ b/tests/auto/corelib/animation/animation.pro @@ -0,0 +1,9 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractanimation \ + qanimationgroup \ + qparallelanimationgroup \ + qpauseanimation \ + qpropertyanimation \ + qsequentialanimationgroup \ + qvariantanimation diff --git a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro new file mode 100644 index 0000000000..f518423765 --- /dev/null +++ b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +QT = core +SOURCES += tst_qabstractanimation.cpp \ + + +CONFIG += parallel_test diff --git a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp new file mode 100644 index 0000000000..f9dad9154a --- /dev/null +++ b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp @@ -0,0 +1,171 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite 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 <QtCore/qabstractanimation.h> +#include <QtCore/qanimationgroup.h> +#include <QtTest> + +class tst_QAbstractAnimation : public QObject +{ + Q_OBJECT +public: + tst_QAbstractAnimation() {}; + virtual ~tst_QAbstractAnimation() {}; + +public Q_SLOTS: + void init(); + void cleanup(); + +private slots: + void construction(); + void destruction(); + void currentLoop(); + void currentLoopTime(); + void currentTime(); + void direction(); + void group(); + void loopCount(); + void state(); + void totalDuration(); +}; + +class TestableQAbstractAnimation : public QAbstractAnimation +{ + Q_OBJECT + +public: + virtual ~TestableQAbstractAnimation() {}; + + int duration() const { return 10; } + virtual void updateCurrentTime(int) {} +}; + +class DummyQAnimationGroup : public QAnimationGroup +{ + Q_OBJECT +public: + int duration() const { return 10; } + virtual void updateCurrentTime(int) {} +}; + +void tst_QAbstractAnimation::init() +{ +} + +void tst_QAbstractAnimation::cleanup() +{ +} + +void tst_QAbstractAnimation::construction() +{ + TestableQAbstractAnimation anim; +} + +void tst_QAbstractAnimation::destruction() +{ + TestableQAbstractAnimation *anim = new TestableQAbstractAnimation; + delete anim; +} + +void tst_QAbstractAnimation::currentLoop() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.currentLoop(), 0); +} + +void tst_QAbstractAnimation::currentLoopTime() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.currentLoopTime(), 0); +} + +void tst_QAbstractAnimation::currentTime() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.currentTime(), 0); + anim.setCurrentTime(10); + QCOMPARE(anim.currentTime(), 10); +} + +void tst_QAbstractAnimation::direction() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.direction(), QAbstractAnimation::Forward); + anim.setDirection(QAbstractAnimation::Backward); + QCOMPARE(anim.direction(), QAbstractAnimation::Backward); + anim.setDirection(QAbstractAnimation::Forward); + QCOMPARE(anim.direction(), QAbstractAnimation::Forward); +} + +void tst_QAbstractAnimation::group() +{ + TestableQAbstractAnimation *anim = new TestableQAbstractAnimation; + DummyQAnimationGroup group; + group.addAnimation(anim); + QCOMPARE(anim->group(), &group); +} + +void tst_QAbstractAnimation::loopCount() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.loopCount(), 1); + anim.setLoopCount(10); + QCOMPARE(anim.loopCount(), 10); +} + +void tst_QAbstractAnimation::state() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.state(), QAbstractAnimation::Stopped); +} + +void tst_QAbstractAnimation::totalDuration() +{ + TestableQAbstractAnimation anim; + QCOMPARE(anim.duration(), 10); + anim.setLoopCount(5); + QCOMPARE(anim.totalDuration(), 50); +} + +QTEST_MAIN(tst_QAbstractAnimation) + +#include "tst_qabstractanimation.moc" diff --git a/tests/auto/qanimationgroup/qanimationgroup.pro b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro index 5e1be0cb10..5e1be0cb10 100644 --- a/tests/auto/qanimationgroup/qanimationgroup.pro +++ b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro diff --git a/tests/auto/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index 26e2f2f4d8..26e2f2f4d8 100644 --- a/tests/auto/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp diff --git a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro index f2cacd3452..f2cacd3452 100644 --- a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro +++ b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro diff --git a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index d1d2860369..d1d2860369 100644 --- a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp diff --git a/tests/auto/qpauseanimation/qpauseanimation.pro b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro index 7f612b69fe..7f612b69fe 100644 --- a/tests/auto/qpauseanimation/qpauseanimation.pro +++ b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro diff --git a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp index ea99e19fb3..ea99e19fb3 100644 --- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro index 4dfd558610..4dfd558610 100644 --- a/tests/auto/qpropertyanimation/qpropertyanimation.pro +++ b/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index e344c982c8..e5feab4aa6 100644 --- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include "../../shared/util.h" +#include "../../../../shared/util.h" #include <QtCore/qpropertyanimation.h> #include <QtCore/qvariantanimation.h> #include <QtWidgets/qwidget.h> -#include "../../shared/util.h" +#include "../../../../shared/util.h" //TESTED_CLASS=QPropertyAnimation //TESTED_FILES= diff --git a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro index c0c10c054d..c0c10c054d 100644 --- a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index eaebe3e14e..00c038b948 100644 --- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include "../../shared/util.h" +#include "../../../../shared/util.h" #include <QtCore/qanimationgroup.h> #include <QtCore/qsequentialanimationgroup.h> diff --git a/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro new file mode 100644 index 0000000000..6c463051e8 --- /dev/null +++ b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +QT = core +SOURCES += tst_qvariantanimation.cpp \ + + +CONFIG += parallel_test diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp new file mode 100644 index 0000000000..7dcfd1d4f5 --- /dev/null +++ b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp @@ -0,0 +1,164 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite 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 <QtCore/qvariantanimation.h> +#include <QtTest> + +class tst_QVariantAnimation : public QObject +{ + Q_OBJECT + +public: + tst_QVariantAnimation() {} + virtual ~tst_QVariantAnimation() {} + +public slots: + void init(); + void cleanup(); + +private slots: + void construction(); + void destruction(); + void currentValue(); + void easingCurve(); + void startValue(); + void endValue(); + void keyValueAt(); + void keyValues(); + void duration(); +}; + +class TestableQVariantAnimation : public QVariantAnimation +{ + Q_OBJECT +public: + void updateCurrentValue(const QVariant&) {} +}; + +void tst_QVariantAnimation::init() +{ +} + +void tst_QVariantAnimation::cleanup() +{ +} + +void tst_QVariantAnimation::construction() +{ + TestableQVariantAnimation anim; +} + +void tst_QVariantAnimation::destruction() +{ + TestableQVariantAnimation *anim = new TestableQVariantAnimation; + delete anim; +} + +void tst_QVariantAnimation::currentValue() +{ + TestableQVariantAnimation anim; + QVERIFY(!anim.currentValue().isValid()); +} + +void tst_QVariantAnimation::easingCurve() +{ + TestableQVariantAnimation anim; + QVERIFY(anim.easingCurve() == QEasingCurve::Linear); + anim.setEasingCurve(QEasingCurve::InQuad); + QVERIFY(anim.easingCurve() == QEasingCurve::InQuad); +} + +void tst_QVariantAnimation::endValue() +{ + TestableQVariantAnimation anim; + anim.setEndValue(QVariant(1)); + QCOMPARE(anim.endValue().toInt(), 1); +} + +void tst_QVariantAnimation::startValue() +{ + TestableQVariantAnimation anim; + anim.setStartValue(QVariant(1)); + QCOMPARE(anim.startValue().toInt(), 1); + anim.setStartValue(QVariant(-1)); + QCOMPARE(anim.startValue().toInt(), -1); +} + +void tst_QVariantAnimation::keyValueAt() +{ + TestableQVariantAnimation anim; + + int i=0; + for (qreal r=0.0; r<1.0; r+=0.1) { + anim.setKeyValueAt(0.1, ++i); + QCOMPARE(anim.keyValueAt(0.1).toInt(), i); + } +} + +void tst_QVariantAnimation::keyValues() +{ + TestableQVariantAnimation anim; + + QVariantAnimation::KeyValues values; + int i=0; + for (qreal r=0.0; r<1.0; r+=0.1) { + values.append(QVariantAnimation::KeyValue(r, i)); + } + + anim.setKeyValues(values); + QCOMPARE(anim.keyValues(), values); +} + +void tst_QVariantAnimation::duration() +{ + TestableQVariantAnimation anim; + QCOMPARE(anim.duration(), 250); + anim.setDuration(500); + QCOMPARE(anim.duration(), 500); + QTest::ignoreMessage(QtWarningMsg, "QVariantAnimation::setDuration: cannot set a negative duration"); + anim.setDuration(-1); + QCOMPARE(anim.duration(), 500); +} + +QTEST_MAIN(tst_QVariantAnimation) + +#include "tst_qvariantanimation.moc" diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro new file mode 100644 index 0000000000..d9da997122 --- /dev/null +++ b/tests/auto/corelib/corelib.pro @@ -0,0 +1,3 @@ +TEMPLATE=subdirs +SUBDIRS=\ + animation diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index cf7db60c6d..e8042848d7 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -119,9 +119,7 @@ SUBDIRS=\ qpainterpath \ qpainterpathstroker \ qpalette \ - qparallelanimationgroup \ qpathclipper \ - qpauseanimation \ qpen \ qpicture \ qpixmapcache \ @@ -133,7 +131,6 @@ SUBDIRS=\ qprocess \ qprogressbar \ qprogressdialog \ - qpropertyanimation \ qpushbutton \ qquaternion \ qradiobutton \ |