diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-11-07 15:33:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 13:26:41 +0100 |
commit | e8f7fccf227a4b3c9fe533cd94e1ffec0107a208 (patch) | |
tree | d6e3583b75c0099b44ebe9cc9470ebe76b082665 /tests/auto/corelib/animation | |
parent | 9ceb3b4f6f67cbfe3fb94402bb0f061f77b6da85 (diff) |
Cleanup corelib autotests
Remove redundant empty constructors, destructors and test functions.
Change-Id: Idb51368895e67ec3fc0345a9a5d33d77730c051b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/animation')
7 files changed, 8 insertions, 121 deletions
diff --git a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp index f9dad9154a..8fd5237606 100644 --- a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp +++ b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp @@ -47,14 +47,6 @@ 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(); @@ -87,14 +79,6 @@ public: virtual void updateCurrentTime(int) {} }; -void tst_QAbstractAnimation::init() -{ -} - -void tst_QAbstractAnimation::cleanup() -{ -} - void tst_QAbstractAnimation::construction() { TestableQAbstractAnimation anim; diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index 26e2f2f4d8..b92794ee78 100644 --- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -52,43 +52,25 @@ Q_DECLARE_METATYPE(QAbstractAnimation::State) class tst_QAnimationGroup : public QObject { - Q_OBJECT -public: - tst_QAnimationGroup(); - virtual ~tst_QAnimationGroup(); - + Q_OBJECT public Q_SLOTS: void init(); - void cleanup(); private slots: void construction(); void emptyGroup(); void setCurrentTime(); - void statesAndSignals(); void setParentAutoAdd(); void beginNestedGroup(); void addChildTwice(); void loopWithoutStartValue(); }; -tst_QAnimationGroup::tst_QAnimationGroup() -{ -} - -tst_QAnimationGroup::~tst_QAnimationGroup() -{ -} - void tst_QAnimationGroup::init() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); } -void tst_QAnimationGroup::cleanup() -{ -} - void tst_QAnimationGroup::construction() { QSequentialAnimationGroup animationgroup; @@ -310,10 +292,6 @@ void tst_QAnimationGroup::setCurrentTime() QCOMPARE(sequence->currentAnimation(), a2_s_o1); } -void tst_QAnimationGroup::statesAndSignals() -{ -} - void tst_QAnimationGroup::setParentAutoAdd() { QParallelAnimationGroup group; diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index 432da51ab3..fe07094af5 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp @@ -50,11 +50,7 @@ Q_DECLARE_METATYPE(QAbstractAnimation::State) class tst_QParallelAnimationGroup : public QObject { - Q_OBJECT -public: - tst_QParallelAnimationGroup(); - virtual ~tst_QParallelAnimationGroup(); - + Q_OBJECT public Q_SLOTS: void initTestCase(); @@ -79,14 +75,6 @@ private slots: void QTBUG8910_crashWhenRemovingUncontrolledAnimation(); }; -tst_QParallelAnimationGroup::tst_QParallelAnimationGroup() -{ -} - -tst_QParallelAnimationGroup::~tst_QParallelAnimationGroup() -{ -} - void tst_QParallelAnimationGroup::initTestCase() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp index ea99e19fb3..ee245cf91b 100644 --- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp @@ -88,10 +88,6 @@ public: class tst_QPauseAnimation : public QObject { Q_OBJECT -public: - tst_QPauseAnimation(); - virtual ~tst_QPauseAnimation(); - public Q_SLOTS: void initTestCase(); @@ -108,14 +104,6 @@ private slots: void zeroDuration(); }; -tst_QPauseAnimation::tst_QPauseAnimation() -{ -} - -tst_QPauseAnimation::~tst_QPauseAnimation() -{ -} - void tst_QPauseAnimation::initTestCase() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 309f77c7ce..1ac4063f67 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -90,14 +90,9 @@ public: class tst_QPropertyAnimation : public QObject { - Q_OBJECT -public: - tst_QPropertyAnimation(); - virtual ~tst_QPropertyAnimation(); - + Q_OBJECT public Q_SLOTS: - void init(); - void cleanup(); + void initTestCase(); private slots: void construction(); @@ -133,24 +128,12 @@ private slots: void zeroLoopCount(); }; -tst_QPropertyAnimation::tst_QPropertyAnimation() -{ -} - -tst_QPropertyAnimation::~tst_QPropertyAnimation() -{ -} - -void tst_QPropertyAnimation::init() +void tst_QPropertyAnimation::initTestCase() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); qRegisterMetaType<QAbstractAnimation::DeletionPolicy>("QAbstractAnimation::DeletionPolicy"); } -void tst_QPropertyAnimation::cleanup() -{ -} - class AnimationObject : public QObject { Q_OBJECT diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 42438a6827..44f0f12b74 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -51,14 +51,9 @@ Q_DECLARE_METATYPE(QAbstractAnimation*) class tst_QSequentialAnimationGroup : public QObject { - Q_OBJECT -public: - tst_QSequentialAnimationGroup(); - virtual ~tst_QSequentialAnimationGroup(); - + Q_OBJECT public Q_SLOTS: - void init(); - void cleanup(); + void initTestCase(); private slots: void construction(); @@ -89,24 +84,12 @@ private slots: void pauseResume(); }; -tst_QSequentialAnimationGroup::tst_QSequentialAnimationGroup() -{ -} - -tst_QSequentialAnimationGroup::~tst_QSequentialAnimationGroup() -{ -} - -void tst_QSequentialAnimationGroup::init() +void tst_QSequentialAnimationGroup::initTestCase() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); qRegisterMetaType<QAbstractAnimation*>("QAbstractAnimation*"); } -void tst_QSequentialAnimationGroup::cleanup() -{ -} - void tst_QSequentialAnimationGroup::construction() { QSequentialAnimationGroup animationgroup; diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp index 7dcfd1d4f5..bb6d32ee41 100644 --- a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp +++ b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp @@ -46,15 +46,6 @@ 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(); @@ -74,14 +65,6 @@ public: void updateCurrentValue(const QVariant&) {} }; -void tst_QVariantAnimation::init() -{ -} - -void tst_QVariantAnimation::cleanup() -{ -} - void tst_QVariantAnimation::construction() { TestableQVariantAnimation anim; |