From bba640d9c189be19d66c6294873b6ab8ffa4efc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 20 Oct 2016 12:22:05 +0200 Subject: ActionGroupTest: split tests depending on they need the helper script or not And cleanup units --- tests/client/actiongrouptest.cpp | 101 +++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 47 deletions(-) (limited to 'tests/client/actiongrouptest.cpp') diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index d187ea7..cc43245 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -27,26 +27,15 @@ #include #include -class ActionGroupTest : public QObject +class ActionGroupTestBase : public QObject { Q_OBJECT -private: - DBusMenuScript m_script; +protected: QDBusMenuModel m_model; QDBusActionGroup m_actionGroup; -private Q_SLOTS: - void initTestCase() - { - QVERIFY(m_script.connect()); - } - - void cleanupTestCase() - { - m_script.quit(); - } - - void init() +protected Q_SLOTS: + virtual void init() { m_model.stop(); m_model.setBusType(DBusEnums::SessionBus); @@ -59,11 +48,6 @@ private Q_SLOTS: m_actionGroup.setObjectPath(MENU_OBJECT_PATH); } - void cleanup() - { - m_script.unpublishMenu(); - } - /* * Test if the propety busType handle correct integer values */ @@ -88,27 +72,57 @@ private Q_SLOTS: */ void testServiceAppear() { - m_model.start(); - m_actionGroup.start(); QCOMPARE(m_actionGroup.status(), DBusEnums::Connecting); // Make menu available + DBusMenuScript m_script; + m_script.connect(); m_script.publishMenu(); QCOMPARE(m_actionGroup.status(), DBusEnums::Connected); } +}; - /* - * Test if QDBusActionGroup change to correct state after DBus - * service disappear - */ - void testServiceDisappear() +class ActionGroupTestWithScript : public ActionGroupTestBase +{ + Q_OBJECT +private: + DBusMenuScript m_script; + +private Q_SLOTS: + void initTestCase() + { + QVERIFY(m_script.connect()); + } + + void cleanupTestCase() { + m_script.quit(); + } + + void init() + { + ActionGroupTestBase::init(); + + // start model m_model.start(); m_actionGroup.start(); // Make menu available m_script.publishMenu(); + } + + void cleanup() + { + m_script.unpublishMenu(); + } + + /* + * Test if QDBusActionGroup change to correct state after DBus + * service disappear + */ + void testServiceDisappear() + { QCOMPARE(m_actionGroup.status(), DBusEnums::Connected); // Append menus @@ -127,12 +141,7 @@ private Q_SLOTS: */ void testActiveAction() { - // start model - m_model.start(); - m_actionGroup.start(); - - // Make menu available - m_script.publishMenu(); + // Append 2 menus m_script.walk(2); // Get Action @@ -158,12 +167,7 @@ private Q_SLOTS: */ void testRemoveAction() { - // start model - m_model.start(); - m_actionGroup.start(); - - // Make menu available and append 2 menus - m_script.publishMenu(); + // Append 2 menus m_script.walk(2); // Get Action @@ -183,13 +187,6 @@ private Q_SLOTS: */ void testActionIsValid() { - // start model - m_model.start(); - m_actionGroup.start(); - - // Make menu available and append 2 menus - m_script.publishMenu(); - // Get invalid Action QStateAction *act = m_actionGroup.action(QString("Menu1Act")); QVERIFY(act); @@ -204,6 +201,16 @@ private Q_SLOTS: } }; -QTEST_MAIN(ActionGroupTest) +int main(int argc, char *argv[]) +{ + ActionGroupTestBase baseTests; + ActionGroupTestWithScript scriptTests; + + QApplication a(argc, argv); + int baseTestsResults = QTest::qExec(&baseTests); + int scriptTestsResults = QTest::qExec(&scriptTests); + + return std::max(baseTestsResults, scriptTestsResults); +} #include "actiongrouptest.moc" -- cgit v1.2.3 From 6d2a0aac08c8536d735d4d7407cfe28b8c053149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 20 Oct 2016 16:06:30 +0200 Subject: ActionGroupTest: add test for activateByVariantString --- tests/client/actiongrouptest.cpp | 128 ++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 63 deletions(-) (limited to 'tests/client/actiongrouptest.cpp') diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index cc43245..3ab329c 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -27,15 +27,28 @@ #include #include -class ActionGroupTestBase : public QObject +class ActionGroupTest : public QObject { Q_OBJECT -protected: +private: QDBusMenuModel m_model; QDBusActionGroup m_actionGroup; + DBusMenuScript m_script; + + void getMenuAction(QStateAction **act, int index) + { + // Append 2 menus + m_script.walk(2); -protected Q_SLOTS: - virtual void init() + // Get Action + QVariant action = m_model.data(m_model.index(index, 0), QMenuModel::Action); + QVERIFY(action.isValid()); + *act = m_actionGroup.action(action.toString()); + QVERIFY(act); + } + +private Q_SLOTS: + void init() { m_model.stop(); m_model.setBusType(DBusEnums::SessionBus); @@ -46,6 +59,28 @@ protected Q_SLOTS: m_actionGroup.setBusType(DBusEnums::SessionBus); m_actionGroup.setBusName(MENU_SERVICE_NAME); m_actionGroup.setObjectPath(MENU_OBJECT_PATH); + + // start model + m_model.start(); + m_actionGroup.start(); + + // Make menu available + m_script.publishMenu(); + } + + void initTestCase() + { + QVERIFY(m_script.connect()); + } + + void cleanupTestCase() + { + m_script.quit(); + } + + void cleanup() + { + m_script.unpublishMenu(); } /* @@ -72,50 +107,15 @@ protected Q_SLOTS: */ void testServiceAppear() { + m_script.unpublishMenu(); QCOMPARE(m_actionGroup.status(), DBusEnums::Connecting); // Make menu available - DBusMenuScript m_script; m_script.connect(); m_script.publishMenu(); QCOMPARE(m_actionGroup.status(), DBusEnums::Connected); } -}; - -class ActionGroupTestWithScript : public ActionGroupTestBase -{ - Q_OBJECT -private: - DBusMenuScript m_script; - -private Q_SLOTS: - void initTestCase() - { - QVERIFY(m_script.connect()); - } - - void cleanupTestCase() - { - m_script.quit(); - } - - void init() - { - ActionGroupTestBase::init(); - - // start model - m_model.start(); - m_actionGroup.start(); - - // Make menu available - m_script.publishMenu(); - } - - void cleanup() - { - m_script.unpublishMenu(); - } /* * Test if QDBusActionGroup change to correct state after DBus @@ -136,30 +136,42 @@ private Q_SLOTS: QCOMPARE(m_actionGroup.status(), DBusEnums::Disconnected); } + void testActionName() + { + QStateAction *act; + getMenuAction(&act, 1); + QCOMPARE(act->property("name").toString(), QString("Menu1Act")); + } + /* * Test if Action::trigger active the action over DBus */ - void testActiveAction() + void testStringActionActivation() { - // Append 2 menus - m_script.walk(2); + QStateAction *act; + getMenuAction(&act, 1); + act->activate(QVariant("42")); - // Get Action - QVariant action = m_model.data(m_model.index(1, 0), QMenuModel::Action); - QVERIFY(action.isValid()); - QStateAction *act = m_actionGroup.action(action.toString()); - QVERIFY(act); + // wait for dbus propagation + QTest::qWait(500); - // test action name - QCOMPARE(act->property("name").toString(), QString("Menu1Act")); + QPair result = m_script.popActivatedAction(); + QCOMPARE(result.first, QString("Menu1Act")); + QCOMPARE(result.second.toString(), QString("42")); + } + + void testStringActionActivationByVariantString() + { + QStateAction *act; + getMenuAction(&act, 1); + act->activateByVariantString("\"53\""); - act->activate(QVariant("42")); // wait for dbus propagation QTest::qWait(500); QPair result = m_script.popActivatedAction(); QCOMPARE(result.first, QString("Menu1Act")); - QCOMPARE(result.second.toString(), QString("42")); + QCOMPARE(result.second.toString(), QString("53")); } /* @@ -201,16 +213,6 @@ private Q_SLOTS: } }; -int main(int argc, char *argv[]) -{ - ActionGroupTestBase baseTests; - ActionGroupTestWithScript scriptTests; - - QApplication a(argc, argv); - int baseTestsResults = QTest::qExec(&baseTests); - int scriptTestsResults = QTest::qExec(&scriptTests); - - return std::max(baseTestsResults, scriptTestsResults); -} +QTEST_MAIN(ActionGroupTest); #include "actiongrouptest.moc" -- cgit v1.2.3 From 3d2c260f804273e5a65f27a379f4ad74407ee921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 22 Oct 2016 19:00:49 +0200 Subject: remove deprecated g_type_init() calls --- tests/client/actiongrouptest.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/client/actiongrouptest.cpp') diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 3ab329c..425f97c 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -43,6 +43,7 @@ private: // Get Action QVariant action = m_model.data(m_model.index(index, 0), QMenuModel::Action); QVERIFY(action.isValid()); + printf("aCTION IS %s\n",action.toString().toUtf8().data()); *act = m_actionGroup.action(action.toString()); QVERIFY(act); } -- cgit v1.2.3 From 7f78a2c234dd017b19de1a43c0fac12a15326be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 24 Oct 2016 20:46:51 +0200 Subject: converterTest: QVERIFY comparison return value --- tests/client/actiongrouptest.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/client/actiongrouptest.cpp') diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 425f97c..3ab329c 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -43,7 +43,6 @@ private: // Get Action QVariant action = m_model.data(m_model.index(index, 0), QMenuModel::Action); QVERIFY(action.isValid()); - printf("aCTION IS %s\n",action.toString().toUtf8().data()); *act = m_actionGroup.action(action.toString()); QVERIFY(act); } -- cgit v1.2.3