tests: modify queue-test to use 'check' framework

diff --git a/src/Makefile.am b/src/Makefile.am
index 18bccb4eae0c95cd3b9a7107b81dce1ddb2e8567..eca874b322ee428ff1f25e7d0c897dc1e95b7330 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -375,9 +375,9 @@ asyncmsgq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la l
 asyncmsgq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
 queue_test_SOURCES = tests/queue-test.c
-queue_test_CFLAGS = $(AM_CFLAGS)
+queue_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 queue_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la
-queue_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+queue_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
 rtpoll_test_SOURCES = tests/rtpoll-test.c
 rtpoll_test_CFLAGS = $(AM_CFLAGS)

diff --git a/src/tests/queue-test.c b/src/tests/queue-test.c
index 6b3e895405bbbb440998019c1e417b46e72bf7d5..814645e49f03ca46a8617df0f5a717756eb1ef00 100644 (file)
--- a/src/tests/queue-test.c
+++ b/src/tests/queue-test.c
@@ -25,21 +25,24 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <check.h>
+
 #include <pulsecore/queue.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 
-int main(int argc, char *argv[]) {
+START_TEST (queue_test) {
     pa_queue *q;
 
-    pa_assert_se(q = pa_queue_new());
+    q = pa_queue_new();
+    fail_unless(q != NULL);
 
-    pa_assert(pa_queue_isempty(q));
+    fail_unless(pa_queue_isempty(q));
 
     pa_queue_push(q, (void*) "eins");
     pa_log("%s\n", (char*) pa_queue_pop(q));
 
-    pa_assert(pa_queue_isempty(q));
+    fail_unless(pa_queue_isempty(q));
 
     pa_queue_push(q, (void*) "zwei");
     pa_queue_push(q, (void*) "drei");
@@ -53,12 +56,30 @@ int main(int argc, char *argv[]) {
     pa_log("%s\n", (char*) pa_queue_pop(q));
     pa_log("%s\n", (char*) pa_queue_pop(q));
 
-    pa_assert(pa_queue_isempty(q));
+    fail_unless(pa_queue_isempty(q));
 
     pa_queue_push(q, (void*) "sechs");
     pa_queue_push(q, (void*) "sieben");
 
     pa_queue_free(q, NULL);
+}
+END_TEST
 
-    return 0;
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    s = suite_create("Queue");
+    tc = tcase_create("queue");
+    tcase_add_test(tc, queue_test);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }