diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-03-22 12:22:54 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-03-22 12:25:56 -0300 |
| commit | a439c6ea1ca03736934dbe88a6dd64938257338c (patch) | |
| tree | 8b84eeef0fab9b707cb7a94073af0e842b9823c1 | |
| parent | 283b8b1d574c265b6789aaf867ebaf9b4b1004d1 (diff) | |
chan-group test: Fix bug where test was failing with tp-glib >= 0.16.2.
| -rw-r--r-- | tests/dbus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/dbus/chan-group.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt index 6236955e..9f295aca 100644 --- a/tests/dbus/CMakeLists.txt +++ b/tests/dbus/CMakeLists.txt @@ -40,6 +40,7 @@ if(ENABLE_TP_GLIB_TESTS) tpqt_add_dbus_unit_test(CaptchaAuthentication captcha-authentication tp-glib-tests tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(ChannelBasics chan-basics tp-glib-tests tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(ChannelConference chan-conference tp-glib-tests future-example-cm-conference tp-qt-tests-glib-helpers) + tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(ConnectionManagerBasics cm-basics tp-glib-tests) tpqt_add_dbus_unit_test(ConnectionAddressing conn-addressing tp-glib-tests future-example-conn-addressing tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(ConnectionBasics conn-basics tp-glib-tests) @@ -68,7 +69,6 @@ if(ENABLE_TP_GLIB_TESTS) tpqt_add_dbus_unit_test(StreamedMediaChannel streamed-media-chan tp-glib-tests tp-qt-tests-glib-helpers) if (ENABLE_TESTS_WITH_RACES_IN_QT_4_6) - tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers) tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt-tests-glib-helpers) if(ENABLE_TP_GLIB_GIO_TESTS) diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp index fc8dfad2..b516a1ae 100644 --- a/tests/dbus/chan-group.cpp +++ b/tests/dbus/chan-group.cpp @@ -186,8 +186,8 @@ void TestChanGroup::testCreateChannel() Q_FOREACH (ContactPtr contact, mChan->groupContacts()) mInitialMembers.push_back(contact->handle()[0]); - QCOMPARE(mChan->groupFlags(), ChannelGroupFlagCanAdd | - ChannelGroupFlagCanRemove | ChannelGroupFlagProperties); + QCOMPARE(mChan->groupFlags(), ChannelGroupFlagCanAdd | ChannelGroupFlagCanRemove | + ChannelGroupFlagProperties | ChannelGroupFlagMembersChangedDetailed); QCOMPARE(mChan->groupCanAddContacts(), true); QCOMPARE(mChan->groupCanAddContactsWithMessage(), false); |