aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-09 15:44:25 -0300
committerRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-09 15:44:25 -0300
commitc07f87e35062e39e9d4b3b978362dbf94dd36fbb (patch)
treecd6a396074acc4049f694610d0519c1558bdc796
parenta03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (diff)
downloadqmenumodel-c07f87e35062e39e9d4b3b978362dbf94dd36fbb.tar.gz
qmenumodel-c07f87e35062e39e9d4b3b978362dbf94dd36fbb.tar.bz2
qmenumodel-c07f87e35062e39e9d4b3b978362dbf94dd36fbb.zip
Fixed crash during model destruction in QML.
-rw-r--r--libqmenumodel/src/qdbusmenumodel.cpp4
-rw-r--r--libqmenumodel/src/qmenumodel.cpp14
-rw-r--r--libqmenumodel/src/qmenumodel.h2
-rw-r--r--tests/client/CMakeLists.txt5
-rw-r--r--tests/client/loadmodel.qml38
-rw-r--r--tests/client/modeltest.cpp22
-rw-r--r--tests/client/qmlfiles.h.in2
-rw-r--r--tests/client/qmltest.cpp91
-rwxr-xr-xtests/client/script_qmltest.py12
9 files changed, 181 insertions, 9 deletions
diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index ae88c35..6d4746c 100644
--- a/libqmenumodel/src/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
@@ -85,7 +85,7 @@ void QDBusMenuModel::stop()
/*! \internal */
void QDBusMenuModel::serviceVanish(GDBusConnection *)
{
- setMenuModel(NULL);
+ setMenuModel(NULL, true);
}
/*! \internal */
@@ -94,7 +94,7 @@ void QDBusMenuModel::serviceAppear(GDBusConnection *connection)
GMenuModel *model = reinterpret_cast<GMenuModel*>(g_dbus_menu_model_get(connection,
busName().toLatin1(),
objectPath().toLatin1()));
- setMenuModel(model);
+ setMenuModel(model, true);
if (model == NULL) {
stop();
}
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index 4c0fc23..cac2f1a 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -46,23 +46,25 @@ QMenuModel::QMenuModel(GMenuModel *other, QObject *parent)
rolesNames[Extra] = "extra";
}
setRoleNames(rolesNames);
- setMenuModel(other);
+ setMenuModel(other, true);
}
/*! \internal */
QMenuModel::~QMenuModel()
{
- setMenuModel(NULL);
+ setMenuModel(NULL, false);
}
/*! \internal */
-void QMenuModel::setMenuModel(GMenuModel *other)
+void QMenuModel::setMenuModel(GMenuModel *other, bool notify)
{
if (m_menuModel == other) {
return;
}
- beginResetModel();
+ if (notify) {
+ beginResetModel();
+ }
if (m_menuModel) {
g_signal_handler_disconnect(m_menuModel, m_signalChangedId);
@@ -81,7 +83,9 @@ void QMenuModel::setMenuModel(GMenuModel *other)
this);
}
- endResetModel();
+ if (notify) {
+ endResetModel();
+ }
}
/*! \internal */
diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h
index 7520480..e482e9b 100644
--- a/libqmenumodel/src/qmenumodel.h
+++ b/libqmenumodel/src/qmenumodel.h
@@ -48,7 +48,7 @@ public:
protected:
QMenuModel(GMenuModel *other=0, QObject *parent=0);
- void setMenuModel(GMenuModel *model);
+ void setMenuModel(GMenuModel *model, bool notify);
GMenuModel *menuModel() const;
private:
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 7455b16..9bce370 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,6 +1,6 @@
macro(declare_test testname)
add_executable(${testname} ${testname}.cpp)
- qt5_use_modules(${testname} Core DBus Widgets Test)
+ qt5_use_modules(${testname} Core DBus Widgets Test Qml Quick)
target_link_libraries(${testname}
qmenumodel
dbusmenuscript
@@ -50,5 +50,8 @@ declare_test(servicetest)
declare_test(menuchangestest)
declare_test(modeltest)
declare_test(actiongrouptest)
+declare_test(qmltest)
declare_simple_test(convertertest)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmlfiles.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qmlfiles.h)
diff --git a/tests/client/loadmodel.qml b/tests/client/loadmodel.qml
new file mode 100644
index 0000000..a91c18b
--- /dev/null
+++ b/tests/client/loadmodel.qml
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+import QMenuModel 0.1
+
+Item {
+ id: root
+ width: 100
+ height: 100
+
+ property bool reset: resetModel
+
+ onResetChanged: {
+ if (reset) {
+ console.log("Remove page");
+ view.model.destroy();
+ //pop();
+ }
+ }
+
+ ListView {
+ id: view
+ anchors.fill: parent
+ delegate: Text {
+ text: label
+ }
+ onCountChanged: {
+ console.log("Row count: " + count);
+ }
+ }
+
+ Component.onCompleted: {
+ var model = Qt.createQmlObject("import QMenuModel 0.1; QDBusMenuModel { id: menuModel; busType: globalBusType; busName: globalBusName; objectPath: globalObjectPath; }", view, "");
+ model.start();
+ console.log("New model: " + model)
+ console.log("New model2: " + model)
+ view.model = model;
+ }
+}
+
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index 542b38a..8f20bc3 100644
--- a/tests/client/modeltest.cpp
+++ b/tests/client/modeltest.cpp
@@ -209,6 +209,28 @@ private Q_SLOTS:
QCOMPARE(v.toString(), QString("42"));
}
+ /*
+ * Test if model is destroyed without crash
+ */
+ void testDestroyModel()
+ {
+ // Make menu available
+ m_script.publishMenu();
+ m_script.run();
+
+ // create a new model
+ QDBusMenuModel *model = new QDBusMenuModel();
+ model->setBusType(DBusEnums::SessionBus);
+ model->setBusName(MENU_SERVICE_NAME);
+ model->setObjectPath(MENU_OBJECT_PATH);
+ model->start();
+
+ // Wait for dbus sync
+ QTest::qWait(500);
+
+ delete model;
+ }
+
};
QTEST_MAIN(ModelTest)
diff --git a/tests/client/qmlfiles.h.in b/tests/client/qmlfiles.h.in
new file mode 100644
index 0000000..ebb534c
--- /dev/null
+++ b/tests/client/qmlfiles.h.in
@@ -0,0 +1,2 @@
+const char* QML_BASE_DIR = "@libqmenumodel_BINARY_DIR@";
+const char* LOADMODEL_QML = "@CMAKE_CURRENT_SOURCE_DIR@/loadmodel.qml";
diff --git a/tests/client/qmltest.cpp b/tests/client/qmltest.cpp
new file mode 100644
index 0000000..ae0d914
--- /dev/null
+++ b/tests/client/qmltest.cpp
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Renato Araujo Oliveira Filho <renato@canonical.com>
+ */
+
+extern "C" {
+#include <glib-object.h>
+}
+
+#include "qdbusmenumodel.h"
+#include "dbusmenuscript.h"
+#include "qmlfiles.h"
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QtTestGui>
+#include <QDebug>
+
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickView>
+
+
+class QMLTest : public QObject
+{
+ Q_OBJECT
+private:
+ DBusMenuScript m_script;
+
+private Q_SLOTS:
+ void initTestCase()
+ {
+ g_type_init();
+ Q_ASSERT(m_script.connect());
+ }
+
+ void cleanupTestCase()
+ {
+ m_script.quit();
+ }
+
+ void init()
+ {
+ }
+
+ void cleanup()
+ {
+ m_script.unpublishMenu();
+ }
+
+ /*
+ * Test if model is destroyed without crash
+ */
+ void destoyModel()
+ {
+ m_script.publishMenu();
+ m_script.run();
+ QTest::qWait(500);
+
+ QQuickView *view = new QQuickView;
+ view->engine()->addImportPath(QML_BASE_DIR);
+ view->engine()->rootContext()->setContextProperty("resetModel", QVariant(false));
+ view->engine()->rootContext()->setContextProperty("globalBusType", DBusEnums::SessionBus);
+ view->engine()->rootContext()->setContextProperty("globalBusName", MENU_SERVICE_NAME);
+ view->engine()->rootContext()->setContextProperty("globalObjectPath", MENU_OBJECT_PATH);
+ view->setSource(QUrl::fromLocalFile(LOADMODEL_QML));
+ view->show();
+ QTest::qWait(500);
+ view->engine()->rootContext()->setContextProperty("resetModel", true);
+ QTest::qWait(500);
+ }
+
+};
+
+QTEST_MAIN(QMLTest)
+
+#include "qmltest.moc"
diff --git a/tests/client/script_qmltest.py b/tests/client/script_qmltest.py
new file mode 100755
index 0000000..385256c
--- /dev/null
+++ b/tests/client/script_qmltest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python2.7
+
+import time
+from menuscript import Script, ActionList, MENU_OBJECT_PATH
+
+al = ActionList(MENU_OBJECT_PATH)
+al.appendItem("Menu0", "Menu0")
+al.appendItem("Menu1", "Menu1")
+
+t = Script.create(al)
+t.run()
+