diff options
Diffstat (limited to 'tests/client/modeltest.cpp')
| -rw-r--r-- | tests/client/modeltest.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index ee3e0f4..9f6ee76 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -46,7 +46,7 @@ private Q_SLOTS: void init() { m_model.stop(); - m_model.setBusType(QDBusObject::SessionBus); + m_model.setBusType(DBusEnums::SessionBus); m_model.setBusName(MENU_SERVICE_NAME); m_model.setObjectPath(MENU_OBJECT_PATH); } @@ -57,14 +57,6 @@ private Q_SLOTS: } /* - * Test if columnCount is always 1 - */ - void testColumnCount() - { - QCOMPARE(m_model.columnCount(), 1); - } - - /* * Test if parent function always return a empty QModelIndex */ void testParent() @@ -78,16 +70,16 @@ private Q_SLOTS: void testBusTypeProperty() { m_model.setProperty("busType", 1); - QCOMPARE(m_model.busType(), QDBusObject::SessionBus); + QCOMPARE(m_model.busType(), DBusEnums::SessionBus); m_model.setProperty("busType", 2); - QCOMPARE(m_model.busType(), QDBusObject::SystemBus); + QCOMPARE(m_model.busType(), DBusEnums::SystemBus); m_model.setProperty("busType", 0); - QCOMPARE(m_model.busType(), QDBusObject::SystemBus); + QCOMPARE(m_model.busType(), DBusEnums::SystemBus); m_model.setProperty("busType", 10); - QCOMPARE(m_model.busType(), QDBusObject::SystemBus); + QCOMPARE(m_model.busType(), DBusEnums::SystemBus); } @@ -106,7 +98,7 @@ private Q_SLOTS: // Wait for dbus sync QTest::qWait(500); - QCOMPARE(m_model.status(), QDBusObject::Connected); + QCOMPARE(m_model.status(), DBusEnums::Connected); QCOMPARE(m_model.rowCount(), 4); // Label (String) @@ -154,7 +146,7 @@ private Q_SLOTS: // Wait for dbus sync QTest::qWait(500); - QCOMPARE(m_model.status(), QDBusObject::Connected); + QCOMPARE(m_model.status(), DBusEnums::Connected); QCOMPARE(m_model.rowCount(), 4); QVariant e = m_model.data(m_model.index(0, 0), QMenuModel::Extra); @@ -193,12 +185,12 @@ private Q_SLOTS: // Int64 v = extra["int64"]; - QCOMPARE(v.typeName(), "long"); + QCOMPARE(v.type(), QVariant::LongLong); QCOMPARE(v.value<long>(), (long) -42); // UInt64 v = extra["uint64"]; - QCOMPARE(v.typeName(), "ulong"); + QCOMPARE(v.type(), QVariant::ULongLong); QCOMPARE(v.value<ulong>(), (ulong) 42); // Double |