[libdmapsharing] Adjust tests and recent changes to satisfy pedansee

[W. Michael Petullo <wmpetullo src gnome org>]

commit eed8c7c18f1e22003730fa3f406671d09600ba81
Author: W. Michael Petullo <mike flyn org>
Date:   Thu May 7 23:22:26 2020 -0500

    Adjust tests and recent changes to satisfy pedansee
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/Makefile.am           |  8 ++++----
 libdmapsharing/dmap-av-connection.c  |  2 +-
 libdmapsharing/dmap-av-record.c      | 10 +++++-----
 libdmapsharing/dmap-av-share.c       |  6 +++---
 libdmapsharing/dmap-md5.c            |  4 ++--
 libdmapsharing/dmap-utils.c          | 10 +++++-----
 libdmapsharing/test-dmap-av-record.c | 12 +++++-------
 7 files changed, 25 insertions(+), 27 deletions(-)
---
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index e6dda6f..776dde9 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -290,8 +290,8 @@ if HAVE_PEDANSEE
                j=$$(cat $$i | awk '/^G_DEFINE_DYNAMIC_TYPE_EXTENDED/ { x = 1 } { if (x == 1) printf("%s ", 
$$0) }' | sed 's/[^(]*(\([^,]*\),.*/\1/g'); \
                echo -n $${j}_private_offset\;; \
        done >>pedansee.conf
-       for i in $$(grep -l G_DEFINE_ABSTRACT_TYPE_WITH_CODE *.c); do \
-               j=$$(cat $$i | awk '/^G_DEFINE_ABSTRACT_TYPE_WITH_CODE/ { x = 1 } { if (x == 1) printf("%s ", 
$$0) }' | sed 's/[^,]*, \([^,]*\),.*/\1/g'); \
+       for i in $$(grep -l G_DEFINE_ABSTRACT_TYPE *.c); do \
+               j=$$(cat $$i | awk '/^G_DEFINE_ABSTRACT_TYPE/ { x = 1 } { if (x == 1) printf("%s ", $$0) }' | 
sed 's/[^,]*, \([^,]*\),.*/\1/g'); \
                echo -n $${j}_init\;; \
                echo -n $${j}_class_init\;; \
                echo -n $${j}_get_type_once\;; \
@@ -299,8 +299,8 @@ if HAVE_PEDANSEE
                echo -n $${j}_get_instance_private\;; \
                echo -n $${j}_class_intern_init\;; \
        done >>pedansee.conf
-       for i in $$(grep -l G_DEFINE_ABSTRACT_TYPE_WITH_CODE *.c); do \
-               j=$$(cat $$i | awk '/^G_DEFINE_ABSTRACT_TYPE_WITH_CODE/ { x = 1 } { if (x == 1) printf("%s ", 
$$0) }' | sed 's/[^(]*(\([^,]*\),.*/\1/g'); \
+       for i in $$(grep -l G_DEFINE_ABSTRACT_TYPE *.c); do \
+               j=$$(cat $$i | awk '/^G_DEFINE_ABSTRACT_TYPE/ { x = 1 } { if (x == 1) printf("%s ", $$0) }' | 
sed 's/[^(]*(\([^,]*\),.*/\1/g'); \
                echo -n $${j}_private_offset\;; \
        done >>pedansee.conf
 
diff --git a/libdmapsharing/dmap-av-connection.c b/libdmapsharing/dmap-av-connection.c
index 6a71c28..8f38c69 100644
--- a/libdmapsharing/dmap-av-connection.c
+++ b/libdmapsharing/dmap-av-connection.c
@@ -226,7 +226,7 @@ START_TEST(_get_query_metadata_test)
 }
 END_TEST
 
-START_TEST(dmap_av_connection_new_test)
+START_TEST(_new_test)
 {
        char *str;
        int   port;
diff --git a/libdmapsharing/dmap-av-record.c b/libdmapsharing/dmap-av-record.c
index efc9278..3f617bd 100644
--- a/libdmapsharing/dmap-av-record.c
+++ b/libdmapsharing/dmap-av-record.c
@@ -263,7 +263,7 @@ dmap_av_record_cmp_by_album (gpointer a, gpointer b, DmapDb * db)
 
 #define TMP "/tmp/libdmapsharing-test-XXXXXX"
 
-START_TEST(dmap_av_record_read_test)
+START_TEST(_read_test)
 {
        DmapAvRecord *record;
        GInputStream *stream;
@@ -314,7 +314,7 @@ START_TEST(dmap_av_record_read_test)
 }
 END_TEST
 
-START_TEST(dmap_av_record_read_bad_path_test)
+START_TEST(_read_bad_path_test)
 {
        DmapAvRecord *record;
        GError *error = NULL;
@@ -331,7 +331,7 @@ START_TEST(dmap_av_record_read_bad_path_test)
 }
 END_TEST
 
-START_TEST(dmap_av_record_itunes_compat_test)
+START_TEST(_itunes_compat_test)
 {
        DmapAvRecord *record;
        gboolean ok;
@@ -346,7 +346,7 @@ START_TEST(dmap_av_record_itunes_compat_test)
 }
 END_TEST
 
-START_TEST(dmap_av_record_itunes_compat_no_test)
+START_TEST(_itunes_compat_no_test)
 {
        DmapAvRecord *record;
        gboolean ok;
@@ -361,7 +361,7 @@ START_TEST(dmap_av_record_itunes_compat_no_test)
 }
 END_TEST
 
-START_TEST(dmap_av_record_cmp_by_album_test)
+START_TEST(_cmp_by_album_test)
 {
        gint id;
        gchar *album;
diff --git a/libdmapsharing/dmap-av-share.c b/libdmapsharing/dmap-av-share.c
index 1bf3ed4..f024b40 100644
--- a/libdmapsharing/dmap-av-share.c
+++ b/libdmapsharing/dmap-av-share.c
@@ -1075,7 +1075,7 @@ START_TEST(_get_meta_data_map_test)
 }
 END_TEST
 
-START_TEST(dmap_av_share_new_test)
+START_TEST(_new_test)
 {
        DmapDb *db;
        DmapContainerRecord *container_record;
@@ -1121,7 +1121,7 @@ START_TEST(dmap_av_share_new_test)
 }
 END_TEST
 
-START_TEST(dmap_av_share_serve_publish_test)
+START_TEST(_serve_publish_test)
 {
        DmapDb *db;
        gboolean ok;
@@ -1161,7 +1161,7 @@ START_TEST(dmap_av_share_serve_publish_test)
 }
 END_TEST
 
-START_TEST(dmap_av_share_serve_publish_collision_test)
+START_TEST(_serve_publish_collision_test)
 {
        DmapDb *db;
        gboolean ok;
diff --git a/libdmapsharing/dmap-md5.c b/libdmapsharing/dmap-md5.c
index 7e0e04f..486dc3e 100644
--- a/libdmapsharing/dmap-md5.c
+++ b/libdmapsharing/dmap-md5.c
@@ -548,7 +548,7 @@ dmap_md5_progressive_final (DmapHashContext *context,
 
 #include <check.h>
 
-START_TEST(test_dmap_md5_generate_v3_h2)
+START_TEST(_test_generate_v3_h2)
 {
        guchar hash[33] = { 0 };
        guchar *url = (guchar *) "test://foo";
@@ -557,7 +557,7 @@ START_TEST(test_dmap_md5_generate_v3_h2)
 }
 END_TEST
 
-START_TEST(test_dmap_md5_progressive)
+START_TEST(_test_progressive)
 {
        guchar buf[16] = { 0 };
        guchar hash1[33] = { 0 };
diff --git a/libdmapsharing/dmap-utils.c b/libdmapsharing/dmap-utils.c
index 35fca9a..71c4186 100644
--- a/libdmapsharing/dmap-utils.c
+++ b/libdmapsharing/dmap-utils.c
@@ -51,31 +51,31 @@ done:
 
 #include <check.h>
 
-START_TEST(dmap_utils_mime_to_format_test_wav)
+START_TEST(_mime_to_format_test_wav)
 {
        ck_assert_str_eq(dmap_utils_mime_to_format("audio/wav"), "wav");
 }
 END_TEST
 
-START_TEST(dmap_utils_mime_to_format_test_mp3)
+START_TEST(_mime_to_format_test_mp3)
 {
        ck_assert_str_eq(dmap_utils_mime_to_format("audio/mp3"), "mp3");
 }
 END_TEST
 
-START_TEST(dmap_utils_mime_to_format_test_quicktime)
+START_TEST(_mime_to_format_test_quicktime)
 {
        ck_assert_str_eq(dmap_utils_mime_to_format("video/quicktime"), "mp4");
 }
 END_TEST
 
-START_TEST(dmap_utils_mime_to_format_test_null)
+START_TEST(_mime_to_format_test_null)
 {
        ck_assert_ptr_null(dmap_utils_mime_to_format(NULL));
 }
 END_TEST
 
-START_TEST(dmap_utils_mime_to_format_test_bad)
+START_TEST(_mime_to_format_test_bad)
 {
        ck_assert_ptr_null(dmap_utils_mime_to_format("bad/mime"));
 }
diff --git a/libdmapsharing/test-dmap-av-record.c b/libdmapsharing/test-dmap-av-record.c
index 8b693f9..e9a5cb4 100644
--- a/libdmapsharing/test-dmap-av-record.c
+++ b/libdmapsharing/test-dmap-av-record.c
@@ -244,18 +244,16 @@ test_dmap_av_record_get_property (GObject *object,
         }
 }
 
-static gboolean _itunes_compat (DmapAvRecord *record)
+static gboolean
+_itunes_compat (DmapAvRecord *record)
 {
        const gchar *format = TEST_DMAP_AV_RECORD (record)->priv->format;
 
-       if (! strcmp (format, "mp3")) {
-               return TRUE;
-       } else {
-               return FALSE;
-       }
+       return ! strcmp (format, "mp3");
 }
 
-static GInputStream *_read (DmapAvRecord *record, GError **error)
+static GInputStream *
+_read (DmapAvRecord *record, GError **error)
 {
        GFile *file;
        GInputStream *stream;