[grilo-plugins] tests: refactor TMDB tests

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit d0664235c7cc08514e0a82361e1a8fab0462f0a4
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Sun Jun 23 12:17:40 2013 +0000

    tests: refactor TMDB tests
    
    Use glib test framework.

 tests/tmdb/Makefile.am                       |    6 ++++--
 tests/tmdb/test_tmdb_fast_resolution.c       |    8 ++++++--
 tests/tmdb/test_tmdb_fast_resolution_by_id.c |    8 ++++++--
 tests/tmdb/test_tmdb_full_resolution.c       |    8 ++++++--
 tests/tmdb/test_tmdb_missing_configuration.c |    8 ++++++--
 tests/tmdb/test_tmdb_preconditions.c         |    8 ++++++--
 6 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/tests/tmdb/Makefile.am b/tests/tmdb/Makefile.am
index d1f937b..cd2b936 100644
--- a/tests/tmdb/Makefile.am
+++ b/tests/tmdb/Makefile.am
@@ -9,14 +9,14 @@ include $(top_srcdir)/gtester.mk
 
 INCLUDES = @DEPS_CFLAGS@
 
-TESTS =                                                                                \
+TEST_PROGS +=                                                          \
        test_tmdb_fast_resolution                       \
        test_tmdb_fast_resolution_by_id \
        test_tmdb_full_resolution                       \
        test_tmdb_missing_configuration \
        test_tmdb_preconditions
 
-check_PROGRAMS = $(TESTS)
+#check_PROGRAMS = $(TESTS)
 
 # Let the .c source code know about these paths,
 # even when sourcedir!=builddir, such as during make distcheck:
@@ -99,6 +99,8 @@ dist_noinst_DATA =                    \
        data/search.txt                 \
        data/sherlock.ini
 
+noinst_PROGRAMS = $(TEST_PROGS)
+
 MAINTAINERCLEANFILES =         \
        *.in                                                    \
        *~
diff --git a/tests/tmdb/test_tmdb_fast_resolution.c b/tests/tmdb/test_tmdb_fast_resolution.c
index 9249574..a5132a0 100644
--- a/tests/tmdb/test_tmdb_fast_resolution.c
+++ b/tests/tmdb/test_tmdb_fast_resolution.c
@@ -37,7 +37,7 @@ static gboolean compare_floats(gfloat a, gfloat b)
 }
 
 static void
-test (void)
+test_fast_resolution (void)
 {
   GrlKeyID backdrop, posters;
   GrlRegistry *registry;
@@ -107,9 +107,13 @@ main(int argc, char **argv)
   g_setenv ("GRL_NET_MOCKED", GRILO_PLUGINS_TESTS_TMDB_DATA_PATH "no-details.ini", TRUE);
 
   grl_init (&argc, &argv);
+  g_test_init (&argc, &argv, NULL);
+
 #if !GLIB_CHECK_VERSION(2,32,0)
   g_thread_init (NULL);
 #endif
 
-  test ();
+  g_test_add_func ("/tmdb/fast-resolution", test_fast_resolution);
+
+  return g_test_run ();
 }
diff --git a/tests/tmdb/test_tmdb_fast_resolution_by_id.c b/tests/tmdb/test_tmdb_fast_resolution_by_id.c
index 00fe8af..02124d7 100644
--- a/tests/tmdb/test_tmdb_fast_resolution_by_id.c
+++ b/tests/tmdb/test_tmdb_fast_resolution_by_id.c
@@ -37,7 +37,7 @@ static gboolean compare_floats(gfloat a, gfloat b)
 }
 
 static void
-test (void)
+test_fast_resolution_by_id (void)
 {
   GrlKeyID backdrop, posters, tmdb_id;
   GrlRegistry *registry;
@@ -109,9 +109,13 @@ main(int argc, char **argv)
   g_setenv ("GRL_NET_MOCKED", GRILO_PLUGINS_TESTS_TMDB_DATA_PATH "fast-by-id.ini", TRUE);
 
   grl_init (&argc, &argv);
+  g_test_init (&argc, &argv, NULL);
+
 #if !GLIB_CHECK_VERSION(2,32,0)
   g_thread_init (NULL);
 #endif
 
-  test ();
+  g_test_add_func ("/tmdb/fast-resolution-by-id", test_fast_resolution_by_id);
+
+  return g_test_run ();
 }
diff --git a/tests/tmdb/test_tmdb_full_resolution.c b/tests/tmdb/test_tmdb_full_resolution.c
index 64db91b..d658f83 100644
--- a/tests/tmdb/test_tmdb_full_resolution.c
+++ b/tests/tmdb/test_tmdb_full_resolution.c
@@ -70,7 +70,7 @@ test_region_certificate (GrlMedia *media, const gchar *region, const gchar *expe
 "In a dynamic new portrayal of Arthur Conan Doyle’s most famous characters, “Sherlock Holmes” sends Holmes 
and his stalwart partner Watson on their latest challenge. Revealing fighting skills as lethal as his 
legendary intellect, Holmes will battle as never before to bring down a new nemesis and unravel a deadly plot 
that could destroy England."
 
 static void
-test (void)
+test_full_resolution (void)
 {
   GError *error = NULL;
   GrlRegistry *registry;
@@ -166,9 +166,13 @@ main(int argc, char **argv)
   g_setenv ("GRL_NET_MOCKED", GRILO_PLUGINS_TESTS_TMDB_DATA_PATH "sherlock.ini", TRUE);
 
   grl_init (&argc, &argv);
+  g_test_init (&argc, &argv, NULL);
+
 #if !GLIB_CHECK_VERSION(2,32,0)
   g_thread_init (NULL);
 #endif
 
-  test ();
+  g_test_add_func ("/tmdb/full-resolution", test_full_resolution);
+
+  return g_test_run ();
 }
diff --git a/tests/tmdb/test_tmdb_missing_configuration.c b/tests/tmdb/test_tmdb_missing_configuration.c
index 6ec4f1c..ad1b486 100644
--- a/tests/tmdb/test_tmdb_missing_configuration.c
+++ b/tests/tmdb/test_tmdb_missing_configuration.c
@@ -28,7 +28,7 @@
 #define TMDB_PLUGIN_ID "grl-tmdb"
 
 static void
-test (void)
+test_missing_configuration (void)
 {
   GrlMedia *media = NULL;
   GrlOperationOptions *options = NULL;
@@ -80,9 +80,13 @@ main(int argc, char **argv)
   g_setenv ("GRL_NET_MOCKED", GRILO_PLUGINS_TESTS_TMDB_DATA_PATH "empty-data.ini", TRUE);
 
   grl_init (&argc, &argv);
+  g_test_init (&argc, &argv, NULL);
+
 #if !GLIB_CHECK_VERSION(2,32,0)
   g_thread_init (NULL);
 #endif
 
-  test ();
+  g_test_add_func ("/tmdb/missing-configuration", test_missing_configuration);
+
+  return g_test_run ();
 }
diff --git a/tests/tmdb/test_tmdb_preconditions.c b/tests/tmdb/test_tmdb_preconditions.c
index 5660ff0..cb5c2ca 100644
--- a/tests/tmdb/test_tmdb_preconditions.c
+++ b/tests/tmdb/test_tmdb_preconditions.c
@@ -28,7 +28,7 @@
 #define TMDB_PLUGIN_ID "grl-tmdb"
 
 static void
-test (void)
+test_preconditions (void)
 {
   GrlMedia *local_media = NULL;
   GrlMedia *media = NULL;
@@ -100,9 +100,13 @@ main(int argc, char **argv)
   g_setenv ("GRL_NET_MOCKED", GRILO_PLUGINS_TESTS_TMDB_DATA_PATH "empty-data.ini", TRUE);
 
   grl_init (&argc, &argv);
+  g_test_init (&argc, &argv, NULL);
+
 #if !GLIB_CHECK_VERSION(2,32,0)
   g_thread_init (NULL);
 #endif
 
-  test ();
+  g_test_add_func ("/tmdb/preconditions", test_preconditions);
+
+  return g_test_run ();
 }