From 5b744aefa34543f2dc8ddf4ecf9a75406868f3cd Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 1 Nov 2011 12:14:24 +1000 Subject: 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 --- .../dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp | 33 ---------------------- 1 file changed, 33 deletions(-) (limited to 'tests/auto/dbus') 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(); -- cgit v1.2.3