tests: tmdb: Remove aliases for now common keys

2 files changed, 9 insertions, 16 deletions

diff --git a/test/test_tmdb_fast_resolution.c b/test/test_tmdb_fast_resolution.c
index 24c4425..90fbd45 100644
--- a/test/test_tmdb_fast_resolution.c
+++ b/test/test_tmdb_fast_resolution.c
@@ -39,7 +39,7 @@ static gboolean compare_floats(gfloat a, gfloat b)
 static void
 test (void)
 {
-  GrlKeyID backdrop, original_title, posters;
+  GrlKeyID backdrop, posters;
   GrlRegistry *registry;
   GDateTime *date, *orig;
   GrlOperationOptions *options = NULL;
@@ -51,7 +51,6 @@ test (void)
   registry = grl_registry_get_default ();
   backdrop = grl_registry_lookup_metadata_key (registry, "tmdb-backdrop");
   g_assert_cmpint (backdrop, !=, GRL_METADATA_KEY_INVALID);
-  original_title = GRL_METADATA_KEY_ORIGINAL_TITLE;
   posters = grl_registry_lookup_metadata_key (registry, "tmdb-poster");
   g_assert_cmpint (posters, !=, GRL_METADATA_KEY_INVALID);
 
@@ -76,7 +75,7 @@ test (void)
 
   /* Check if we have everything we need */
   g_assert (compare_floats (grl_media_get_rating (media), 3.8f));
-  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), original_title), ==,
+  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), GRL_METADATA_KEY_ORIGINAL_TITLE), ==,
                    "Sherlock Holmes");
   /* There's only one poster/backdrop in the search result */
   g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), backdrop), ==,
diff --git a/test/test_tmdb_full_resolution.c b/test/test_tmdb_full_resolution.c
index 6a030f1..3a76fa2 100644
--- a/test/test_tmdb_full_resolution.c
+++ b/test/test_tmdb_full_resolution.c
@@ -44,8 +44,7 @@ test (void)
 {
   GError *error = NULL;
   GrlRegistry *registry;
-  GrlKeyID backdrop, posters, imdb_id, keywords, performer, producer;
-  GrlKeyID director, original_title;
+  GrlKeyID backdrop, posters, imdb_id;
   GrlOperationOptions *options = NULL;
   GrlMedia *media = NULL;
   GDateTime *date, *orig;
@@ -59,11 +58,6 @@ test (void)
   g_assert_cmpint (posters, !=, GRL_METADATA_KEY_INVALID);
   imdb_id = grl_registry_lookup_metadata_key (registry, "tmdb-imdb-id");
   g_assert_cmpint (imdb_id, !=, GRL_METADATA_KEY_INVALID);
-  keywords = GRL_METADATA_KEY_KEYWORD;
-  performer = GRL_METADATA_KEY_PERFORMER;
-  producer = GRL_METADATA_KEY_PRODUCER;
-  director = GRL_METADATA_KEY_DIRECTOR;
-  original_title = GRL_METADATA_KEY_ORIGINAL_TITLE;
 
   media = grl_media_video_new ();
   g_assert (media != NULL);
@@ -82,7 +76,7 @@ test (void)
 
   /* Check if we got everything we need for the fast resolution */
   g_assert (compare_floats (grl_media_get_rating (media), 3.8f));
-  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), original_title), ==,
+  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), GRL_METADATA_KEY_ORIGINAL_TITLE), ==,
                    "Sherlock Holmes");
   /* There's only one poster/backdrop in the search result */
   g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), backdrop), ==,
@@ -108,14 +102,14 @@ test (void)
   */
 
   g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), imdb_id), ==, "tt0988045");
-  g_assert_cmpint (grl_data_length (GRL_DATA (media), keywords), ==, 15);
+  g_assert_cmpint (grl_data_length (GRL_DATA (media), GRL_METADATA_KEY_KEYWORD), ==, 15);
 
-  g_assert_cmpint (grl_data_length (GRL_DATA (media), performer), ==, 10);
+  g_assert_cmpint (grl_data_length (GRL_DATA (media), GRL_METADATA_KEY_PERFORMER), ==, 10);
 
-  g_assert_cmpint (grl_data_length (GRL_DATA (media), producer), ==, 9);
+  g_assert_cmpint (grl_data_length (GRL_DATA (media), GRL_METADATA_KEY_PRODUCER), ==, 9);
 
-  g_assert_cmpint (grl_data_length (GRL_DATA (media), director), ==, 1);
-  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), director), ==, "Guy Ritchie");
+  g_assert_cmpint (grl_data_length (GRL_DATA (media), GRL_METADATA_KEY_DIRECTOR), ==, 1);
+  g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), GRL_METADATA_KEY_DIRECTOR), ==, "Guy Ritchie");
 
   /* TODO: See https://bugzilla.gnome.org/show_bug.cgi?id=679686#c13
   g_assert_cmpstr (grl_data_get_string (GRL_DATA (media), age_certs), ==,