X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Ffrontend%2Fconnection_test.c;h=b4cc1878555198425a44e7b3bb4abe9acd691de5;hp=77828e6a8c4220d482a1eaaf69c6ec03b142fca0;hb=967d9181f6329ca00b910c0c458b1c6b60f2a0d6;hpb=4d93f084bf26672e322b82ce192c8beb5765e1d0 diff --git a/t/unit/frontend/connection_test.c b/t/unit/frontend/connection_test.c index 77828e6..b4cc187 100644 --- a/t/unit/frontend/connection_test.c +++ b/t/unit/frontend/connection_test.c @@ -31,11 +31,12 @@ #include "frontend/connection.h" #include "frontend/connection-private.h" -#include "utils/proto.h" -#include "libsysdb_test.h" +#include "utils/os.h" +#include "testutils.h" #include "utils/strbuf.h" +#include #include #include @@ -48,6 +49,8 @@ #include #include +static char username[1024]; + /* * private helper functions */ @@ -66,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) { @@ -99,6 +114,12 @@ mock_conn_create(void) unlink(tmp_file); + conn->read = mock_conn_read; + conn->write = mock_conn_write; + + conn->username = strdup(username); + assert(conn->username); + conn->cmd = SDB_CONNECTION_IDLE; conn->cmd_len = 0; return conn; @@ -174,22 +195,23 @@ connection_startup(sdb_conn_t *conn) { ssize_t check, expected; - expected = 2 * sizeof(uint32_t) + strlen("fakeuser"); + expected = 2 * sizeof(uint32_t) + strlen(username); check = sdb_connection_send(conn, SDB_CONNECTION_STARTUP, - (uint32_t)strlen("fakeuser"), "fakeuser"); + (uint32_t)strlen(username), username); fail_unless(check == expected, - "sdb_connection_send(STARTUP, fakeuser) = %zi; expected: %zi", - check, expected); + "sdb_connection_send(STARTUP, %s) = %zi; expected: %zi", + username, check, expected); mock_conn_rewind(conn); - check = sdb_connection_read(conn); + check = sdb_connection_handle(conn); fail_unless(check == expected, - "On startup: sdb_connection_read() = %zi; expected: %zi", + "On startup: sdb_connection_handle() = %zi; expected: %zi", check, expected); fail_unless(sdb_strbuf_len(conn->errbuf) == 0, - "sdb_connection_read() left %zu bytes in the error " - "buffer; expected: 0", sdb_strbuf_len(conn->errbuf)); + "sdb_connection_handle() left %zu bytes in the error " + "buffer (%s); expected: 0", sdb_strbuf_len(conn->errbuf), + sdb_strbuf_string(conn->errbuf)); mock_conn_truncate(conn); } /* connection_startup */ @@ -207,7 +229,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); @@ -220,12 +242,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: ", fd, conn); unlink(socket_path); sdb_connection_close(conn); + sdb_object_deref(SDB_OBJ(conn)); pthread_join(thr, NULL); } END_TEST @@ -244,7 +267,7 @@ START_TEST(test_conn_setup) { UINT32_MAX, NULL, NULL }, { SDB_CONNECTION_IDLE, "fakedata", "Authentication required" }, { SDB_CONNECTION_PING, NULL, "Authentication required" }, - { SDB_CONNECTION_STARTUP, "fakeuser", NULL }, + { SDB_CONNECTION_STARTUP, username, NULL }, { SDB_CONNECTION_PING, NULL, NULL }, { SDB_CONNECTION_IDLE, NULL, "Invalid command 0" }, { SDB_CONNECTION_PING, "fakedata", NULL }, @@ -274,25 +297,26 @@ START_TEST(test_conn_setup) } mock_conn_rewind(conn); - check = sdb_connection_read(conn); + check = sdb_connection_handle(conn); fail_unless(check == expected, - "sdb_connection_read() = %zi; expected: %zi", + "sdb_connection_handle() = %zi; expected: %zi", check, expected); fail_unless(sdb_strbuf_len(conn->buf) == 0, - "sdb_connection_read() left %zu bytes in the buffer; " + "sdb_connection_handle() left %zu bytes in the buffer; " "expected: 0", sdb_strbuf_len(conn->buf)); if (golden_data[i].err) { const char *err = sdb_strbuf_string(conn->errbuf); fail_unless(strcmp(err, golden_data[i].err) == 0, - "sdb_connection_read(): got error '%s'; " + "sdb_connection_handle(): got error '%s'; " "expected: '%s'", err, golden_data[i].err); } else fail_unless(sdb_strbuf_len(conn->errbuf) == 0, - "sdb_connection_read() left %zu bytes in the error " - "buffer; expected: 0", sdb_strbuf_len(conn->errbuf)); + "sdb_connection_handle() left %zu bytes in the error " + "buffer (%s); expected: 0", sdb_strbuf_len(conn->errbuf), + sdb_strbuf_string(conn->errbuf)); } mock_conn_destroy(conn); @@ -361,50 +385,50 @@ 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); - check = sdb_connection_read(conn); + check = sdb_connection_handle(conn); fail_unless(check == (ssize_t)msg_len, - "sdb_connection_read() = %zi; expected: %zu", + "sdb_connection_handle() = %zi; expected: %zu", check, msg_len); if (golden_data[i].buf_len) { /* partial commands need to be stored in the object */ fail_unless(conn->cmd == golden_data[i].code, - "sdb_connection_read() set partial command " + "sdb_connection_handle() set partial command " "to %u; expected: %u", conn->cmd, golden_data[i].code); fail_unless(conn->cmd_len > golden_data[i].buf_len, - "sdb_connection_read() set partial command length " + "sdb_connection_handle() set partial command length " "to %u; expected: > %u", conn->cmd_len, golden_data[i].buf_len); } else { fail_unless(conn->cmd == SDB_CONNECTION_IDLE, - "sdb_connection_read() did not reset command; " + "sdb_connection_handle() did not reset command; " "got %u; expected: %u", conn->cmd, SDB_CONNECTION_IDLE); fail_unless(conn->cmd_len == 0, - "sdb_connection_read() did not reset command length; " + "sdb_connection_handle() did not reset command length; " "got %u; expected: 0", conn->cmd_len); } fail_unless(sdb_strbuf_len(conn->buf) == golden_data[i].buf_len, - "sdb_connection_read() left %zu bytes in the buffer; " + "sdb_connection_handle() left %zu bytes in the buffer; " "expected: %zu", sdb_strbuf_len(conn->buf), golden_data[i].buf_len); if (golden_data[i].err) { const char *err = sdb_strbuf_string(conn->errbuf); fail_unless(strcmp(err, golden_data[i].err) == 0, - "sdb_connection_read(): got error '%s'; " + "sdb_connection_handle(): got error '%s'; " "expected: '%s'", err, golden_data[i].err); } else fail_unless(sdb_strbuf_len(conn->errbuf) == 0, - "sdb_connection_read() left %zu bytes in the error " + "sdb_connection_handle() left %zu bytes in the error " "buffer; expected: 0", sdb_strbuf_len(conn->errbuf)); } @@ -412,20 +436,22 @@ 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); + tc = tcase_create("core"); 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 : */