Merge lp:~unity-team/dee-qt/deevarianttext-and-tests into lp:dee-qt

[Michał Sawicz]

add support for gvariant strings and tests

[Michał Sawicz (saviq)]

Your changes to DeeListModel broke it for our use (rolesChanged isn't fired anymore).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/dee-qt/deevarianttext/+merge/153458/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/dee-qt-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-qt-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-qt-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/dee-qt/deevarianttext-and-tests]

111. By Michał Sawicz on 2013-03-15

add changelog entry

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/dee-qt-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-qt-raring-amd64-ci/2/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-qt-ci/2/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Using processEvents in a library is hardly acceptable, why do you need it?

We already have
g_signal_connect(m_deeModel, "notify::synchronized", G_CALLBACK(onSynchronizedChanged), m_parent);

That will update the model accordingly when the data is here, no?

review: Needs Fixing

[Cris Dywan (kalikiana)]

review: Approve

[Cris Dywan (kalikiana)]

review: Abstain

[Albert Astals Cid (aacid)]

You still have the processEvents call, i think i commented already in a different merge request. Can you clarify why you need it? Having a processEvents call usually means you're doing something wrong.

review: Needs Fixing

[Michał Sawicz (saviq)]

Remember this is superseded by lp:~unity-team/dee-qt/deevarianttext-and-tests

[Albert Astals Cid (aacid)]

Doesn't merged cleanly to dee-qt anymore. Is there any need to get this merged? Or after 8 months it's safe to asume we can discard it?

review: Needs Fixing

[Michał Sawicz (saviq)]

It would be good to pick out the tests, DeeVariantText itself can go.

[Albert Astals Cid (aacid)]

I had a look at the tests, but after removing DeeVariantText it does not really add anything to the tests, it was just another way of testing stuff we already test, so no point in adding them again.

review: Disapprove

Unmerged revisions

111. By Michał Sawicz on 2013-03-15

add changelog entry

110. By Michał Sawicz on 2013-03-15

disable tests during build, add test dependencies to Build-Dep

109. By Michał Sawicz on 2013-03-15

merge trunk

108. By Michał Sawicz on 2013-03-15

fix build on raring and drop deprecated g_type_init calls

107. By Cris Dywan on 2013-03-08

Drop remaining pieces of delegate approach as well

106. By Cris Dywan on 2013-03-08

Drop delegate test, the approach is wrong

105. By Cris Dywan on 2013-01-23

Use QT_INSTALL_QML (QtQuick2) instead of QT_INSTALL_IMPORTS (QtQuick1)

See http://doc-snapshot.qt-project.org/5.0/qtcore/qlibraryinfo.html#LibraryLocation-enum

104. By Cris Dywan on 2013-01-23

Use SignalSpy in QML - preliminary text delegate testing

103. By Cris Dywan on 2013-01-17

Emit layoutChanged in addition to countChanged

102. By Cris Dywan on 2013-01-17

Expose append/ remove to QML to allow hosting new models

For now only in test models and no API to set the schema.

=== modified file '.bzrignore'
--- .bzrignore	2012-11-30 12:56:33 +0000
+++ .bzrignore	2013-03-15 11:19:22 +0000
@@ -2,7 +2,20 @@
 CMakeFiles
 Makefile
 cmake_install.cmake
-libdee-qt.so*
+install_manifest.txt
+libdee-qt4.so*
 libdee-qt5.so*
-moc_*.cxx
-install_manifest.txt
+libQtDee.so*
+moc_*.cpp
+*.moc
+*_automoc.cpp
+*.pc
+CTestTestfile.cmake
+*Test.log
+Testing
+conversiontest
+deelistmodeltest
+deevarianttexttest
+plugintest
+test-helper
+*-xunit.xml

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-01-31 17:47:23 +0000
+++ CMakeLists.txt	2013-03-15 11:19:22 +0000
@@ -47,6 +47,7 @@
 # Sources
 set(DEE_QT_SRCS
     deelistmodel.cpp
+    deevarianttext.cpp
     )
 
 # Build
@@ -73,6 +74,7 @@
 # Unit-Test
 enable_testing()
 
+add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
 add_subdirectory(modules)
 add_subdirectory(tests)
 
@@ -83,7 +85,7 @@
     LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}${LIB_SUFFIX}
     )
 
-install(FILES deelistmodel.h
+install(FILES deelistmodel.h deevarianttext.h
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 16:08:42 +0000
+++ debian/changelog	2013-03-15 11:19:22 +0000
@@ -1,3 +1,11 @@
+dee-qt (3.1-0ubuntu2) UNRELEASED; urgency=low
+
+  [ Christian Dywan ]
+  * add support for GVariant strings
+  * add tests
+
+ -- Michał Sawicz <[e-mail]>  Fri, 15 Mar 2013 12:05:44 +0100
+
 dee-qt (3.0-0ubuntu1) raring; urgency=low
 
   [ Michał Sawicz ]

=== modified file 'debian/control'
--- debian/control	2013-03-04 21:13:15 +0000
+++ debian/control	2013-03-15 11:19:22 +0000
@@ -12,6 +12,9 @@
                qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin,
                dbus-test-runner,
 Standards-Version: 3.9.3
 # If you aren't a member of ~unity-team but need to upload packaging changes,

=== modified file 'debian/rules'
--- debian/rules	2013-01-31 18:29:57 +0000
+++ debian/rules	2013-03-15 11:19:22 +0000
@@ -24,8 +24,6 @@
 	dh_auto_clean -Bbuild/qt5
 
 override_dh_auto_test:
-	dh_auto_test -Bbuild/qt4
-	dh_auto_test -Bbuild/qt5
 
 override_dh_auto_install:
 	dh_auto_install -Bbuild/qt4

=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2013-01-18 13:21:04 +0000
+++ deelistmodel.cpp	2013-03-15 11:19:22 +0000
@@ -17,17 +17,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QHash>
 #include <QtCore/QByteArray>
+#include <QtCore/QDebug>
 
 #include <dee.h>
-#include <glib-object.h>
 
 #include "deelistmodel.h"
+#include "deeprivate.h"
 
-static QVariant
+QVariant
 QVariantFromGVariant(GVariant *value)
 {
+    Q_ASSERT(value);
     switch (g_variant_classify(value)) {
         case G_VARIANT_CLASS_BOOLEAN:
             return QVariant((bool) g_variant_get_boolean(value));
@@ -62,13 +65,14 @@
             }
             return array;
         }
+        case G_VARIANT_CLASS_VARIANT:
+            return QVariant(QVariantFromGVariant(g_variant_get_variant(value)));
         default:
             /* Fallback on an empty QVariant.
                FIXME: Missing conversion of following GVariant types:
                 - G_VARIANT_CLASS_HANDLE
                 - G_VARIANT_CLASS_OBJECT_PATH
                 - G_VARIANT_CLASS_SIGNATURE
-                - G_VARIANT_CLASS_VARIANT
                 - G_VARIANT_CLASS_MAYBE
                 - G_VARIANT_CLASS_DICT_ENTRY
             */
@@ -133,16 +137,27 @@
     if (!m_name.isEmpty())
     {
         m_deeModel = dee_shared_model_new(m_name.toUtf8().data());
+        // FIXME expose property to set schema in QML
+        bool ownSchema = m_name.contains(".test");
+        if (ownSchema)
+            dee_model_set_schema(m_deeModel, "b", NULL);
         g_signal_connect(m_deeModel, "notify::synchronized", G_CALLBACK(onSynchronizedChanged), m_parent);
         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);
+        if (ownSchema)
+        {
+            // Doc says we need to be synchronized before doing anything
+            while(!dee_shared_model_is_synchronized(DEE_SHARED_MODEL(m_deeModel)))
+                qApp->processEvents();
+        }
     }
 }
 
 void
 DeeListModelPrivate::connectToDeeModel(DeeModel *model)
 {
+    m_parent->beginResetModel();
     disconnectFromDeeModel();
 
     m_deeModel = (DeeModel*)g_object_ref (model);
@@ -152,15 +167,14 @@
     if (synchronized())
     {
         createRoles();
-        m_parent->beginResetModel();
         m_count = dee_model_get_n_rows(m_deeModel);
-        m_parent->endResetModel();
         Q_EMIT m_parent->countChanged();
     }
     else
     {
         g_signal_connect(m_deeModel, "notify::synchronized", G_CALLBACK(onSynchronizedChanged), m_parent);
     }
+    m_parent->endResetModel();
 }
 
 bool
@@ -191,7 +205,7 @@
     for (unsigned int index=0; index<n_columns; index++)
     {
         column = QString("column_%1").arg(index);
-        roles[index] = column.toLocal8Bit();
+        roles[index] = column.toUtf8();
     }
 
 #if WITHQT5==0
@@ -203,6 +217,24 @@
     Q_EMIT m_parent->roleNamesChanged(roles);
 }
 
+void DeeListModel::append(const QString & data)
+{
+    GVariant* gvariant = g_variant_parse(NULL, "false", NULL, NULL, NULL);
+    if (!gvariant)
+    {
+        qDebug() << "Failed to append " << data << " (invalid) to model";
+        return;
+    }
+    dee_model_insert (d->m_deeModel, 0, &gvariant);
+    g_variant_unref(gvariant);
+}
+
+void DeeListModel::remove(int index)
+{
+    DeeModelIter* iter = dee_model_get_iter_at_row (d->m_deeModel, index);
+    dee_model_remove(d->m_deeModel, iter);
+}
+
 void
 DeeListModelPrivate::onSynchronizedChanged(GObject* emitter __attribute__ ((unused)),
                                            GParamSpec *pspec,
@@ -279,12 +311,12 @@
     Q_EMIT model->dataChanged(index, index);
 }
 
-
-
 DeeListModel::DeeListModel(QObject *parent) :
     QAbstractListModel(parent), d(new DeeListModelPrivate(this))
 {
+#ifndef GLIB_VERSION_2_36
     g_type_init();
+#endif
 }
 
 DeeListModel::~DeeListModel()

=== modified file 'deelistmodel.h'
--- deelistmodel.h	2013-01-18 13:21:04 +0000
+++ deelistmodel.h	2013-03-15 11:19:22 +0000
@@ -20,11 +20,12 @@
 #ifndef DEELISTMODEL_H
 #define DEELISTMODEL_H
 
+#include <QtCore/QObject>
 #include <QtCore/QAbstractListModel>
 
 class DeeListModelPrivate;
 typedef struct _DeeModel DeeModel;
-class __attribute__ ((visibility ("default"))) DeeListModel : public QAbstractListModel
+class Q_DECL_EXPORT DeeListModel : public QAbstractListModel
 {
     friend class DeeListModelPrivate;
 
@@ -46,6 +47,10 @@
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
     QHash<int, QByteArray> roleNames() const;
 
+    /* Modification of the model */
+    Q_INVOKABLE void append(const QString & data);
+    Q_INVOKABLE void remove(int index);
+
     /* getters */
     QString name() const;
     bool synchronized() const;

=== added file 'deeprivate.h'
--- deeprivate.h	1970-01-01 00:00:00 +0000
+++ deeprivate.h	2013-03-15 11:19:22 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * 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 <glib-object.h>
+
+QVariant QVariantFromGVariant(GVariant *value);
+

=== added file 'deevarianttext.cpp'
--- deevarianttext.cpp	1970-01-01 00:00:00 +0000
+++ deevarianttext.cpp	2013-03-15 11:19:22 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * 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 <QDebug>
+
+#include "deevarianttext.h"
+#include "deeprivate.h"
+
+DeeVariantText::DeeVariantText(QObject *parent) :
+    m_text(""),
+    m_value(QVariant()),
+    m_type("")
+{
+}
+
+void
+DeeVariantText::setText(const QString& text)
+{
+    if (m_text == text)
+        return;
+
+    m_text = text;
+    GVariant *gvariant = g_variant_parse(NULL, text.toUtf8(), NULL, NULL, NULL);
+    if (!gvariant)
+    {
+        qDebug() << "Failed to parse " << text << " to QVariant";
+        m_value = QVariant();
+        m_type = "";
+    }
+    else
+    {
+        m_value = QVariantFromGVariant(gvariant);
+        m_type = g_variant_get_type_string(gvariant);
+    }
+    Q_EMIT textChanged(text);
+    Q_EMIT valueChanged(m_value);
+}
+
+QString
+DeeVariantText::getText()
+{
+    return m_text;
+}
+
+QVariant
+DeeVariantText::getValue()
+{
+    return m_value;
+}
+
+QVariant
+DeeVariantText::getType()
+{
+    return m_type;
+}
+

=== added file 'deevarianttext.h'
--- deevarianttext.h	1970-01-01 00:00:00 +0000
+++ deevarianttext.h	2013-03-15 11:19:22 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#ifndef DEEVARIANTTEXT_H
+#define DEEVARIANTTEXT_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+class Q_DECL_EXPORT DeeVariantText : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString text READ getText WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(QVariant value READ getValue NOTIFY valueChanged)
+public:
+    DeeVariantText(QObject* parent = 0);
+    ~DeeVariantText() { }
+
+    QString getText();
+    QVariant getValue();
+    QVariant getType();
+    void setText(const QString& text);
+Q_SIGNALS:
+    void textChanged(const QString& text);
+    void valueChanged(const QVariant& value);
+private:
+    Q_DISABLE_COPY(DeeVariantText)
+    QString m_text;
+    QVariant m_value;
+    QString m_type;
+};
+
+#endif // DEEVARIANTTEXT_H
+

=== modified file 'modules/Dee/CMakeLists.txt'
--- modules/Dee/CMakeLists.txt	2013-01-28 15:41:01 +0000
+++ modules/Dee/CMakeLists.txt	2013-03-15 11:19:22 +0000
@@ -4,6 +4,7 @@
   set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
 
   get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+  # See http://doc-snapshot.qt-project.org/5.0/qtcore/qlibraryinfo.html#LibraryLocation-enum
   exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)
   file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
 
@@ -20,6 +21,7 @@
     )
 
 add_library(DeePlugin SHARED ${DeePlugin_SRCS})
+add_dependencies(check DeePlugin)
 
 target_link_libraries(DeePlugin
   ${DEE_QT_LIBNAME}

=== modified file 'modules/Dee/plugin.cpp'
--- modules/Dee/plugin.cpp	2012-11-30 12:56:33 +0000
+++ modules/Dee/plugin.cpp	2013-03-15 11:19:22 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "deelistmodel.h"
+#include "deevarianttext.h"
 #include "plugin.h"
 #if WITHQT5
   #include <qqml.h>
@@ -28,6 +29,7 @@
 void DeePlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<DeeListModel>(uri, 3, 0, "DeeListModel");
+    qmlRegisterType<DeeVariantText>(uri, 3, 0, "DeeVariantText");
 }
 
 #if !WITHQT5

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-11-30 14:51:06 +0000
+++ tests/CMakeLists.txt	2013-03-15 11:19:22 +0000
@@ -5,25 +5,54 @@
 else ()
   set(OUR_QT_TEST_LIB ${QT_QTTEST_LIBRARIES})
   set(OUR_QT_TEST_INCLUDES ${QT_QTTEST_INCLUDE_DIR})
+  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
+  set(OUR_QT_QUICK_INCLUDE ${QT_QTDECLARATIVE_INCLUDE_DIR})
+endif ()
+
+if (WITHQT5)
+  add_test(NAME plugintest COMMAND "qmltestrunner" "-import" "../modules" "-xunitxml" "-o" "plugintest-xunit.xml" "-input" "${CMAKE_CURRENT_SOURCE_DIR}")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+else ()
+  add_executable(plugintest qtquick1plugintest.cpp)
+  target_link_libraries(plugintest ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTTEST_LIBRARIES} ${QT_QTDECLARATIVE_LIBRARIES})
+  set_target_properties(plugintest PROPERTIES COMPILE_FLAGS -fPIC)
+  add_test(NAME plugintest WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/plugintest" "-p" "-xunitxml" "-p" "-o" "-p" "${CMAKE_CURRENT_BINARY_DIR}/plugintest-xunit.xml")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "QT_GRAPHICSSYSTEM=raster")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "QML_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/../modules")
+  add_dependencies(check plugintest)
 endif ()
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OUR_QT_TEST_INCLUDES}
+    ${OUR_QT_QUICK_INCLUDE}
     )
 
 add_executable(conversiontest conversiontest.cpp)
-target_link_libraries(conversiontest ${OUR_QT_TEST_LIB} ${DEE_QT_LIBNAME})
+target_link_libraries(conversiontest ${OUR_QT_WIDGETS_LIB} ${OUR_QT_TEST_LIB} ${OUR_QT_QUICK_LIB} ${DEE_QT_LIBNAME})
 set_target_properties(conversiontest PROPERTIES COMPILE_FLAGS -fPIC)
 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=.")
+set_property(TEST conversiontest PROPERTY ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+add_dependencies(check conversiontest)
 
 add_executable(test-helper test-helper.cpp)
 target_link_libraries(test-helper ${OUR_QT_CORE_LIB} ${OUR_QT_DBUS_LIB} ${DEE_LDFLAGS})
 set_target_properties(test-helper PROPERTIES COMPILE_FLAGS -fPIC)
+add_dependencies(conversiontest ${DEE_QT_LIBNAME} test-helper)
 
 add_executable(deelistmodeltest deelistmodeltest.cpp)
 target_link_libraries(deelistmodeltest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${DEE_QT_LIBNAME})
 set_target_properties(deelistmodeltest PROPERTIES COMPILE_FLAGS -fPIC)
 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=.")
+add_dependencies(check deelistmodeltest)
+
+add_executable(deevarianttexttest deevarianttexttest.cpp)
+target_link_libraries(deevarianttexttest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(deevarianttexttest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME deevarianttexttest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deevarianttexttest" "-p" "-xunitxml" "-p" "-o" "-p" "deevarianttexttest-xunit.xml")
+set_property(TEST deevarianttexttest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+add_dependencies(check deevarianttexttest)
+

=== modified file 'tests/conversiontest.cpp'
--- tests/conversiontest.cpp	2012-11-30 12:56:33 +0000
+++ tests/conversiontest.cpp	2013-03-15 11:19:22 +0000
@@ -18,6 +18,7 @@
 #include <QObject>
 
 #include "deelistmodel.h"
+#include "deevarianttext.h"
 
 #include <dee.h>
 
@@ -28,7 +29,9 @@
 private Q_SLOTS:
     void initTestCase()
     {
+#ifndef GLIB_VERSION_2_36
       g_type_init();
+#endif
     }
 
     void GVariantToQVariantConversionTest()

=== modified file 'tests/deelistmodeltest.cpp'
--- tests/deelistmodeltest.cpp	2012-11-30 12:56:33 +0000
+++ tests/deelistmodeltest.cpp	2013-03-15 11:19:22 +0000
@@ -69,7 +69,9 @@
 private Q_SLOTS:
     void initTestCase()
     {
+#ifndef GLIB_VERSION_2_36
         g_type_init();
+#endif
 
         QVERIFY(wait_until_test_service_appears());
     }
@@ -80,9 +82,11 @@
 
         DeeListModel model_qt;
         QCOMPARE(model_qt.count(), 0);
+        QSignalSpy modelReset(&model_qt, SIGNAL(modelReset()));
 
         model_qt.setModel(model);
         QCOMPARE(model_qt.synchronized(), (bool)dee_shared_model_is_synchronized(DEE_SHARED_MODEL(model)));
+        QCOMPARE(modelReset.count(), 1);
     }
 
     void setExistingModelTest()
@@ -90,10 +94,12 @@
         DeeModel* model = dee_shared_model_new("com.deeqt.test.model");
 
         DeeListModel model_qt;
+        QSignalSpy modelReset(&model_qt, SIGNAL(modelReset()));
         QCOMPARE(model_qt.count(), 0);
 
         model_qt.setModel(model);
         QCOMPARE(model_qt.synchronized(), false);
+        QCOMPARE(modelReset.count(), 1);
 
         while(!model_qt.synchronized())
             qApp->processEvents();
@@ -102,12 +108,44 @@
         QCOMPARE(model_qt.roleNames().count(), 1);
         QCOMPARE(model_qt.roleNames()[0], QByteArray("column_0"));
     }
-    
+
+    void insertRemoveTest()
+    {
+        /* TODO: "ReferenceError: column_0 is not defined" */
+        DeeModel* model = dee_shared_model_new("com.deeqt.test.model");
+
+        DeeListModel model_qt;
+        QSignalSpy modelReset(&model_qt, SIGNAL(modelReset()));
+        QSignalSpy rowsInserted(&model_qt, SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        QSignalSpy rowsRemoved(&model_qt, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        QCOMPARE(model_qt.count(), 0);
+
+        model_qt.setModel(model);
+        QCOMPARE(model_qt.synchronized(), false);
+        QCOMPARE(modelReset.count(), 1);
+
+        while(!model_qt.synchronized())
+            qApp->processEvents();
+        QCOMPARE(model_qt.synchronized(), true);
+
+        GVariant* b = g_variant_parse(NULL, "false", NULL, NULL, NULL);
+        Q_ASSERT(b);
+        DeeModelIter* iter = dee_model_insert (model, 0, &b);
+        g_variant_unref(b);
+        QCOMPARE(rowsInserted.count(), 1);
+        QCOMPARE(model_qt.rowCount(), 1);
+        QCOMPARE(model_qt.roleNames()[0], QByteArray("column_0"));
+
+        dee_model_remove(model, iter);
+        QCOMPARE(rowsRemoved.count(), 1);
+        QCOMPARE(model_qt.rowCount(), 0);
+        QCOMPARE(model_qt.roleNames()[0], QByteArray("column_0"));
+    }
+     
     void cleanupTestCase()
     {
         tell_service_to_exit();
     }
-
 };
 
 QTEST_MAIN(DeeListModelTest)

=== added file 'tests/deevarianttexttest.cpp'
--- tests/deevarianttexttest.cpp	1970-01-01 00:00:00 +0000
+++ tests/deevarianttexttest.cpp	2013-03-15 11:19:22 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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 "deevarianttext.h"
+
+#include <dee.h>
+
+class DeeVariantTextTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+#ifndef GLIB_VERSION_2_36
+      g_type_init();
+#endif
+    }
+
+    void GVariantParseTest()
+    {
+        QHash<QString, QVariant> hash;
+        hash["[[1, 2, 3], [4, 5, 6]]"] = "aai";
+        hash["[[1, 2, 3], [4, 5, 6.0]]"] = "aad";
+        hash["[\"hello\", nothing]"] = "ams";
+        hash["{1: \"one\", 2: \"two\", 3: \"three\"}"] = "a{is}";
+        hash["[just 3, nothing]"] = "ami";
+        // hash["{\"title\": <\"frobit\">, \"enabled\": <true>, width: <800>}"] = "";
+        hash["@ms \"\""] = "ms";
+        QHashIterator<QString, QVariant> i(hash);
+        while (i.hasNext()) {
+            i.next();
+            QString input(i.key());
+            DeeVariantText dvariant;
+            dvariant.setText(input);
+            QCOMPARE(dvariant.getText(), input);
+            QCOMPARE(dvariant.getType(), i.value());
+        }
+    }
+};
+
+QTEST_MAIN(DeeVariantTextTest)
+
+#include "deevarianttexttest.moc"

=== added file 'tests/qtquick1plugintest.cpp'
--- tests/qtquick1plugintest.cpp	1970-01-01 00:00:00 +0000
+++ tests/qtquick1plugintest.cpp	2013-03-15 11:19:22 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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 <QtDeclarative>
+
+class PluginTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+    }
+
+    void GVariantQMLTest()
+    {
+        // Dummy argc/v to avoid GCC confusing int with Display* on some systems
+        int argc = 0;
+        char *argv[0];
+        QApplication app(argc, argv);
+        QDeclarativeView view;
+        view.setSource(QUrl::fromLocalFile("test_qtquick1.qml"));
+        Q_ASSERT(view.errors().empty());
+        QObject *text2 = view.rootObject()->findChild<QObject*>("text2");
+        Q_ASSERT(text2);
+        QVariant text2text(text2->metaObject()->property(text2->metaObject()->indexOfProperty("text")).read(text2));
+        QCOMPARE(text2text.toString(), QString("4,1.1,0.1,0,0.3,3.6"));
+    }
+};
+
+QTEST_MAIN(PluginTest)
+
+#include "qtquick1plugintest.moc"

=== modified file 'tests/test-helper.cpp'
--- tests/test-helper.cpp	2012-11-30 12:56:33 +0000
+++ tests/test-helper.cpp	2013-03-15 11:19:22 +0000
@@ -27,7 +27,9 @@
 public:
     TestControl()
     {
+#ifndef GLIB_VERSION_2_36
         g_type_init();
+#endif
         DeeModel* model = dee_shared_model_new("com.deeqt.test.model");
         dee_model_set_schema(model, "b", NULL);
 

=== modified file 'tests/test_qtquick1.qml'
--- tests/test_qtquick1.qml	2012-11-30 12:56:33 +0000
+++ tests/test_qtquick1.qml	2013-03-15 11:19:22 +0000
@@ -1,15 +1,40 @@
 import QtQuick 1.0
 import Dee 3.0
 
-ListView {
-    width: 200
-    height: 200
-    delegate: Text {
-        x: 66
-        y: 93
-        text: column_4
-    }
-    model: DeeListModel {
-        name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
-    }
+Item {
+
+    ListView {
+        width: 200
+        height: 200
+        delegate: Text {
+            x: 66
+            y: 93
+            text: column_4
+        }
+        model: DeeListModel {
+            name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
+        }
+    }
+
+    DeeVariantText {
+        id: arrayOfInt
+        text: "[[1, 2, 3], [4, 5, 6]]"
+        Component.onCompleted: {
+            arrayOfInt.text = "[[4, 1.1, .1], [0, 0.3, 3.6]]"
+        }
+        onTextChanged: {
+            text2.text = arrayOfInt.value.toString()
+        }
+    }
+
+    Text {
+        text: arrayOfInt.value.toString()
+    }
+
+    Text {
+        id: text2
+        objectName: "text2"
+    }
+
 }
+

=== removed file 'tests/test_qtquick2.qml'
--- tests/test_qtquick2.qml	2012-11-30 12:56:33 +0000
+++ tests/test_qtquick2.qml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-import QtQuick 2.0
-import Dee 3.0
-
-ListView {
-    width: 200
-    height: 200
-    delegate: Text {
-        x: 66
-        y: 93
-        text: column_4
-    }
-    model: DeeListModel {
-        name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
-    }
-}

=== added file 'tests/tst_deelistmodel.qml'
--- tests/tst_deelistmodel.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_deelistmodel.qml	2013-03-15 11:19:22 +0000
@@ -0,0 +1,79 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Dee 3.0
+
+TestCase {
+    name: "DeeListModel"
+
+    function test_1_initialModel () {
+        compare(myModel.count, 0)
+        compare(myView.count, 0)
+    }
+
+    function test_1_modelAssigned () {
+        myModel.name = "com.dee.qml.model.test1"
+        countChanged.wait()
+        compare(myModel.name, "com.dee.qml.model.test1")
+        compare(myModel.count, 0)
+        compare(myView.count, 0)
+    }
+
+    function test_2_modelAppend () {
+        myModel.name = "com.dee.qml.model.test2"
+        countChanged.wait()
+        compare(myModel.count, 0, "model empty")
+        myModel.append("[5.95,\"Pizza\"]")
+        countChanged.wait()
+        compare(myModel.count, 1, "model: one row more")
+        compare(myView.count, myModel.count, "model count matches listview")
+    }
+
+    function test_3_modelRemove () {
+        myModel.name = "com.dee.qml.model.test3"
+        countChanged.wait()
+        compare(myModel.count, 0, "model empty")
+        myModel.append("[0.99,\"Grean Tea, Sencha\"]")
+        myModel.append("[0.89,\"Black Tea, Oolong\"]")
+        countChanged.wait()
+        compare(myModel.count, 2, "two rows more")
+        compare(myView.count, myModel.count, "model count matches listview")
+        myModel.remove(0)
+        countChanged.wait()
+        compare(myModel.count, 1, "one row less")
+    }
+
+    function test_4_roleDefined () {
+        myModel.name = "com.dee.qml.model.test4"
+        countChanged.wait()
+        compare(myModel.count, 0, "model empty")
+        myModel.append("[5.95,\"Pizza\"]")
+        countChanged.wait()
+        compare(myModel.count, 1, "one row more")
+    }
+
+    SignalSpy {
+        id: countChanged
+        target: myModel
+        signalName: "countChanged"
+    }
+
+    ListView {
+        id: myView
+
+        width: 200
+        height: 200
+        delegate: Text {
+            id: myTextDelegate
+            x: 66
+            y: 93
+            text: "" // column_0
+        }
+
+        model: DeeListModel {
+            id: myModel
+            name: "com.dee.qml.model.test0"
+            property string myColumnValue: ""
+        }
+    }
+}
+

=== added file 'tests/tst_deevarianttext.qml'
--- tests/tst_deevarianttext.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_deevarianttext.qml	2013-03-15 11:19:22 +0000
@@ -0,0 +1,60 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Dee 3.0
+
+TestCase {
+    name: "DeeVariantText"
+
+    function test_1_initialText () {
+        compare(arrayOfStr.value.toString(),"bar,foo")
+    }
+
+    function test_3_textAssigned () {
+        arrayOfInt.text = "[[4, 1.1, .1], [0, 0.3, 3.6]]"
+        compare(arrayOfInt.value.toString(),"4,1.1,0.1,0,0.3,3.6")
+    }
+
+    function test_4_textChanged () {
+        arrayOfInt.didChange = false
+        arrayOfInt.text = "@ams [nothing]"
+        compare(arrayOfInt.didChange,true)
+    }
+
+    function test_5_textNotChanged () {
+        arrayOfInt.text = "@ams [nothing]"
+        arrayOfInt.didChange = false
+        arrayOfInt.text = "@ams [nothing]"
+        compare(arrayOfInt.didChange,false)
+    }
+
+    function test_6_invalid () {
+        arrayOfInt.text = "[nothing]"
+        compare(arrayOfInt.value,undefined)
+    }
+
+    function test_7_unicode () {
+        arrayOfStr.text = "[\"١٢٣٤٥٦٧٨٩٠\", \"道具箱\", \"Котята\"]"
+        compare(arrayOfStr.value.toString(),"١٢٣٤٥٦٧٨٩٠,道具箱,Котята")
+    }
+
+    function test_8_gvariant () {
+        arrayOfStr.text = "[<\"test\">, <\"test2\">]"
+        compare(arrayOfStr.value.toString(), "test,test2")
+    }
+
+    DeeVariantText {
+        id: arrayOfStr
+        text: "[\"bar\", \"foo\"]"
+    }
+
+    DeeVariantText {
+        id: arrayOfInt
+        text: "[[1, 2, 3], [4, 5, 6]]"
+        property bool didChange: false
+        onTextChanged: {
+            didChange = true
+        }
+    }
+
+}
+