From 3edd18dc46ebb95962f17de0c77ee72f469fd917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 18 Oct 2016 12:40:19 +0200
Subject: ConverterTest: add tests for toQVariant

---
 tests/client/convertertest.cpp | 85 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp
index fe70840..a6a82de 100644
--- a/tests/client/convertertest.cpp
+++ b/tests/client/convertertest.cpp
@@ -39,12 +39,29 @@ private:
         result = g_variant_type_equal(g_variant_get_type(gv), type);
         if (!result) {
             qWarning() << "types are different: QVariant:" << qv.typeName()
-                       << "Result:" << (const char*) g_variant_get_type(gv)
-                       << "Expected:"<< (const char*) type;
+                       << "Result:" << g_variant_type_peek_string (g_variant_get_type(gv))
+                       << "Expected:"<< g_variant_type_peek_string (type);
+        }
+        g_variant_unref(gv);
+        return result;
+    }
+    bool compare(GVariant *gv, const QVariant::Type type)
+    {
+        g_variant_ref_sink(gv);
+        const QVariant& qv = Converter::toQVariant(gv);
+        bool result = (qv.type() == type);
+        if (!result) {
+            qWarning() << "types are different: GVariant:" << g_variant_type_peek_string (g_variant_get_type(gv))
+                       << "Result:" << qv.type()
+                       << "Expected:"<< type;
         }
         g_variant_unref(gv);
         return result;
     }
+    bool compare(GVariant *gv, const QMetaType::Type type)
+    {
+        return compare(gv, (QVariant::Type) type);
+    }
     bool compareWithSchema(const QVariant &qv, const QString strType)
     {
         GVariantType* expected_type;
@@ -89,7 +106,7 @@ private Q_SLOTS:
     void testUInt16ToGVariant()
     {
         // UInt16
-        QVERIFY(compare(QVariant::fromValue<ushort>(-42), G_VARIANT_TYPE_UINT16));
+        QVERIFY(compare(QVariant::fromValue<ushort>(42), G_VARIANT_TYPE_UINT16));
     }
 
     void testInt32ToGVariant()
@@ -152,6 +169,68 @@ private Q_SLOTS:
         QVERIFY(compare(QVariantMap({{"fooBar", 0xdeadbeef}}), G_VARIANT_TYPE_VARDICT));
     }
 
+    // LIST CHECK!
+
+    void testBooleanToQVariant()
+    {
+        // Boolean
+        QVERIFY(compare(g_variant_new_boolean(TRUE), QVariant::Bool));
+    }
+
+    void testByteToQVariant()
+    {
+        // Byte
+        QVERIFY(compare(g_variant_new_byte(53), QMetaType::UChar));
+    }
+
+    void testInt16ToQVariant()
+    {
+        // Int16
+        QVERIFY(compare(g_variant_new_int16(-53), QMetaType::Short));
+    }
+
+    void testUInt16ToQVariant()
+    {
+        // UInt16
+        QVERIFY(compare(g_variant_new_uint16(53), QMetaType::UShort));
+    }
+
+    void testInt32ToQVariant()
+    {
+        // Int32
+        QVERIFY(compare(g_variant_new_int32(-53), QVariant::Int));
+    }
+
+    void testUInt32ToQVariant()
+    {
+        // UInt32
+        QVERIFY(compare(g_variant_new_uint32(53), QVariant::UInt));
+    }
+
+    void testInt64ToQVariant()
+    {
+        // Int64
+        QVERIFY(compare(g_variant_new_int64(-53), QVariant::LongLong));
+    }
+
+    void testUInt64ToQVariant()
+    {
+        // UInt64
+        QVERIFY(compare(g_variant_new_uint64(53), QVariant::ULongLong));
+    }
+
+    void testDoubleToQVariant()
+    {
+        // Double
+        QVERIFY(compare(g_variant_new_double(53.53), QVariant::Double));
+    }
+
+    void testStringToQVariant()
+    {
+        // String
+        QVERIFY(compare(g_variant_new_string("53"), QVariant::String));
+    }
+
     void testTupleConversion()
     {
         QVariantList qTuple;
-- 
cgit v1.2.3