diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 15:10:42 +0000 |
---|---|---|
committer | Tarmac <> | 2012-11-23 15:10:42 +0000 |
commit | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (patch) | |
tree | ce1737ac7431963279409530ca9f6fec7f812eae /tests/client/actiongrouptest.cpp | |
parent | de8eea63b919b81132895dfe04ed676778c53f6f (diff) | |
parent | 5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 (diff) | |
download | qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.gz qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.bz2 qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.zip |
Removed QAction dependency from QStateAction.
Exported activate function on QStateAction.
Approved by Ugo Riboni, PS Jenkins bot.
Diffstat (limited to 'tests/client/actiongrouptest.cpp')
-rw-r--r-- | tests/client/actiongrouptest.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 6598d2e..d187ea7 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -141,11 +141,16 @@ private Q_SLOTS: QStateAction *act = m_actionGroup.action(action.toString()); QVERIFY(act); - act->trigger(); + // test action name + QCOMPARE(act->property("name").toString(), QString("Menu1Act")); + + act->activate(QVariant("42")); // wait for dbus propagation QTest::qWait(500); - QCOMPARE(m_script.popActivatedAction(), QString("Menu1Act")); + QPair<QString, QVariant> result = m_script.popActivatedAction(); + QCOMPARE(result.first, QString("Menu1Act")); + QCOMPARE(result.second.toString(), QString("42")); } /* |