[glib: 5/10] Convert tests/refcount/properties3.c to glib test framework




commit 94ef5ae4c719addf531c8d1e2bf7ca3e5462ffe4
Author: Emmanuel Fleury <emmanuel fleury gmail com>
Date:   Wed Mar 16 09:30:57 2022 +0100

    Convert tests/refcount/properties3.c to glib test framework

 tests/refcount/properties3.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/tests/refcount/properties3.c b/tests/refcount/properties3.c
index 31f26a46e9..8a96fb8041 100644
--- a/tests/refcount/properties3.c
+++ b/tests/refcount/properties3.c
@@ -144,28 +144,25 @@ run_thread (GTest * test)
     my_test_do_property (test);
     if ((i++ % 10000) == 0)
       {
-       g_print (".%c", 'a' + test->id);
-       g_thread_yield(); /* force context switch */
+        g_test_message (".%c", 'a' + test->id);
+        g_thread_yield(); /* force context switch */
       }
   }
 
   return NULL;
 }
 
-int
-main (int argc, char **argv)
+static void
+test_refcount_properties_3 (void)
 {
   gint i;
   GTest *test;
   GArray *test_threads;
   const gint n_threads = 5;
 
-  g_print ("START: %s\n", argv[0]);
-  g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal 
(G_LOG_FATAL_MASK));
-
   test = g_object_new (G_TYPE_TEST, NULL);
 
-  g_assert (test->count == test->dummy);
+  g_assert_cmpint (test->count, ==, test->dummy);
   g_signal_connect (test, "notify::dummy", G_CALLBACK (dummy_notify), NULL);
 
   test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
@@ -181,7 +178,7 @@ main (int argc, char **argv)
   g_usleep (30000000);
 
   g_atomic_int_set (&stopping, 1);
-  g_print ("\nstopping\n");
+  g_test_message ("\nstopping\n");
 
   /* join all threads */
   for (i = 0; i < n_threads; i++) {
@@ -191,12 +188,23 @@ main (int argc, char **argv)
     g_thread_join (thread);
   }
 
-  g_print ("stopped\n");
-
-  g_print ("%d %d\n", test->setcount, test->count);
+  g_test_message ("stopped\n");
+  g_test_message ("%d %d\n", test->setcount, test->count);
 
   g_array_free (test_threads, TRUE);
   g_object_unref (test);
+}
+
+int
+main (int argc, gchar *argv[])
+{
+  g_log_set_always_fatal (G_LOG_LEVEL_WARNING |
+                          G_LOG_LEVEL_CRITICAL |
+                          g_log_set_always_fatal (G_LOG_FATAL_MASK));
+
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/gobject/refcount/properties-3", test_refcount_properties_3);
 
-  return 0;
+  return g_test_run ();
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]