From cde56cfc70cf80c07614cdf1a42fd4417138a70e Mon Sep 17 00:00:00 2001
From: Emmanuel Fleury <emmanuel.fleury@gmail.com>
Date: Mon, 13 Dec 2021 17:42:23 +0100
Subject: [PATCH] Move tests/completion-test.c to glib/tests/completion.c

Helps issue #1434
---
 .../tests/completion.c                        | 51 ++++++++++++-------
 glib/tests/meson.build                        |  1 +
 tests/meson.build                             |  1 -
 3 files changed, 34 insertions(+), 19 deletions(-)
 rename tests/completion-test.c => glib/tests/completion.c (69%)

diff --git a/tests/completion-test.c b/glib/tests/completion.c
similarity index 69%
rename from tests/completion-test.c
rename to glib/tests/completion.c
index e9664940b..223b3df52 100644
--- a/tests/completion-test.c
+++ b/glib/tests/completion.c
@@ -19,18 +19,25 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
+
+/* We are testing some deprecated APIs here */
+#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+#endif
+
 #include <string.h>
 
 #include "glib.h"
 
-int main (int argc, char *argv[])
+static void
+test_completion (void)
 {
   GCompletion *cmp;
   GList *items;
   gchar *prefix;
-  
+
   cmp = g_completion_new (NULL);
   g_completion_set_compare (cmp, strncmp);
 
@@ -43,40 +50,48 @@ int main (int argc, char *argv[])
   g_list_free (items);
 
   items = g_completion_complete (cmp, "a", &prefix);
-  g_assert (!strcmp ("a\302", prefix));
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpstr (prefix, ==, "a\302");
+  g_assert_cmpint (g_list_length (items), ==, 2);
   g_free (prefix);
-  
+
   items = g_completion_complete_utf8 (cmp, "a", &prefix);
-  g_assert (!strcmp ("a", prefix));
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpstr (prefix, ==, "a");
+  g_assert_cmpint (g_list_length (items), ==, 2);
   g_free (prefix);
 
   items = g_completion_complete (cmp, "b", &prefix);
-  g_assert (!strcmp ("b", prefix));
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpstr (prefix, ==, "b");
+  g_assert_cmpint (g_list_length (items), ==, 2);
   g_free (prefix);
-  
+
   items = g_completion_complete_utf8 (cmp, "b", &prefix);
-  g_assert (!strcmp ("b", prefix));
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpstr (prefix, ==, "b");
+  g_assert_cmpint (g_list_length (items), ==, 2);
   g_free (prefix);
 
   items = g_completion_complete (cmp, "a", NULL);
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpint (g_list_length (items), ==, 2);
 
   items = g_completion_complete_utf8 (cmp, "a", NULL);
-  g_assert (g_list_length (items) == 2);
+  g_assert_cmpint (g_list_length (items), ==, 2);
 
   items = g_list_append (NULL, "bb");
   g_completion_remove_items (cmp, items);
   g_list_free (items);
 
   items = g_completion_complete_utf8 (cmp, "b", &prefix);
-  g_assert (g_list_length (items) == 1);
+  g_assert_cmpint (g_list_length (items), ==, 1);
   g_free (prefix);
 
   g_completion_free (cmp);
-
-  return 0;
+}
+
+int
+main (int argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+  g_test_add_func ("/completion/test-completion", test_completion);
+
+  return g_test_run ();
 }
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index c77ccdd14..862bcdf6d 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -12,6 +12,7 @@ glib_tests = {
   'charset' : {},
   'checksum' : {},
   'collate' : {},
+  'completion' : {},
   'cond' : {},
   'convert' : {},
   'cxx' : {
diff --git a/tests/meson.build b/tests/meson.build
index 8caeb8243..b17ec1fc6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -20,7 +20,6 @@ tests = {
   'testgdate' : {},
   'datetime' : {},
   'child-test' : {},
-  'completion-test' : {},
   'dirname-test' : {},
   'file-test' : {},
   'env-test' : {},