Merge lp:~aacid/dee-qt/fixsetmodelsharedmodels into lp:dee-qt/0.2

[Albert Astals Cid]

Make setModel work for shared deemodels

Removes the isLocal member, don't need it and was checking for wrong stuff anyway

Make setModel work for shared deemodels

Removes the isLocal member, don't need it and was checking for wrong stuff anyway

[Tiago Salem Herrmann (tiagosh)]

It works fine.
I tested with unity-2d and the home lens is still working correctly.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Albert Astals Cid (aacid)]

Reapproving, just forgot to set the commit message

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/16/console reported an error when processing this lp:~aacid/dee-qt/fixsetmodelsharedmodels branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/17/console reported an error when processing this lp:~aacid/dee-qt/fixsetmodelsharedmodels branch.
Not merging it.

[lp:~aacid/dee-qt/fixsetmodelsharedmodels]

71. By Albert Astals Cid on 2012-11-22

Use dbus-test-runner and make the helper a bit better

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-12 10:53:16 +0000
+++ CMakeLists.txt	2012-11-22 10:38:21 +0000
@@ -40,6 +40,7 @@
     ${QT_INCLUDE_DIR}
     ${QT_QTCORE_INCLUDE_DIR}
     ${QT_QTDECLARATIVE_INCLUDE_DIR}
+    ${QT_QTDBUS_INCLUDE_DIR}
     ${DEE_INCLUDE_DIRS}
     ${QT_QTTEST_INCLUDE_DIR}
     )
@@ -119,5 +120,15 @@
 qt4_generate_moc(conversiontest.cpp conversiontest.moc)
 add_executable(conversiontest conversiontest.cpp conversiontest.moc)
 target_link_libraries(conversiontest ${QT_QTTEST_LIBRARIES} QtDee)
-add_test(NAME conversiontest COMMAND "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-xunitxml" "-o" "conversiontest-xunit.xml")
+add_test(NAME conversiontest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-p" "-xunitxml" "-p" "-o" "-p" "conversiontest-xunit.xml")
 set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+
+qt4_generate_moc(test-helper.cpp test-helper.moc)
+add_executable(test-helper test-helper.cpp test-helper.moc)
+target_link_libraries(test-helper ${QT_QTCORE_LIBRARIES} ${QT_QTDBUS_LIBRARIES} ${DEE_LDFLAGS})
+
+qt4_generate_moc(deelistmodeltest.cpp deelistmodeltest.moc)
+add_executable(deelistmodeltest deelistmodeltest.cpp deelistmodeltest.moc)
+target_link_libraries(deelistmodeltest ${QT_QTTEST_LIBRARIES} ${QT_QTDBUS_LIBRARIES}  QtDee)
+add_test(NAME deelistmodeltest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
+set_property(TEST deelistmodeltest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
 
=== modified file 'conversiontest.cpp'
--- conversiontest.cpp	2012-11-12 09:32:44 +0000
+++ conversiontest.cpp	2012-11-22 10:38:21 +0000
@@ -33,9 +33,13 @@
 
     void GVariantToQVariantConversionTest()
     {
-      DeeModel* model = dee_shared_model_new("com.dee-qt.test");
+      DeeModel* model = dee_shared_model_new("com.deeqt.conversiontest");
       dee_model_set_schema(model, "b", "y", "n", "q", "i", "u", "x", "t", "d", "s", "a(ii)", NULL);
 
+      // Doc says we need to be synchronized before doing anything
+      while(!dee_shared_model_is_synchronized(DEE_SHARED_MODEL(model)))
+        qApp->processEvents();
+
       GVariant **tuples = g_new(GVariant *, 2);
 
       GVariant **t1 = g_new(GVariant *, 2);
 
=== modified file 'debian/control'
--- debian/control	2012-11-12 10:53:16 +0000
+++ debian/control	2012-11-22 10:38:21 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Olivier Tilloy <[e-mail]>
-Build-Depends: cdbs, debhelper (>= 7), cmake, libqt4-dev (>= 4.7), libdee-dev (>= 1.0.0)
+Build-Depends: cdbs, debhelper (>= 7), cmake, libqt4-dev (>= 4.7), libdee-dev (>= 1.0.0), dbus-test-runner
 Standards-Version: 3.9.1
 Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/dee-qt/trunk
 
 
=== modified file 'debian/rules'
--- debian/rules	2010-12-24 02:57:22 +0000
+++ debian/rules	2012-11-22 10:38:21 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_MAKE_CHECK_TARGET = test
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
 
=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2012-11-12 09:32:44 +0000
+++ deelistmodel.cpp	2012-11-22 10:38:21 +0000
@@ -85,6 +85,7 @@
     void connectToDeeModel(DeeModel *model);
     void disconnectFromDeeModel();
     void createRoles();
+    bool synchronized() const;
 
     /* GObject signal handlers for m_deeModel */
     static void onSynchronizedChanged(GObject* emitter, GParamSpec *pspec, DeeListModel* model);
@@ -96,10 +97,9 @@
     DeeModel* m_deeModel;
     QString m_name;
     int m_count;
-    bool m_isLocal;
 };
 
-DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0), m_isLocal(false)
+DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0)
 {
 }
 
@@ -137,7 +137,6 @@
         g_signal_connect(m_deeModel, "row-removed", G_CALLBACK(onRowRemoved), m_parent);
         g_signal_connect(m_deeModel, "row-changed", G_CALLBACK(onRowChanged), m_parent);
     }
-    m_isLocal = false;
 }
 
 void
@@ -149,12 +148,31 @@
     g_signal_connect(m_deeModel, "row-added", G_CALLBACK(onRowAdded), m_parent);
     g_signal_connect(m_deeModel, "row-removed", G_CALLBACK(onRowRemoved), m_parent);
     g_signal_connect(m_deeModel, "row-changed", G_CALLBACK(onRowChanged), m_parent);
-    m_isLocal = true;
-    createRoles();
-    m_count = dee_model_get_n_rows(m_deeModel);
-    m_parent->reset();
-    Q_EMIT m_parent->countChanged();
+    if (synchronized())
+    {
+        createRoles();
+        m_count = dee_model_get_n_rows(m_deeModel);
+        m_parent->reset();
+        Q_EMIT m_parent->countChanged();
+    }
+    else
+    {
+        g_signal_connect(m_deeModel, "notify::synchronized", G_CALLBACK(onSynchronizedChanged), m_parent);
+    }
+}
 
+bool
+DeeListModelPrivate::synchronized() const
+{
+    if (m_deeModel == NULL) {
+        return false;
+    } else {
+        if (DEE_IS_SHARED_MODEL(m_deeModel)) {
+            return dee_shared_model_is_synchronized(DEE_SHARED_MODEL(m_deeModel));
+        } else {
+            return true;
+        }
+    }
 }
 
 void
@@ -296,15 +314,7 @@
 bool
 DeeListModel::synchronized() const
 {
-    if (d->m_deeModel == NULL) {
-        return false;
-    } else {
-        if (d->m_isLocal) {
-            return true;
-        } else {
-            return dee_shared_model_is_synchronized(DEE_SHARED_MODEL(d->m_deeModel));
-        }
-    }
+    return d->synchronized();
 }
 
 int
 
=== added file 'deelistmodeltest.cpp'
--- deelistmodeltest.cpp	1970-01-01 00:00:00 +0000
+++ deelistmodeltest.cpp	2012-11-22 10:38:21 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest>
+#include <QObject>
+#include <QDBusInterface>
+
+#include "deelistmodel.h"
+
+#include <dee.h>
+
+static bool wait_until_test_service_appears()
+{
+    bool have_name = false;
+    bool timeout_reached = false;
+
+    auto timeout_cb = [](gpointer data) -> gboolean
+    {
+        *(bool*)data = true;
+        return FALSE;
+    };
+
+    auto callback = [](GDBusConnection * conn,
+                    const char * name,
+                    const char * name_owner,
+                    gpointer user_data)
+    {
+        *(bool*)user_data = true;
+    };
+
+    g_bus_watch_name(G_BUS_TYPE_SESSION,
+                    "com.deeqt.test.control",
+                    G_BUS_NAME_WATCHER_FLAGS_NONE,
+                    callback,
+                    NULL,
+                    &have_name,
+                    NULL);
+    g_timeout_add(10000, timeout_cb, &timeout_reached);
+
+    while (!have_name && !timeout_reached)
+        g_main_context_iteration(g_main_context_get_thread_default(), TRUE);
+
+    return (have_name && !timeout_reached);
+}
+
+static void tell_service_to_exit()
+{
+    QDBusInterface iface("com.deeqt.test.control", "/control");
+    iface.call("quit");
+}
+
+class DeeListModelTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        g_type_init();
+
+        QVERIFY(wait_until_test_service_appears());
+    }
+
+    void synchronizedTest()
+    {
+        DeeModel* model = dee_shared_model_new("com.deeqt.test.does_not_exist");
+
+        DeeListModel model_qt;
+        QCOMPARE(model_qt.count(), 0);
+
+        model_qt.setModel(model);
+        QCOMPARE(model_qt.synchronized(), (bool)dee_shared_model_is_synchronized(DEE_SHARED_MODEL(model)));
+    }
+
+    void setExistingModelTest()
+    {
+        DeeModel* model = dee_shared_model_new("com.deeqt.test.model");
+
+        DeeListModel model_qt;
+        QCOMPARE(model_qt.count(), 0);
+
+        model_qt.setModel(model);
+        QCOMPARE(model_qt.synchronized(), false);
+
+        while(!model_qt.synchronized())
+            qApp->processEvents();
+
+        QCOMPARE(model_qt.synchronized(), true);
+        QCOMPARE(model_qt.roleNames().count(), 1);
+        QCOMPARE(model_qt.roleNames()[0], QByteArray("column_0"));
+    }
+    
+    void cleanupTestCase()
+    {
+        tell_service_to_exit();
+    }
+
+};
+
+QTEST_MAIN(DeeListModelTest)
+
+#include "deelistmodeltest.moc"
 
=== added file 'test-helper.cpp'
--- test-helper.cpp	1970-01-01 00:00:00 +0000
+++ test-helper.cpp	2012-11-22 10:38:21 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QObject>
+
+#include <dee.h>
+
+#include <QDebug>
+class TestControl : public QObject
+{
+    Q_OBJECT
+public:
+    TestControl()
+    {
+        g_type_init();
+        DeeModel* model = dee_shared_model_new("com.deeqt.test.model");
+        dee_model_set_schema(model, "b", NULL);
+
+        // Doc says we need to be synchronized before doing anything
+        while(!dee_shared_model_is_synchronized(DEE_SHARED_MODEL(model)))
+            qApp->processEvents();
+
+        QDBusConnection::sessionBus().registerService("com.deeqt.test.control");
+        QDBusConnection::sessionBus().registerObject("/control", this, QDBusConnection::ExportAllSlots);
+    }
+
+public Q_SLOTS:
+    void quit()
+    {
+        qApp->quit();
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    TestControl tc;
+
+    return a.exec();
+}
+
+#include "test-helper.moc"