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 de5b01007f4521a8a81b19dfa2810095c468c479..11a93a24fbafeb8b495549a9a89b4c56c7aecc2e 100644 (file)
--- a/t/unit/frontend/connection_test.c
+++ b/t/unit/frontend/connection_test.c
@@ -31,13 +31,11 @@
 
 #include "frontend/connection.h"
 #include "frontend/connection-private.h"
-#include "utils/proto.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>
@@ -70,6 +68,18 @@ mock_conn_destroy(sdb_conn_t *conn)
        free(conn);
 } /* mock_conn_destroy */
 
+static ssize_t
+mock_conn_read(sdb_conn_t *conn, size_t 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);
+} /* conn_write */
+
 static sdb_conn_t *
 mock_conn_create(void)
 {
@@ -103,8 +113,11 @@ mock_conn_create(void)
 
        unlink(tmp_file);
 
+       conn->read = mock_conn_read;
+       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;
@@ -215,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);
 
@@ -228,12 +241,13 @@ 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);
 
        unlink(socket_path);
        sdb_connection_close(conn);
+       sdb_object_deref(SDB_OBJ(conn));
        pthread_join(thr, NULL);
 }
 END_TEST
@@ -370,9 +384,9 @@ START_TEST(test_conn_io)
                memcpy(buffer + offset, golden_data[i].msg,
                                strlen(golden_data[i].msg));
 
-               check = sdb_proto_send(conn->fd, msg_len, buffer);
+               check = sdb_write(conn->fd, msg_len, buffer);
                fail_unless(check == (ssize_t)msg_len,
-                               "sdb_proto_send(%s) = %zi; expected: %zu",
+                               "sdb_write(%s) = %zi; expected: %zu",
                                check, msg_len);
 
                mock_conn_rewind(conn);
@@ -421,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);
 
@@ -436,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 : */