tests: move tests to new _get_filename() API

This API was introduced to save a few lines of code here and there, so
let's start by removing a bunch from our own tests.

https://bugzilla.gnome.org/show_bug.cgi?id=549783

gio/tests/file.c

@@ -83,11 +83,8 @@ test_type (void)
   GFile *file;
   GFileType type;
   GError *error = NULL;
-  gchar *datapath;
 
-  datapath = g_test_build_filename (G_TEST_DISTED, ".", NULL);
-  datapath_f = g_file_new_for_path (datapath);
-  g_free (datapath);
+  datapath_f = g_file_new_for_path (g_test_get_dir (G_TEST_DISTED));
 
   file = g_file_get_child (datapath_f, "g-icon.c");
   type = g_file_query_file_type (file, 0, NULL);

gio/tests/g-icon.c

@@ -465,11 +465,8 @@ test_file_icon (void)
   GError *error;
   GInputStream *stream;
   gchar *str;
-  gchar *path;
 
-  path = g_test_build_filename (G_TEST_DISTED, "g-icon.c", NULL);
-
-  file = g_file_new_for_path (path);
+  file = g_file_new_for_path (g_test_get_filename (G_TEST_DISTED, "g-icon.c", NULL));
   icon = g_file_icon_new (file);
   g_object_unref (file);
 
@@ -487,8 +484,6 @@ test_file_icon (void)
 
   g_object_unref (icon);
   g_object_unref (icon2);
-
-  g_free (path);
 }
 
 int

gio/tests/gdbus-connection-slow.c

@@ -61,6 +61,7 @@ test_connection_flush (void)
   GError *error;
   guint n;
   guint signal_handler_id;
+  const gchar *flush_helper;
 
   session_bus_up ();
 
@@ -81,16 +82,15 @@ test_connection_flush (void)
                                                           NULL);
   g_assert_cmpint (signal_handler_id, !=, 0);
 
+  flush_helper = g_test_get_filename (G_TEST_BUILT, "gdbus-connection-flush-helper", NULL);
   for (n = 0; n < 50; n++)
     {
       gboolean ret;
       gint exit_status;
       guint timeout_mainloop_id;
-      gchar *path;
 
       error = NULL;
-      path = g_test_build_filename (G_TEST_BUILT, "gdbus-connection-flush-helper", NULL);
-      ret = g_spawn_command_line_sync (path,
+      ret = g_spawn_command_line_sync (flush_helper,
                                        NULL, /* stdout */
                                        NULL, /* stderr */
                                        &exit_status,
@@ -99,7 +99,6 @@ test_connection_flush (void)
       g_spawn_check_exit_status (exit_status, &error);
       g_assert_no_error (error);
       g_assert (ret);
-      g_free (path);
 
       timeout_mainloop_id = g_timeout_add (1000, test_connection_flush_on_timeout, GUINT_TO_POINTER (n));
       g_main_loop_run (loop);
@@ -186,15 +185,12 @@ static void
 test_connection_large_message (void)
 {
   guint watcher_id;
-  gchar *path;
   guint timeout_id;
 
   session_bus_up ();
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   timeout_id = g_timeout_add_seconds (LARGE_MESSAGE_TIMEOUT_SECONDS,
                                       large_message_timeout_cb,

gio/tests/gdbus-connection.c

@@ -919,7 +919,6 @@ test_connection_filter (void)
   FilterEffects effects;
   GVariant *result;
   const gchar *s;
-  gchar *path;
 
   memset (&data, '\0', sizeof (FilterData));
 
@@ -1002,9 +1001,7 @@ test_connection_filter (void)
   g_assert_cmpint (data.num_outgoing, ==, 4);
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   /* wait for service to be available */
   signal_handler_id = g_dbus_connection_signal_subscribe (c,

gio/tests/gdbus-introspection.c

@@ -107,7 +107,6 @@ test_introspection_parser (void)
   GDBusProxy *proxy;
   GDBusConnection *connection;
   GError *error;
-  gchar *path;
 
   error = NULL;
   connection = g_bus_get_sync (G_BUS_TYPE_SESSION,
@@ -126,9 +125,7 @@ test_introspection_parser (void)
   g_assert_no_error (error);
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   _g_assert_property_notify (proxy, "g-name-owner");
 

gio/tests/gdbus-peer.c

@@ -787,7 +787,7 @@ test_peer (void)
     gsize len;
     gchar *buf2;
     gsize len2;
-    char *testfile = g_test_build_filename (G_TEST_DISTED, "file.c", NULL);
+    const char *testfile = g_test_get_filename (G_TEST_DISTED, "file.c", NULL);
 
     method_call_message = g_dbus_message_new_method_call (NULL, /* name */
                                                           "/org/gtk/GDBus/PeerTestObject",
@@ -830,7 +830,6 @@ test_peer (void)
     g_assert (memcmp (buf, buf2, len) == 0);
     g_free (buf2);
     g_free (buf);
-    g_free (testfile);
   }
 #else
   error = NULL;

gio/tests/gdbus-proxy-well-known-name.c

@@ -60,7 +60,6 @@ test_proxy_well_known_name (void)
   gchar **property_names;
   GVariant *variant;
   GVariant *result;
-  gchar *path;
 
   session_bus_up ();
 
@@ -99,9 +98,7 @@ test_proxy_well_known_name (void)
   g_assert (g_dbus_proxy_get_cached_property_names (ap) == NULL);
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   /* check that we get the notify::g-name-owner signal */
   _g_assert_property_notify (p, "g-name-owner");
@@ -227,9 +224,7 @@ test_proxy_well_known_name (void)
    * the 'y' property should be back at 1...
    */
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   /* check that we get the notify::g-name-owner signal */
   _g_assert_property_notify (p, "g-name-owner");

gio/tests/gdbus-proxy.c

@@ -762,7 +762,6 @@ test_proxy (void)
   GDBusProxy *proxy;
   GDBusConnection *connection;
   GError *error;
-  gchar *path;
 
   error = NULL;
   connection = g_bus_get_sync (G_BUS_TYPE_SESSION,
@@ -781,9 +780,7 @@ test_proxy (void)
   g_assert_no_error (error);
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   _g_assert_property_notify (proxy, "g-name-owner");
 
@@ -834,8 +831,6 @@ fail_test (gpointer user_data)
 static void
 test_async (void)
 {
-  gchar *path;
-
   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                             G_DBUS_PROXY_FLAGS_NONE,
                             NULL,                      /* GDBusInterfaceInfo */
@@ -847,9 +842,7 @@ test_async (void)
                             NULL);
 
   /* this is safe; testserver will exit once the bus goes away */
-  path = g_test_build_filename (G_TEST_BUILT, "gdbus-testserver", NULL);
-  g_assert (g_spawn_command_line_async (path, NULL));
-  g_free (path);
+  g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
 
   g_timeout_add (10000, fail_test, NULL);
   g_main_loop_run (loop);

gio/tests/resources.c

@@ -143,18 +143,15 @@ test_resource_file (void)
 {
   GResource *resource;
   GError *error = NULL;
-  gchar *path;
 
   resource = g_resource_load ("not-there", &error);
   g_assert (resource == NULL);
   g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
   g_clear_error (&error);
 
-  path = g_test_build_filename (G_TEST_BUILT, "test.gresource", NULL);
-  resource = g_resource_load (path, &error);
+  resource = g_resource_load (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL), &error);
   g_assert (resource != NULL);
   g_assert_no_error (error);
-  g_free (path);
 
   test_resource (resource);
   g_resource_unref (resource);
@@ -169,12 +166,10 @@ test_resource_data (void)
   char *content;
   gsize content_size;
   GBytes *data;
-  gchar *path;
 
-  path = g_test_build_filename (G_TEST_BUILT, "test.gresource", NULL);
-  loaded_file = g_file_get_contents (path, &content, &content_size, NULL);
+  loaded_file = g_file_get_contents (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL),
+                                     &content, &content_size, NULL);
   g_assert (loaded_file);
-  g_free (path);
 
   data = g_bytes_new_take (content, content_size);
   resource = g_resource_new_from_data (data, &error);
@@ -199,13 +194,10 @@ test_resource_registered (void)
   char **children;
   GInputStream *in;
   char buffer[128];
-  gchar *path;
 
-  path = g_test_build_filename (G_TEST_BUILT, "test.gresource", NULL);
-  resource = g_resource_load (path, &error);
+  resource = g_resource_load (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL), &error);
   g_assert (resource != NULL);
   g_assert_no_error (error);
-  g_free (path);
 
   found = g_resources_get_info ("/test1.txt",
 				G_RESOURCE_LOOKUP_FLAGS_NONE,
@@ -404,11 +396,8 @@ test_resource_module (void)
 
   if (g_module_supported ())
     {
-      char *path;
-
-      path = g_test_build_filename (G_TEST_BUILT, "libresourceplugin",  NULL);
-      module = g_io_module_new (path);
-      g_free (path);
+      /* For in-tree, this will find the .la file and use it to get to the .so in .libs/ */
+      module = g_io_module_new (g_test_get_filename (G_TEST_BUILT, "libresourceplugin",  NULL));
 
       error = NULL;
 
@@ -461,13 +450,11 @@ test_uri_query_info (void)
   GBytes *data;
   GFile *file;
   GFileInfo *info;
-  gchar *path;
   const char *content_type;
 
-  path = g_test_build_filename (G_TEST_BUILT, "test.gresource", NULL);
-  loaded_file = g_file_get_contents (path, &content, &content_size, NULL);
+  loaded_file = g_file_get_contents (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL),
+                                     &content, &content_size, NULL);
   g_assert (loaded_file);
-  g_free (path);
 
   data = g_bytes_new_take (content, content_size);
   resource = g_resource_new_from_data (data, &error);
@@ -514,12 +501,10 @@ test_uri_file (void)
   gchar buf[1024];
   gboolean ret;
   gssize skipped;
-  gchar *path;
 
-  path = g_test_build_filename (G_TEST_BUILT, "test.gresource", NULL);
-  loaded_file = g_file_get_contents (path, &content, &content_size, NULL);
+  loaded_file = g_file_get_contents (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL),
+                                     &content, &content_size, NULL);
   g_assert (loaded_file);
-  g_free (path);
 
   data = g_bytes_new_take (content, content_size);
   resource = g_resource_new_from_data (data, &error);

gio/tests/tls-certificate.c

@@ -40,15 +40,12 @@ pem_parser (const Reference *ref)
   gchar *pem;
   gchar *parsed_cert_pem = NULL;
   const gchar *parsed_key_pem = NULL;
-  gchar *path;
   GError *error = NULL;
 
   /* Check PEM parsing in certificate, private key order. */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert-key.pem", NULL);
-  g_file_get_contents (path, &pem, NULL, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert-key.pem", NULL), &pem, NULL, &error);
   g_assert_no_error (error);
   g_assert (pem);
-  g_free (path);
 
   cert = g_tls_certificate_new_from_pem (pem, -1, &error);
   g_assert_no_error (error);
@@ -73,11 +70,9 @@ pem_parser (const Reference *ref)
   g_free (pem);
 
   /* Check PEM parsing in private key, certificate order */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL);
-  g_file_get_contents (path, &pem, NULL, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL), &pem, NULL, &error);
   g_assert_no_error (error);
   g_assert (pem);
-  g_free (path);
 
   cert = g_tls_certificate_new_from_pem (pem, -1, &error);
   g_assert_no_error (error);
@@ -97,11 +92,9 @@ pem_parser (const Reference *ref)
   g_object_unref (cert);
 
   /* Check certificate only PEM */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL);
-  g_file_get_contents (path, &pem, NULL, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL), &pem, NULL, &error);
   g_assert_no_error (error);
   g_assert (pem);
-  g_free (path);
 
   cert = g_tls_certificate_new_from_pem (pem, -1, &error);
   g_assert_no_error (error);
@@ -120,11 +113,9 @@ pem_parser (const Reference *ref)
   g_object_unref (cert);
 
   /* Check error with private key only PEM */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL);
-  g_file_get_contents (path, &pem, NULL, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL), &pem, NULL, &error);
   g_assert_no_error (error);
   g_assert (pem);
-  g_free (path);
 
   cert = g_tls_certificate_new_from_pem (pem, -1, &error);
   g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
@@ -139,14 +130,12 @@ from_file (const Reference *ref)
   GTlsCertificate *cert;
   gchar *parsed_cert_pem = NULL;
   const gchar *parsed_key_pem = NULL;
-  gchar *path;
   GError *error = NULL;
 
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL);
-  cert = g_tls_certificate_new_from_file (path, &error);
+  cert = g_tls_certificate_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
+                                          &error);
   g_assert_no_error (error);
   g_assert (cert);
-  g_free (path);
 
   g_object_get (cert,
       "certificate-pem", &parsed_cert_pem,
@@ -167,16 +156,13 @@ from_files (const Reference *ref)
   GTlsCertificate *cert;
   gchar *parsed_cert_pem = NULL;
   const gchar *parsed_key_pem = NULL;
-  gchar *path, *path2;
   GError *error = NULL;
 
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL);
-  path2 = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL);
-  cert = g_tls_certificate_new_from_files (path, path2, &error);
+  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
+                                           g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
+                                           &error);
   g_assert_no_error (error);
   g_assert (cert);
-  g_free (path);
-  g_free (path2);
 
   g_object_get (cert,
       "certificate-pem", &parsed_cert_pem,
@@ -191,32 +177,30 @@ from_files (const Reference *ref)
   g_object_unref (cert);
 
   /* Missing private key */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL);
-  path2 = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert2.pem", NULL);
-  cert = g_tls_certificate_new_from_files (path, path2, &error);
+  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
+                                           g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert2.pem", NULL),
+                                           &error);
   g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
   g_clear_error (&error);
   g_assert (cert == NULL);
-  g_free (path);
-  g_free (path2);
 
   /* Missing certificate */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL);
-  cert = g_tls_certificate_new_from_files (path, path, &error);
+  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
+                                           g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
+                                           &error);
   g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
   g_clear_error (&error);
   g_assert (cert == NULL);
-  g_free (path);
 
   /* Using this method twice with a file containing both private key and
    * certificate as a way to inforce private key presence is a fair use
    */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL);
-  cert = g_tls_certificate_new_from_files (path, path, &error);
+  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
+                                           g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
+                                           &error);
   g_assert_no_error (error);
   g_assert (cert);
   g_object_unref (cert);
-  g_free (path);
 }
 
 
@@ -226,16 +210,13 @@ from_files_pkcs8 (const Reference *ref)
   GTlsCertificate *cert;
   gchar *parsed_cert_pem = NULL;
   const gchar *parsed_key_pem = NULL;
-  gchar *path, *path2;
   GError *error = NULL;
 
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL);
-  path2 = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key8.pem", NULL);
-  cert = g_tls_certificate_new_from_files (path, path2, &error);
+  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
+                                           g_test_get_filename (G_TEST_DISTED, "cert-tests", "key8.pem", NULL),
+                                           &error);
   g_assert_no_error (error);
   g_assert (cert);
-  g_free (path);
-  g_free (path2);
 
   g_object_get (cert,
       "certificate-pem", &parsed_cert_pem,
@@ -255,14 +236,12 @@ list_from_file (const Reference *ref)
 {
   GList *list, *l;
   GError *error = NULL;
-  gchar *path;
   int i;
 
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert-list.pem", NULL);
-  list = g_tls_certificate_list_new_from_file (path, &error);
+  list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert-list.pem", NULL),
+                                               &error);
   g_assert_no_error (error);
   g_assert_cmpint (g_list_length (list), ==, 3);
-  g_free (path);
 
   l = list;
   for (i = 0; i < 3; i++)
@@ -280,11 +259,10 @@ list_from_file (const Reference *ref)
   g_list_free_full (list, g_object_unref);
 
   /* Empty list is not an error */
-  path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "nothing.pem", NULL);
-  list = g_tls_certificate_list_new_from_file (path, &error);
+  list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "nothing.pem", NULL),
+                                               &error);
   g_assert_no_error (error);
   g_assert_cmpint (g_list_length (list), ==, 0);
-  g_free (path);
 }
 
 int