Merge lp:~pete-woods/unity-api/glibmemory-typedefs into lp:unity-api

[Pete Woods]

unity::util - Add typedef macros to GlibMemory to make method and member variable definitions easier.

unity::util - Add typedef macros to GlibMemory to make method and member variable definitions easier.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:272
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/139/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4132
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4160
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4000/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4000/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4000/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4000/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4000/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4000
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4000/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/139/rebuild

review: Approve (continuous-integration)

[Xavi Garcia (xavi-garcia-mena)]

LGTM

review: Approve

[Charles Kerr (charlesk)]

nice

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-06 09:11:04 +0000
+++ debian/changelog	2017-02-17 13:43:11 +0000
@@ -1,3 +1,10 @@
+unity-api (8.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * unity::util - Add typedef macros to GlibMemory to make method
+    and member variable definitions easier.
+
+ -- Pete <[e-mail]>  Fri, 17 Feb 2017 13:27:28 +0000
+
 unity-api (8.2+17.04.20170206-0ubuntu1) zesty; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'include/unity/util/GlibMemory.h'
--- include/unity/util/GlibMemory.h	2017-01-19 13:52:32 +0000
+++ include/unity/util/GlibMemory.h	2017-02-17 13:43:11 +0000
@@ -31,13 +31,15 @@
 #pragma push_macro("G_DEFINE_AUTOPTR_CLEANUP_FUNC")
 #undef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 #define G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func) \
-inline std::shared_ptr<TypeName> share_glib(TypeName* ptr) \
+typedef std::shared_ptr<TypeName> TypeName##SPtr; \
+inline TypeName##SPtr share_glib(TypeName* ptr) \
 { \
-    return std::shared_ptr<TypeName>(ptr, &func); \
+    return TypeName##SPtr(ptr, &func); \
 } \
-inline std::unique_ptr<TypeName, decltype(&func)> unique_glib(TypeName* ptr) \
+typedef std::unique_ptr<TypeName, decltype(&func)> TypeName##UPtr; \
+inline TypeName##UPtr unique_glib(TypeName* ptr) \
 { \
-    return std::unique_ptr<TypeName, decltype(&func)>(ptr, &func); \
+    return TypeName##UPtr(ptr, &func); \
 }
 
 #pragma push_macro("G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC")

=== modified file 'test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp'
--- test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp	2017-01-19 13:52:32 +0000
+++ test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp	2017-02-17 13:43:11 +0000
@@ -54,24 +54,54 @@
         // Note that we don't g_free the data, because it's a reference to a static string
         values.emplace(string((gchar*) data));
     }
+
+    static GKeyFileUPtr newGKeyFile()
+    {
+        return unique_glib(g_key_file_new());
+    }
+
+    static GVariantUPtr newGVariant(const gchar* const value)
+    {
+        return unique_glib(g_variant_new_string(value));
+    }
+
+    static GHashTableUPtr newGHashTable()
+    {
+        return unique_glib(g_hash_table_new_full(g_str_hash, g_str_equal, deleteKey, deleteValue));
+    }
+
+    static GKeyFileSPtr sharedGKeyFile()
+    {
+        return share_glib(g_key_file_new());
+    }
+
+    static GVariantSPtr sharedGVariant(const gchar* const value)
+    {
+        return share_glib(g_variant_new_string(value));
+    }
+
+    static GHashTableSPtr sharedGHashTable()
+    {
+        return share_glib(g_hash_table_new_full(g_str_hash, g_str_equal, deleteKey, deleteValue));
+    }
 };
 
 TEST_F(GlibMemoryTest, Unique)
 {
     {
-        auto gkf = unique_glib(g_key_file_new());
+        auto gkf = newGKeyFile();
         g_key_file_set_boolean(gkf.get(), "group", "key", TRUE);
         EXPECT_EQ(TRUE, g_key_file_get_boolean(gkf.get(), "group", "key", NULL));
     }
 
     {
-        auto variant = unique_glib(g_variant_new_string("hello"));
+        auto variant = newGVariant("hello");
         EXPECT_STREQ("hello", g_variant_get_string(variant.get(), NULL));
     }
 
     {
         {
-            auto hash = unique_glib(g_hash_table_new_full(g_str_hash, g_str_equal, deleteKey, deleteValue));
+            auto hash = newGHashTable();
             g_hash_table_insert(hash.get(), (gpointer) "hello", (gpointer) "there");
             g_hash_table_insert(hash.get(), (gpointer) "hash", (gpointer) "world");
         }
@@ -83,19 +113,19 @@
 TEST_F(GlibMemoryTest, Share)
 {
     {
-        auto gkf = share_glib(g_key_file_new());
+        auto gkf = sharedGKeyFile();
         g_key_file_set_boolean(gkf.get(), "group", "key", TRUE);
         EXPECT_EQ(TRUE, g_key_file_get_boolean(gkf.get(), "group", "key", NULL));
     }
 
     {
-        auto variant = share_glib(g_variant_new_string("hello"));
+        auto variant = sharedGVariant("hello");
         EXPECT_STREQ("hello", g_variant_get_string(variant.get(), NULL));
     }
 
     {
         {
-            auto hash = share_glib(g_hash_table_new_full(g_str_hash, g_str_equal, deleteKey, deleteValue));
+            auto hash = sharedGHashTable();
             g_hash_table_insert(hash.get(), (gpointer) "hello", (gpointer) "there");
             g_hash_table_insert(hash.get(), (gpointer) "hash", (gpointer) "world");
         }