summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-01 12:14:24 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-02 00:53:26 +0100
commit5b744aefa34543f2dc8ddf4ecf9a75406868f3cd (patch)
treefb3e3bfd9c84d81a4efda263a10c3a7a66eab35e /tests/auto
parent2c665596ae831bd7ac76b88ef23c54d7cb15950f (diff)
Remove obsolete code from qdbuspendingcall test
The tested functionality hasn't been in the public API since 2008. Change-Id: I2898da3730fa6248eea2e19779b33ccc793b7a31 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
index c0bfd606d2..ce879273eb 100644
--- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
+++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
@@ -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();