[telepathy-salut/master] add GibberUnixTransport tests to tests suite

[Guillaume Desmottes]

---
 lib/gibber/tests/Makefile.am                   |    3 ++-
 lib/gibber/tests/check-gibber-unix-transport.c |    8 +++++---
 lib/gibber/tests/check-gibber.h                |    1 +
 lib/gibber/tests/check-main.c                  |    1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/gibber/tests/Makefile.am b/lib/gibber/tests/Makefile.am
index cc13722..be18ad9 100644
--- a/lib/gibber/tests/Makefile.am
+++ b/lib/gibber/tests/Makefile.am
@@ -69,7 +69,8 @@ check_main_SOURCES =                             \
     check-gibber-iq-helper.c                     \
     check-gibber-listener.c                      \
     check-gibber-xmpp-connection-listener.c      \
-    check-gibber-xmpp-error.c
+    check-gibber-xmpp-error.c                    \
+    check-gibber-unix-transport.c
 
 check_main_LDADD = \
     @CHECK_LIBS@ \
diff --git a/lib/gibber/tests/check-gibber-unix-transport.c b/lib/gibber/tests/check-gibber-unix-transport.c
index dfbc9f8..bc0ad36 100644
--- a/lib/gibber/tests/check-gibber-unix-transport.c
+++ b/lib/gibber/tests/check-gibber-unix-transport.c
@@ -40,6 +40,8 @@
 gboolean got_connection;
 GibberUnixTransport *unix_transport;
 
+#define DATA "What a nice data"
+
 static void
 new_connection_cb (GibberListener *listener,
                    GibberTransport *connection,
@@ -54,7 +56,6 @@ new_connection_cb (GibberListener *listener,
   char control[CMSG_SPACE (sizeof (struct ucred))];
   struct cmsghdr *ch;
   struct ucred *cred;
-  const gchar *data = "What a nice data";
   gchar buffer[128];
 
   got_connection = TRUE;
@@ -63,7 +64,7 @@ new_connection_cb (GibberListener *listener,
   gibber_transport_block_receiving (connection, TRUE);
 
   g_assert (gibber_unix_transport_send_credentials (unix_transport,
-        (guint8 *) data, strlen (data) + 1));
+        (guint8 *) DATA, strlen (DATA) + 1));
 
   fd = GIBBER_FD_TRANSPORT (connection)->fd;
 
@@ -85,7 +86,7 @@ new_connection_cb (GibberListener *listener,
   received = recvmsg (fd, &msg, 0);
   /* check the received data */
   g_assert (received != -1);
-  g_assert (strcmp (data, buffer) == 0);
+  g_assert (strcmp (DATA, buffer) == 0);
 
   /* check the credentials */
   ch = CMSG_FIRSTHDR (&msg);
@@ -109,6 +110,7 @@ START_TEST (test_send_credentials)
   ret = unlink (path);
   fail_if (ret == -1 && errno != ENOENT);
 
+  got_connection = FALSE;
   mainloop = g_main_loop_new (NULL, FALSE);
 
   listener_unix = gibber_listener_new ();
diff --git a/lib/gibber/tests/check-gibber.h b/lib/gibber/tests/check-gibber.h
index edd747f..95bc208 100644
--- a/lib/gibber/tests/check-gibber.h
+++ b/lib/gibber/tests/check-gibber.h
@@ -16,5 +16,6 @@ TCase *make_gibber_iq_helper_tcase (void);
 TCase *make_gibber_listener_tcase (void);
 TCase *make_gibber_xmpp_connection_listener_tcase (void);
 TCase *make_gibber_xmpp_error_tcase (void);
+TCase *make_gibber_unix_transport_tcase (void);
 
 #endif /* #ifndef __CHECK_GIBBER_H__ */
diff --git a/lib/gibber/tests/check-main.c b/lib/gibber/tests/check-main.c
index cf01cfe..685d22f 100644
--- a/lib/gibber/tests/check-main.c
+++ b/lib/gibber/tests/check-main.c
@@ -30,6 +30,7 @@ make_gibber_suite (void)
     suite_add_tcase (s, make_gibber_listener_tcase ());
     suite_add_tcase (s, make_gibber_xmpp_connection_listener_tcase ());
     suite_add_tcase (s, make_gibber_xmpp_error_tcase ());
+    suite_add_tcase (s, make_gibber_unix_transport_tcase ());
 
     return s;
 }
-- 
1.5.6.5