From 8f02339e76b9b21df028e29735475313760f82c6 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 18 Oct 2011 12:50:36 +1000
Subject: Remove DEPENDS_ON from qtestlib API.

The DEPENDS_ON macro didn't do anything and has misled many users to
think that they can write test functions that depend on other test
functions.

Task-number: QTBUG-21851
Change-Id: Ibe65b2d5d88bb81b6a0ebbe0b220f7d409a1446c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/qpushbutton/tst_qpushbutton.cpp | 40 ++----------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

(limited to 'tests/auto/qpushbutton')

diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp
index fffe1c26e4..e5083553e2 100644
--- a/tests/auto/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp
@@ -74,23 +74,17 @@ public slots:
     void cleanup();
 private slots:
     void getSetCheck();
-    void setAutoRepeat();
+    void autoRepeat();
     void pressed();
-    void released();
-    void text();
-    void accel();
     void setAccel();
     void isCheckable();
-    void isDown();
     void setDown();
     void popupCrash();
     void isChecked();
-    void autoRepeat();
     void animateClick();
     void toggle();
     void clicked();
     void toggled();
-    void isEnabled();
     void defaultAndAutoDefault();
     void sizeHint_data();
     void sizeHint();
@@ -204,7 +198,7 @@ void tst_QPushButton::onReleased()
     release_count++;
 }
 
-void tst_QPushButton::setAutoRepeat()
+void tst_QPushButton::autoRepeat()
 {
     // If this changes, this test must be completely revised.
     QVERIFY( !testWidget->isCheckable() );
@@ -283,11 +277,6 @@ void tst_QPushButton::setAutoRepeat()
     QVERIFY( click_count == 0 );
 }
 
-void tst_QPushButton::autoRepeat()
-{
-    DEPENDS_ON(" setAutoRepeat" );
-}
-
 void tst_QPushButton::pressed()
 {
     QTest::keyPress( testWidget, ' ' );
@@ -314,31 +303,11 @@ void tst_QPushButton::pressed()
 
 }
 
-void tst_QPushButton::released()
-{
-    DEPENDS_ON( "pressed" );
-}
-
-void tst_QPushButton::text()
-{
-    DEPENDS_ON( "setText" );
-}
-
-void tst_QPushButton::isEnabled()
-{
-    DEPENDS_ON( "setEnabled" );
-}
-
 void tst_QPushButton::isCheckable()
 {
     QVERIFY( !testWidget->isCheckable() );
 }
 
-void tst_QPushButton::isDown()
-{
-    DEPENDS_ON( "setDown" );
-}
-
 void tst_QPushButton::setDown()
 {
     testWidget->setDown( FALSE );
@@ -395,11 +364,6 @@ void tst_QPushButton::toggled()
     QVERIFY( click_count == 1 );
 }
 
-void tst_QPushButton::accel()
-{
-    DEPENDS_ON( "setAccel" );
-}
-
 /*
     If we press an accelerator key we ONLY get a pressed signal and
     NOT a released or clicked signal.
-- 
cgit v1.2.3