From 5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Fri, 23 Nov 2012 10:22:04 -0300 Subject: Create unit test for name property and activate function. --- tests/script/dbusmenuscript.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/script/dbusmenuscript.cpp') diff --git a/tests/script/dbusmenuscript.cpp b/tests/script/dbusmenuscript.cpp index b190d5b..8fa46c7 100644 --- a/tests/script/dbusmenuscript.cpp +++ b/tests/script/dbusmenuscript.cpp @@ -92,15 +92,20 @@ void DBusMenuScript::run() } } -QString DBusMenuScript::popActivatedAction() +QPair DBusMenuScript::popActivatedAction() { if (m_script) { QDBusMessage reply = m_script->call("popActivatedAction"); if (reply.arguments().count() > 0) { - return reply.arguments()[0].toString(); + QVariant value; + QString name = reply.arguments()[0].toString(); + if (reply.arguments().count() > 1) { + value = reply.arguments()[1]; + } + return qMakePair(name, value); } } - return QString(); + return qMakePair(QString(), QVariant()); } -- cgit v1.2.3