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

[Albert Astals Cid]

Add support for G_VARIANT_CLASS_ARRAY and G_VARIANT_CLASS_TUPLE

Add support for G_VARIANT_CLASS_ARRAY and G_VARIANT_CLASS_TUPLE

[Unity Merger (unity-merger)]

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

[Albert Astals Cid (aacid)]

Reapproving since the only change from the last approval is the addition of the dbus-test-runner as instructed by Florian/Didier on IRC

[Unity Merger (unity-merger)]

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

[Michal Hruby (mhr3)]

134 + array << QVariantFromGVariant(g_variant_get_child_value(value, i));

Unless QVariantFromGVariant is stealing references, you're leaking a variant here.

review: Needs Fixing

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

69. By Albert Astals Cid on 2012-11-12

Fix memory leak as reported by Michal Hruby

70. By Albert Astals Cid on 2012-11-12

For the test

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

Really fix the problem with the test

[Michal Hruby (mhr3)]

review: Approve

[Albert Astals Cid (aacid)]

Ok, now that Michal is happy with the memory leak fix and i think i have finally fixed the problem with the test not running in jenkins lets try to merge again

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-20 16:32:05 +0000
+++ CMakeLists.txt	2012-11-12 11:52:11 +0000
@@ -41,6 +41,7 @@
     ${QT_QTCORE_INCLUDE_DIR}
     ${QT_QTDECLARATIVE_INCLUDE_DIR}
     ${DEE_INCLUDE_DIRS}
+    ${QT_QTTEST_INCLUDE_DIR}
     )
 
 ## QtDee
@@ -79,7 +80,6 @@
 target_link_libraries(test
     QtDee
     )
-add_custom_target(check)
 
 # Install
 set(IMPORT_INSTALL_DIR lib/qt4/imports/dee)
@@ -114,3 +114,10 @@
     DESTINATION ${IMPORT_INSTALL_DIR}
     )
 
+## Unit-Test
+enable_testing()
+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")
+set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")

=== added file 'conversiontest.cpp'
--- conversiontest.cpp	1970-01-01 00:00:00 +0000
+++ conversiontest.cpp	2012-11-12 11:52:11 +0000
@@ -0,0 +1,89 @@
+/*
+ * 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 "deelistmodel.h"
+
+#include <dee.h>
+
+class ConversionTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+      g_type_init();
+    }
+
+    void GVariantToQVariantConversionTest()
+    {
+      DeeModel* model = dee_shared_model_new("com.dee-qt.test");
+      dee_model_set_schema(model, "b", "y", "n", "q", "i", "u", "x", "t", "d", "s", "a(ii)", NULL);
+
+      GVariant **tuples = g_new(GVariant *, 2);
+
+      GVariant **t1 = g_new(GVariant *, 2);
+      t1[0] = g_variant_new_int32(1);
+      t1[1] = g_variant_new_int32(2);
+      tuples[0] = g_variant_new_tuple(t1, 2);
+
+      GVariant **t2 = g_new(GVariant *, 2);
+      t2[0] = g_variant_new_int32(3);
+      t2[1] = g_variant_new_int32(4);
+      tuples[1] = g_variant_new_tuple(t2, 2);
+
+      GVariant* array_of_tuples = g_variant_new_array(((const GVariantType *) "(ii)"), tuples, 2);
+
+      dee_model_append(model, TRUE, 7, INT16_MIN, UINT16_MAX, INT32_MIN, UINT32_MAX, INT64_MIN, UINT64_MAX, 3.1415, "giraffe", array_of_tuples);
+
+      DeeListModel model_qt;
+      QCOMPARE(model_qt.count(), 0);
+
+      model_qt.setModel(model);
+      QCOMPARE(model_qt.count(), 1);
+
+      const QModelIndex row0Index = model_qt.index(0, 0);
+      QCOMPARE(model_qt.data(row0Index, 0), QVariant(true));
+      QCOMPARE(model_qt.data(row0Index, 1), QVariant(7));
+      QCOMPARE(model_qt.data(row0Index, 2), QVariant(INT16_MIN));
+      QCOMPARE(model_qt.data(row0Index, 3), QVariant(UINT16_MAX));
+      QCOMPARE(model_qt.data(row0Index, 4), QVariant(INT32_MIN));
+      QCOMPARE(model_qt.data(row0Index, 5), QVariant(UINT32_MAX));
+      QCOMPARE(model_qt.data(row0Index, 6), QVariant((qint64)INT64_MIN));
+      QCOMPARE(model_qt.data(row0Index, 7), QVariant((quint64)UINT64_MAX));
+      QCOMPARE(model_qt.data(row0Index, 8), QVariant(3.1415));
+      QCOMPARE(model_qt.data(row0Index, 9), QVariant("giraffe"));
+
+      QList< QVariant > expected_array;
+      QList< QVariant > tuple1, tuple2;
+      tuple1 << 1 << 2;
+      tuple2 << 3 << 4;
+      expected_array << QVariant(tuple1) << QVariant(tuple2);
+      QCOMPARE(model_qt.data(row0Index, 10), QVariant(expected_array));
+
+      g_free(tuples);
+      g_free(t1);
+      g_free(t2);
+      g_object_unref(model);
+    }
+};
+
+QTEST_MAIN(ConversionTest)
+
+#include "conversiontest.moc"

=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2012-02-10 13:24:33 +0000
+++ deelistmodel.cpp	2012-11-12 11:52:11 +0000
@@ -49,6 +49,19 @@
             return QVariant(g_variant_get_double(value));
         case G_VARIANT_CLASS_STRING:
             return QVariant(QString::fromUtf8(g_variant_get_string(value, NULL)));
+        case G_VARIANT_CLASS_ARRAY:
+        case G_VARIANT_CLASS_TUPLE:
+        {
+            const gsize nChildren = g_variant_n_children(value);
+            QList<QVariant> array;
+            for (gsize i = 0; i < nChildren; ++i)
+            {
+              GVariant* gvariant = g_variant_get_child_value(value, i);
+              array << QVariantFromGVariant(gvariant);
+              g_variant_unref(gvariant);
+            }
+            return array;
+        }
         default:
             /* Fallback on an empty QVariant.
                FIXME: Missing conversion of following GVariant types:
@@ -57,8 +70,6 @@
                 - G_VARIANT_CLASS_SIGNATURE
                 - G_VARIANT_CLASS_VARIANT
                 - G_VARIANT_CLASS_MAYBE
-                - G_VARIANT_CLASS_ARRAY
-                - G_VARIANT_CLASS_TUPLE
                 - G_VARIANT_CLASS_DICT_ENTRY
             */
             return QVariant();