From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> --- unit/test-gobex-transfer.c | 59 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/unit/test-gobex-transfer.c b/unit/test-gobex-transfer.c index 9cb1f46..95d4a93 100644 --- a/unit/test-gobex-transfer.c +++ b/unit/test-gobex-transfer.c @@ -70,6 +70,9 @@ static guint8 conn_req[] = { G_OBEX_OP_CONNECT | FINAL_BIT, 0x00, 0x07, static guint8 conn_rsp[] = { G_OBEX_RSP_SUCCESS | FINAL_BIT, 0x00, 0x0c, 0x10, 0x00, 0x10, 0x00, 0xcb, 0x00, 0x00, 0x00, 0x01 }; +static guint8 conn_rsp_2[] = { G_OBEX_RSP_SUCCESS | FINAL_BIT, 0x00, 0x0c, + 0x10, 0x00, 0x10, 0x00, 0xcb, 0x00, + 0x00, 0x00, 0x02 }; static guint8 conn_get_req_first[] = { G_OBEX_OP_GET | FINAL_BIT, 0x00, 0x28, G_OBEX_HDR_CONNECTION, 0x00, 0x00, 0x00, 0x01, @@ -77,6 +80,12 @@ static guint8 conn_get_req_first[] = { G_OBEX_OP_GET | FINAL_BIT, 0x00, 0x28, 'f', 'o', 'o', '/', 'b', 'a', 'r', '\0', G_OBEX_HDR_NAME, 0x00, 0x15, 0, 'f', 0, 'i', 0, 'l', 0, 'e', 0, '.', 0, 't', 0, 'x', 0, 't', 0, 0 }; +static guint8 conn_get_req_first_2[] = { G_OBEX_OP_GET | FINAL_BIT, 0x00, 0x28, + G_OBEX_HDR_CONNECTION, 0x00, 0x00, 0x00, 0x02, + G_OBEX_HDR_TYPE, 0x00, 0x0b, + 'f', 'o', 'o', '/', 'b', 'a', 'r', '\0', + G_OBEX_HDR_NAME, 0x00, 0x15, + 0, 'f', 0, 'i', 0, 'l', 0, 'e', 0, '.', 0, 't', 0, 'x', 0, 't', 0, 0 }; static guint8 hdr_type[] = "foo/bar"; static guint8 body_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; @@ -766,7 +775,6 @@ static void test_conn_get_req(void) create_endpoints(&obex, &io, SOCK_STREAM); d.obex = obex; - d.provide_delay = 200; cond = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL; io_id = g_io_add_watch(io, cond, test_io_cb, &d); @@ -793,6 +801,54 @@ static void test_conn_get_req(void) g_assert_no_error(d.err); } +static void test_conn_get_rsp(void) +{ + GIOChannel *io; + GIOCondition cond; + guint io_id, timer_id; + GObex *obex; + struct test_data d = { 0, NULL, { + { conn_rsp_2, sizeof(conn_rsp_2) }, + { get_rsp_first, sizeof(get_rsp_first) }, + { get_rsp_last, sizeof(get_rsp_last) } }, { + { conn_get_req_first_2, sizeof(conn_get_req_first_2) }, + { get_req_last, sizeof(get_req_last) }, + { NULL, 0 } } }; + + create_endpoints(&obex, &io, SOCK_STREAM); + d.obex = obex; + + cond = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL; + io_id = g_io_add_watch(io, cond, test_io_cb, &d); + + d.mainloop = g_main_loop_new(NULL, FALSE); + + timer_id = g_timeout_add_seconds(1, test_timeout, &d); + + g_obex_add_request_function(obex, G_OBEX_OP_CONNECT, + handle_conn_rsp, &d); + + g_obex_add_request_function(obex, G_OBEX_OP_GET, + handle_get, &d); + + g_io_channel_write_chars(io, (char *) conn_req, sizeof(conn_req), + NULL, &d.err); + g_assert_no_error(d.err); + + g_main_loop_run(d.mainloop); + + g_assert_cmpuint(d.count, ==, 2); + + g_main_loop_unref(d.mainloop); + + g_source_remove(timer_id); + g_io_channel_unref(io); + g_source_remove(io_id); + g_obex_unref(obex); + + g_assert_no_error(d.err); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); @@ -815,6 +871,7 @@ int main(int argc, char *argv[]) g_test_add_func("/gobex/test_put_req_random", test_put_req_random); g_test_add_func("/gobex/test_conn_get_req", test_conn_get_req); + g_test_add_func("/gobex/test_conn_get_rsp", test_conn_get_rsp); g_test_run(); -- 1.7.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html