GNOME.org
 

[easytag/wip/musicbrainz-support] Added test cases to Makefile

commit 83d45f68e07f20da950103ecfd27d5239f2da56c
Author: Abhinav <abhijangda hotmail com>
Date:   Sun Jun 15 22:36:47 2014 +0530

    Added test cases to Makefile

 Makefile.am                     |   20 +++++++++++---------
 configure.ac                    |    5 ++++-
 po/POTFILES.in                  |    2 ++
 src/mb_search.c                 |   20 ++++++++++++++++++++
 tests/test-musicbrainz.c        |   29 +++++++++++++++++++++--------
 tests/test-musicbrainz_server.c |   32 ++++++++++++++++++--------------
 6 files changed, 76 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b162531..f317070 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,8 +334,8 @@ test-report perf-report full-report: $(check_PROGRAMS)
        }
 
 check_PROGRAMS = \
-       tests/test-scan
-       tests/test-musicbrainz
+       tests/test-scan \
+       tests/test-musicbrainz \
        tests/test-musicbrainz_server
 
 tests_test_scan_CPPFLAGS = \
@@ -357,16 +357,17 @@ tests_test_scan_LDADD = \
 tests_test_musicbrainz_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_builddir) \
-       $(DEPRECATED_CPPFLAGS)
+       $(DEPRECATED_CPPFLAGS) \
+          -D TEST
 
 tests_test_musicbrainz_CFLAGS = \
        $(WARN_CFLAGS) \
-       $(EASYTAG_CFLAGS)
+       $(EASYTAG_CFLAGS) \
+          -D TEST
 
 tests_test_musicbrainz_SOURCES = \
-       tests/test-musibrainz.c \
-       src/mb_search.c \
-       src/musicbrainz_dialog.c
+       tests/test-musicbrainz.c \
+          src/mb_search.c
 
 tests_test_musicbrainz_LDADD = \
        $(EASYTAG_LIBS)
@@ -374,14 +375,15 @@ tests_test_musicbrainz_LDADD = \
 tests_test_musicbrainz_server_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_builddir) \
-       $(DEPRECATED_CPPFLAGS)
+       $(DEPRECATED_CPPFLAGS) \
+          -DTEST
 
 tests_test_musicbrainz_server_CFLAGS = \
        $(WARN_CFLAGS) \
        $(EASYTAG_CFLAGS)
 
 tests_test_musicbrainz_server_SOURCES = \
-       tests/test-musibrainz_server.c
+       tests/test-musicbrainz_server.c
 
 tests_test_musicbrainz_server_LDADD = \
        $(EASYTAG_LIBS)
diff --git a/configure.ac b/configure.ac
index 9be506b..c9c1bfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,9 +295,12 @@ AS_IF([test "x$have_wavpack" != "xno"],
 dnl Check for libdiscid
 LIBDISCID_DEPS="libdiscid >= 0.2.2"
 
+dnl Check for libsoup
+LIBSOUP_DEPS="libsoup-2.4 >= 2.4"
+
 dnl Check the pkg-config dependencies
 GIO_DEPS="gio-2.0 >= 2.32.0" dnl For g_file_new_tmp()
-PKG_CHECK_MODULES([EASYTAG], [$libmusicbrainz_DEPS $GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS 
$FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS $LIBDISCID_DEPS])
+PKG_CHECK_MODULES([EASYTAG], [$libmusicbrainz_DEPS $GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS 
$FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS $LIBDISCID_DEPS $LIBSOUP_DEPS])
 
 dnl Check for winsock
 AC_SEARCH_LIBS([gethostbyname], [nsl socket], [],
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86b4ae4..a879af0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,3 +33,5 @@ src/wavpack_header.c
 src/wavpack_tag.c
 src/win32/win32dep.c
 src/musicbrainz_dialog.c
+src/mbentityview.c
+src/mb_search.c
diff --git a/src/mb_search.c b/src/mb_search.c
index 5d8f847..58c36e4 100644
--- a/src/mb_search.c
+++ b/src/mb_search.c
@@ -121,7 +121,9 @@ et_musicbrainz_search_in_entity (enum MB_ENTITY_TYPE child_type,
                 param_values[0] = "artists release-groups";
                 message = g_strdup_printf (_("Found %d Album(s)"),
                                            mb5_release_list_size (list));
+#ifndef TEST
                 et_show_status_msg_in_idle (message);
+#endif
                 g_free (message);
 
                 for (i = 0; i < mb5_release_list_size (list); i++)
@@ -154,7 +156,9 @@ et_musicbrainz_search_in_entity (enum MB_ENTITY_TYPE child_type,
                         message = g_strdup_printf (_("Retrieving %s (%d/%d)"),
                                                    buf, i+1,
                                                    mb5_release_list_size (list));
+#ifndef TEST
                         et_show_status_msg_in_idle (message);
+#endif
                         g_free (message);
 
                         size = mb5_release_get_id ((Mb5Release)release,
@@ -221,7 +225,9 @@ et_musicbrainz_search_in_entity (enum MB_ENTITY_TYPE child_type,
                         track_list = mb5_medium_get_tracklist (medium);
                         message = g_strdup_printf (_("Found %d Track(s)"),
                                                    mb5_track_list_size (list));
+#ifndef TEST
                         et_show_status_msg_in_idle (message);
+#endif
                         g_free (message);
 
                         for (j = 0; j < mb5_track_list_size (track_list); j++)
@@ -247,7 +253,9 @@ et_musicbrainz_search_in_entity (enum MB_ENTITY_TYPE child_type,
                             message = g_strdup_printf (_("Retrieving %s (%d/%d)"),
                                                        buf, j,
                                                        mb5_track_list_size (track_list));
+#ifndef TEST
                             et_show_status_msg_in_idle (message);
+#endif
                             g_free (message);
 
                             size = mb5_recording_get_id (recording,
@@ -443,7 +451,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                 param_values [0] = "artists release-groups";
                 message = g_strdup_printf (_("Found %d Album(s)"),
                                            mb5_release_list_size (list));
+#ifndef TEST
                 et_show_status_msg_in_idle (message);
+#endif
                 g_free (message);
 
                 for (i = 0; i < mb5_release_list_size (list); i++)
@@ -477,7 +487,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                         message = g_strdup_printf (_("Retrieving %s (%d/%d)"),
                                                    buf, i,
                                                    mb5_release_list_size (list));
+#ifndef TEST
                         et_show_status_msg_in_idle (message);
+#endif
                         g_free (message);
 
                         mb5_release_get_id ((Mb5Release)release,
@@ -527,7 +539,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                 param_values[0] = "releases artists";
                 message = g_strdup_printf (_("Found %d Track(s)"),
                                            mb5_recording_list_size (list));
+#ifndef TEST
                 et_show_status_msg_in_idle (message);
+#endif
                 g_free (message);
 
                 for (i = 0; i < mb5_recording_list_size (list); i++)
@@ -556,7 +570,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                     message = g_strdup_printf (_("Retrieving %s (%d/%d)"),
                                                buf, i,
                                                mb5_track_list_size (list));
+#ifndef TEST
                     et_show_status_msg_in_idle (message);
+#endif
                     g_free (message);
 
                     mb5_recording_get_id (recording,
@@ -607,7 +623,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                 param_values [0] = "artists release-groups";
                 message = g_strdup_printf (_("Found %d Album(s)"),
                                            mb5_release_list_size (list));
+#ifndef TEST
                 et_show_status_msg_in_idle (message);
+#endif
                 g_free (message);
 
                 for (i = 0; i < mb5_release_list_size (list); i++)
@@ -641,7 +659,9 @@ et_musicbrainz_search (gchar *string, enum MB_ENTITY_TYPE type, GNode *root,
                         message = g_strdup_printf (_("Retrieving %s (%d/%d)"),
                                                    buf, i,
                                                    mb5_release_list_size (list));
+#ifndef TEST
                         et_show_status_msg_in_idle (message);
+#endif
                         g_free (message);
 
                         mb5_release_get_id ((Mb5Release)release,
diff --git a/tests/test-musicbrainz.c b/tests/test-musicbrainz.c
index 6da895d..0297bb2 100644
--- a/tests/test-musicbrainz.c
+++ b/tests/test-musicbrainz.c
@@ -4,7 +4,13 @@
 
 static gchar name[NAME_MAX_SIZE];
 static gchar mbid[NAME_MAX_SIZE];
-void
+
+static void
+mb_search_test ();
+static void
+mb_search_in_test ();
+
+static void
 mb_search_test ()
 {
     GNode *mbTreeNode;
@@ -65,7 +71,7 @@ mb_search_test ()
     }
 }
 
-void
+static void
 mb_search_in_test ()
 {
     GNode *mbTreeNode;
@@ -142,12 +148,19 @@ mb_search_in_test ()
 }
 
 int
-main(int argc, char** argv)
+main (int argc, char** argv)
 {
-    g_test_init(&argc, &argv, NULL);
+    gchar *arg[2];
+    GPid pid;
+    arg [0] = "test-musicbrainz_server";
+    arg [1] = NULL;
+    g_test_init (&argc, &argv, NULL);
+    if (g_spawn_async (NULL, &arg[0], NULL, G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &pid, NULL));
+    printf ("Running\n");
     et_musicbrainz_search_set_server_port ("localhost", 8088);
-    g_test_add_func("/musicbrainz/mb_search", mb_search_test);
-    g_test_add_func("/musicbrainz/mb_search_in", mb_search_in_test);
-
-    return g_test_run();
+    g_test_add_func ("/musicbrainz/mb_search", mb_search_test);
+    g_test_add_func ("/musicbrainz/mb_search_in", mb_search_in_test);
+    g_test_run ();
+    kill (pid, SIGKILL);
+    return 0;
 }
\ No newline at end of file
diff --git a/tests/test-musicbrainz_server.c b/tests/test-musicbrainz_server.c
index c1a1133..6a6068d 100644
--- a/tests/test-musicbrainz_server.c
+++ b/tests/test-musicbrainz_server.c
@@ -10,7 +10,7 @@ default_handler (SoupServer *server, SoupMessage *msg, const char *path,
     gchar *response_text;
     gsize length;
 
-    g_file_get_contents ("./error.xml", &response_text, &length, NULL);
+    g_file_get_contents ("./tests/error.xml", &response_text, &length, NULL);
     soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
                                "error", strlen ("error"));
     soup_message_set_status (msg, 200);
@@ -24,7 +24,7 @@ westlife_handler (SoupServer *server, SoupMessage *msg, const char *path,
     gchar *response_text;
     gsize length;
     printf ("dsfsdfsdf\n");
-    if (g_file_get_contents ("./artist-westlife_releases.xml", &response_text,
+    if (g_file_get_contents ("./tests/artist-westlife_releases.xml", &response_text,
                              &length, NULL))
     {
         soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
@@ -42,7 +42,7 @@ westlife_release_info_handler (SoupServer *server, SoupMessage *msg, const char
     gchar *response_text;
     gsize length;
 
-    if (g_file_get_contents ("./artist-westlife_release_info.xml", &response_text,
+    if (g_file_get_contents ("./tests/artist-westlife_release_info.xml", &response_text,
                              &length, NULL))
     {
         soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
@@ -59,7 +59,7 @@ i_still_handler (SoupServer *server, SoupMessage *msg, const char *path,
     gchar *response_text;
     gsize length;
 
-    if (g_file_get_contents ("./album-i_still_info.xml", &response_text,
+    if (g_file_get_contents ("./tests/album-i_still_info.xml", &response_text,
                              &length, NULL))
     {
         soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
@@ -82,7 +82,7 @@ never_gone_handler (SoupServer *server, SoupMessage *msg, const char *path,
     //printf ("%s\n", value);
     if (value && !g_strcmp0 (value, "artists release-groups"))
     {
-       if (g_file_get_contents ("./album-never_gone_info.xml", &response_text,
+       if (g_file_get_contents ("./tests/album-never_gone_info.xml", &response_text,
                                 &length, NULL))
         {
             soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
@@ -93,7 +93,7 @@ never_gone_handler (SoupServer *server, SoupMessage *msg, const char *path,
 
     else if (value && !g_strcmp0 (value, "recordings"))
     {
-       if (g_file_get_contents ("./album-never_gone_recordings.xml",
+       if (g_file_get_contents ("./tests/album-never_gone_recordings.xml",
                                 &response_text, &length, NULL))
         {
             soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
@@ -116,7 +116,7 @@ artist_handler (SoupServer *server, SoupMessage *msg, const char *path,
     printf ("ddd %s\n", path);
     if (value && !strcmp ((gchar *)value, "artist:Westlife"))
     {
-        if (g_file_get_contents ("./artist-westlife.xml", &response_text,
+        if (g_file_get_contents ("./tests/artist-westlife.xml", &response_text,
                                  &length, NULL))
         {
             //printf ("sending message %s\n", response_text);
@@ -128,7 +128,7 @@ artist_handler (SoupServer *server, SoupMessage *msg, const char *path,
         }                                        
     }
 
-    g_file_get_contents ("./error.xml", &response_text, &length, NULL);
+    g_file_get_contents ("./tests/error.xml", &response_text, &length, NULL);
     soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
                                response_text, strlen (response_text));
     soup_message_set_status (msg, 200);
@@ -147,7 +147,7 @@ release_handler (SoupServer *server, SoupMessage *msg, const char *path,
 
     if (value && !strcmp ((gchar *)value, "release:Never Gone"))
     {
-        if (g_file_get_contents ("./album-never_gone.xml", &response_text,
+        if (g_file_get_contents ("./tests/album-never_gone.xml", &response_text,
                                  &length, NULL))
         {//printf ("sending message %s\n", response_text);
 
@@ -159,7 +159,7 @@ release_handler (SoupServer *server, SoupMessage *msg, const char *path,
         }                                        
     }
 
-    g_file_get_contents ("./error.xml", &response_text, &length, NULL);
+    g_file_get_contents ("./tests/error.xml", &response_text, &length, NULL);
     soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
                                response_text, strlen (response_text));
     soup_message_set_status (msg, 200);
@@ -178,7 +178,7 @@ recording_handler (SoupServer *server, SoupMessage *msg, const char *path,
     printf ("%s\n", value);
     if (value && !strcmp ((gchar *)value, "recordings:I Still"))
     {
-        if (g_file_get_contents ("./recordings-i_still.xml", &response_text,
+        if (g_file_get_contents ("./tests/recordings-i_still.xml", &response_text,
                                  &length, NULL))
         {printf ("sending message %s\n", response_text);
 
@@ -190,7 +190,7 @@ recording_handler (SoupServer *server, SoupMessage *msg, const char *path,
         }
     }
 
-    g_file_get_contents ("./error.xml", &response_text, &length, NULL);
+    g_file_get_contents ("./tests/error.xml", &response_text, &length, NULL);
     soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
                                response_text, strlen (response_text));
     soup_message_set_status (msg, 200);
@@ -204,18 +204,19 @@ discid_handler (SoupServer *server, SoupMessage *msg, const char *path,
     gchar *response_text;
     gsize length;
 
-    g_file_get_contents ("./metadata.xml", &response_text, &length, NULL);
+    g_file_get_contents ("./tests/metadata.xml", &response_text, &length, NULL);
     soup_message_set_response (msg, "application/xml", SOUP_MEMORY_TAKE,
                                response_text, strlen (response_text));
     soup_message_set_status (msg, 200);
 }
 
-void
+int
 main ()
 {
     SoupServer *server;
 
     g_type_init ();
+
     server = soup_server_new (SOUP_SERVER_PORT, 8088, NULL);    
     soup_server_add_handler (server, "/", (SoupServerCallback)default_handler,
                              NULL, NULL);
@@ -241,5 +242,8 @@ main ()
                              NULL);
     soup_server_add_handler (server, "/ws/2/discid",
                              (SoupServerCallback)discid_handler, NULL, NULL);
+
     soup_server_run (server);
+
+    return 0;
 }
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]