aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2025-01-05 11:47:03 -0800
committerGarrett D'Amore <garrett@damore.org>2025-01-05 22:39:17 -0800
commitbce6a79fc55852032e9d653b099a121353aaa238 (patch)
tree6e6aa44e73ea7e671a50103539c55443df8c4dc2 /tests
parentd31844817a5b304a894c5b963cd52aeb9e47c627 (diff)
downloadnng-bce6a79fc55852032e9d653b099a121353aaa238.tar.gz
nng-bce6a79fc55852032e9d653b099a121353aaa238.tar.bz2
nng-bce6a79fc55852032e9d653b099a121353aaa238.zip
http: changing transaction API to inline req and res structures
This is a step towards simplifying this API and ultimately simplifying the HTTP callback API used for the server side.
Diffstat (limited to 'tests')
-rw-r--r--tests/httpclient.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/tests/httpclient.c b/tests/httpclient.c
index ca6c521f..f3307fc1 100644
--- a/tests/httpclient.c
+++ b/tests/httpclient.c
@@ -1,5 +1,5 @@
//
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
@@ -136,20 +136,13 @@ TestMain("HTTP Client", {
});
Convey("Connection reuse works", {
+ nng_http_res *res;
nng_http_req *req;
- nng_http_res *res1;
- nng_http_res *res2;
void *data;
size_t len;
nng_http_conn *conn = NULL;
- So(nng_http_req_alloc(&req, url) == 0);
- So(nng_http_res_alloc(&res1) == 0);
- So(nng_http_res_alloc(&res2) == 0);
Reset({
- nng_http_req_free(req);
- nng_http_res_free(res1);
- nng_http_res_free(res2);
if (conn != NULL) {
nng_http_conn_close(conn);
}
@@ -160,17 +153,20 @@ TestMain("HTTP Client", {
So(nng_aio_result(aio) == 0);
conn = nng_aio_get_output(aio, 0);
- nng_http_conn_transact(conn, req, res1, aio);
+ req = nng_http_conn_req(conn);
+ res = nng_http_conn_res(conn);
+ So(nng_http_req_set_url(req, url) == 0);
+ nng_http_conn_transact(conn, aio);
nng_aio_wait(aio);
So(nng_aio_result(aio) == 0);
- So(nng_http_res_get_status(res1) == 200);
- nng_http_res_get_data(res1, &data, &len);
+ So(nng_http_res_get_status(res) == 200);
+ nng_http_res_get_data(res, &data, &len);
- nng_http_conn_transact(conn, req, res2, aio);
+ nng_http_conn_transact(conn, aio);
nng_aio_wait(aio);
So(nng_aio_result(aio) == 0);
- So(nng_http_res_get_status(res2) == 200);
- nng_http_res_get_data(res2, &data, &len);
+ So(nng_http_res_get_status(res) == 200);
+ nng_http_res_get_data(res, &data, &len);
});
});