t/: Use ck_assert() instead of assert() in all tests.

[sysdb.git] / t / unit / frontend / connection_test.c

diff --git a/t/unit/frontend/connection_test.c b/t/unit/frontend/connection_test.c
index 9b0cde48da0ca11e725729fd01fe46318bc22d89..11a93a24fbafeb8b495549a9a89b4c56c7aecc2e 100644 (file)
--- a/t/unit/frontend/connection_test.c
+++ b/t/unit/frontend/connection_test.c
@@ -32,11 +32,10 @@
 #include "frontend/connection.h"
 #include "frontend/connection-private.h"
 #include "utils/os.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include "utils/strbuf.h"
 
-#include <assert.h>
 #include <check.h>
 
 #include <stdlib.h>
@@ -72,13 +71,13 @@ mock_conn_destroy(sdb_conn_t *conn)
 static ssize_t
 mock_conn_read(sdb_conn_t *conn, size_t len)
 {
-       return sdb_strbuf_read(conn->buf, conn->fd, len);
+       return sdb_strbuf_read(conn->buf, conn->fd, len);
 } /* conn_read */
 
 static ssize_t
 mock_conn_write(sdb_conn_t *conn, const void *buf, size_t len)
 {
-       return sdb_write(conn->fd, len, buf);
+       return sdb_write(conn->fd, len, buf);
 } /* conn_write */
 
 static sdb_conn_t *
@@ -118,7 +117,7 @@ mock_conn_create(void)
        conn->write = mock_conn_write;
 
        conn->username = strdup(username);
-       assert(conn->username);
+       ck_assert(conn->username != NULL);
 
        conn->cmd = SDB_CONNECTION_IDLE;
        conn->cmd_len = 0;
@@ -229,7 +228,7 @@ START_TEST(test_conn_accept)
 
        pthread_t thr;
 
-       conn = sdb_connection_accept(-1);
+       conn = sdb_connection_accept(-1, NULL, NULL);
        fail_unless(conn == NULL,
                        "sdb_connection_accept(-1) = %p; expected: NULL", conn);
 
@@ -242,7 +241,7 @@ START_TEST(test_conn_accept)
        fail_unless(check == 0,
                        "INTERNAL ERROR: pthread_create() = %i; expected: 0", check);
 
-       conn = sdb_connection_accept(fd);
+       conn = sdb_connection_accept(fd, NULL, NULL);
        fail_unless(conn != NULL,
                        "sdb_connection_accept(%d) = %p; expected: <conn>", fd, conn);
 
@@ -436,14 +435,11 @@ START_TEST(test_conn_io)
 }
 END_TEST
 
-Suite *
-fe_conn_suite(void)
+TEST_MAIN("frontend::connection")
 {
-       Suite *s = suite_create("frontend::connection");
        TCase *tc;
 
        char *tmp = sdb_get_current_user();
-       assert(tmp);
        strcpy(username, tmp);
        free(tmp);
 
@@ -451,10 +447,9 @@ fe_conn_suite(void)
        tcase_add_test(tc, test_conn_accept);
        tcase_add_test(tc, test_conn_setup);
        tcase_add_test(tc, test_conn_io);
-       suite_add_tcase(s, tc);
-
-       return s;
-} /* fe_conn_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */