Remove obsolete code from qdbuspendingcall test
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 1 Nov 2011 02:14:24 +0000 (12:14 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 1 Nov 2011 23:53:26 +0000 (00:53 +0100)
The tested functionality hasn't been in the public API since 2008.

Change-Id: I2898da3730fa6248eea2e19779b33ccc793b7a31
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp

index c0bfd60..ce87927 100644 (file)
@@ -86,7 +86,6 @@ private Q_SLOTS:
     void initTestCase();
     void waitForFinished();
     void waitForFinished_error();
-//    void setReplyCallback();
     void watcher();
     void watcher_error();
     void watcher_waitForFinished();
@@ -260,38 +259,6 @@ void tst_QDBusPendingCall::callWithCallback_localLoop_errorReply()
     QVERIFY(callbackArgument.isEmpty());
 }
 
-#if 0
-// This function was removed from the public API
-void tst_QDBusPendingCall::setReplyCallback()
-{
-    QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage);
-
-    callCount = 0;
-    callbackArgument.clear();
-    QVERIFY(ac.setReplyCallback(this, SLOT(callback(const QStringList &))));
-    QVERIFY(callCount == 0);
-    QVERIFY(callbackArgument.isEmpty());
-
-    QTestEventLoop::instance().enterLoop(2);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QVERIFY(ac.isFinished());
-    QVERIFY(!ac.isError());
-
-    QCOMPARE(callCount, 1);
-    QCOMPARE(slotCalled, (int)CallbackCalled);
-    QVERIFY(!callbackArgument.isEmpty());
-    QVERIFY(callbackArgument.contains(conn.baseService()));
-
-    const QVariantList args = ac.reply().arguments();
-    QVERIFY(!args.isEmpty());
-    QCOMPARE(args.at(0).toStringList(), callbackArgument);
-}
-#endif
-
 void tst_QDBusPendingCall::watcher()
 {
     QDBusPendingCall ac = sendMessage();