diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-09-14 16:11:28 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-09-14 16:11:28 -0300 |
| commit | ebe349e1d96b28e31c29b3e563da1a65fb176e39 (patch) | |
| tree | be1271f3d09159fa9f1a44b96fc62cff9cb3b72e /tests/client/actiongrouptest.cpp | |
| parent | 2b9cf1654e8eb602f70e14246c3c583962ce7254 (diff) | |
| download | qmenumodel-ebe349e1d96b28e31c29b3e563da1a65fb176e39.tar.gz qmenumodel-ebe349e1d96b28e31c29b3e563da1a65fb176e39.tar.bz2 qmenumodel-ebe349e1d96b28e31c29b3e563da1a65fb176e39.zip | |
Created function to convert from QVariant to GVariant.
Moved QStateAction controler from QACtionGroup.
Diffstat (limited to 'tests/client/actiongrouptest.cpp')
| -rw-r--r-- | tests/client/actiongrouptest.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index fa2dca5..c77c3d5 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -91,13 +91,11 @@ private Q_SLOTS: m_model.start(); m_actionGroup.start(); QCOMPARE(m_actionGroup.status(), QDBusObject::Connecting); - QCOMPARE(m_actionGroup.count(), 0); // Make menu available m_script.publishMenu(); QCOMPARE(m_actionGroup.status(), QDBusObject::Connected); - QCOMPARE(m_actionGroup.count(), 0); } /* @@ -108,7 +106,6 @@ private Q_SLOTS: { m_model.start(); m_actionGroup.start(); - QCOMPARE(m_actionGroup.count(), 0); // Make menu available m_script.publishMenu(); @@ -116,12 +113,10 @@ private Q_SLOTS: // Append menus m_script.walk(2); - QCOMPARE(m_actionGroup.count(), 2); // Remove menu from dbus m_script.unpublishMenu(); QCOMPARE(m_actionGroup.status(), QDBusObject::Connecting); - QCOMPARE(m_actionGroup.count(), 0); m_actionGroup.stop(); QCOMPARE(m_actionGroup.status(), QDBusObject::Disconnected); @@ -165,7 +160,6 @@ private Q_SLOTS: // Make menu available and append 2 menus m_script.publishMenu(); m_script.walk(2); - QCOMPARE(m_actionGroup.count(), 2); // Get Action QStateAction *act = m_actionGroup.action(QString("Menu1Act")); @@ -174,7 +168,6 @@ private Q_SLOTS: // Remove 1 menu m_script.walk(1); - QCOMPARE(m_actionGroup.count(), 2); //Check if action is invalid QVERIFY(!act->isValid()); |