X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Ffrontend%2Fconnection_test.c;h=9b0cde48da0ca11e725729fd01fe46318bc22d89;hp=de5b01007f4521a8a81b19dfa2810095c468c479;hb=ad77ec3d257ac66d74e91452d098882247abdc0a;hpb=330d8bc42e2577a01288f8a7bd606f2efafa9aa6 diff --git a/t/unit/frontend/connection_test.c b/t/unit/frontend/connection_test.c index de5b010..9b0cde4 100644 --- a/t/unit/frontend/connection_test.c +++ b/t/unit/frontend/connection_test.c @@ -31,7 +31,6 @@ #include "frontend/connection.h" #include "frontend/connection-private.h" -#include "utils/proto.h" #include "utils/os.h" #include "libsysdb_test.h" @@ -70,6 +69,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,6 +114,9 @@ mock_conn_create(void) unlink(tmp_file); + conn->read = mock_conn_read; + conn->write = mock_conn_write; + conn->username = strdup(username); assert(conn->username); @@ -234,6 +248,7 @@ START_TEST(test_conn_accept) unlink(socket_path); sdb_connection_close(conn); + sdb_object_deref(SDB_OBJ(conn)); pthread_join(thr, NULL); } END_TEST @@ -370,9 +385,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);