Merge pull request #9595 from keymanapp/refactor/linux/keymanutil-tests

refactor(linux): Add more tests for `keymanutil.c` 🏘️

linux/ibus-keyman/src/keymanutil_internal.h

@@ -0,0 +1,39 @@
+// Internal data structures used in the implementation of keymanutil methods
+// and exposed for unit testing.
+
+#ifndef __KEYMANUTIL_INTERNAL_H__
+#define __KEYMANUTIL_INTERNAL_H__
+
+#include <gmodule.h>
+#include "kmpdetails.h"
+
+typedef struct {
+  GList *engines_list;
+  kmp_info *info;
+  gchar *kmp_dir;
+} add_keyboard_data;
+
+IBusEngineDesc *ibus_keyman_engine_desc_new(
+    gchar *file_name,
+    gchar *name,
+    gchar *description,
+    gchar *copyright,
+    gchar *lang,
+    gchar *license,
+    gchar *author,
+    gchar *icon,
+    gchar *layout,
+    gchar *version);
+
+IBusEngineDesc *get_engine_for_language(
+    kmp_keyboard *keyboard,
+    kmp_info *info,
+    keyboard_details *kbd_details,
+    gchar *kmp_dir,
+    gchar *lang_id,
+    gchar *lang_name);
+
+void keyman_add_keyboard(gpointer data, gpointer user_data);
+void keyman_add_keyboards_from_dir(gpointer data, gpointer user_data);
+
+#endif  // __KEYMANUTIL_INTERNAL_H__

linux/ibus-keyman/src/kmpdetails.c

@@ -455,22 +455,34 @@ kmp_json_status free_keyboard_details(keyboard_details *kbd_details)
     return JSON_OK;
 }
 
+void free_info(gpointer data) {
+  kmp_info *info = (kmp_info *)data;
+  if (info->name)
+    g_free(info->name);
+  if (info->version)
+    g_free(info->version);
+  if (info->copyright)
+    g_free(info->copyright);
+  if (info->author_desc)
+    g_free(info->author_desc);
+  if (info->author_url)
+    g_free(info->author_url);
+  if (info->website_desc)
+    g_free(info->website_desc);
+  if (info->website_url)
+    g_free(info->website_url);
+}
+
 kmp_json_status free_kmp_details(kmp_details * details)
 {
     g_assert(details != NULL);
     g_free(details->system.fileVersion);
     g_free(details->system.keymanDeveloperVersion);
     g_free(details->options.readmeFile);
     g_free(details->options.graphicFile);
-    g_free(details->info.name);
-    g_free(details->info.version);
-    g_free(details->info.copyright);
-    g_free(details->info.author_desc);
-    g_free(details->info.author_url);
-    g_free(details->info.website_desc);
-    g_free(details->info.website_url);
+    free_info(&details->info);
     if (details->keyboards != NULL) {
-        g_list_free_full(details->keyboards, (GDestroyNotify)free_keyboard);
+      g_list_free_full(details->keyboards, (GDestroyNotify)free_keyboard);
     }
     if (details->files != NULL) {
         g_list_free_full(details->files, (GDestroyNotify)free_fileinfo);

linux/ibus-keyman/src/kmpdetails.h

@@ -1,3 +1,6 @@
+#ifndef __KMPDETAILS_H__
+#define __KMPDETAILS_H__
+
 // kmp details from json
 
 #include <glib.h>
@@ -75,4 +78,6 @@ kmp_json_status get_kmp_details(const gchar *kmp_dir, kmp_details *details);
 kmp_json_status free_kmp_details(kmp_details * details);
 kmp_json_status get_keyboard_details(const gchar *kmp_dir, const gchar *id, keyboard_details *details);
 kmp_json_status free_keyboard_details(keyboard_details * details);
-kmp_json_status print_kmp_details(kmp_details * details);
+kmp_json_status print_kmp_details(kmp_details * details);
+
+#endif // __KMPDETAILS_H__