diff options
author | Carlos Garcia Campos <cgarcia@igalia.com> | 2023-01-11 10:01:04 +0100 |
---|---|---|
committer | Carlos Garcia Campos <cgarcia@igalia.com> | 2023-01-11 10:01:04 +0100 |
commit | da3d4c9fc6959fc999c1cd1e3f66ffd8925574ec (patch) | |
tree | 332fd7cab1cdb823f2f1c4d333e3f461c9fc84c7 /tests | |
parent | 9a7cc5dd78f58f9587f315b90f5162361d722362 (diff) | |
download | libsoup-da3d4c9fc6959fc999c1cd1e3f66ffd8925574ec.tar.gz |
message: add SoupMessage::got-body-data signal
It can be used to monitor the progress of the read operation.
Fixes #319
Diffstat (limited to 'tests')
-rw-r--r-- | tests/http2-test.c | 13 | ||||
-rw-r--r-- | tests/streaming-test.c | 19 |
2 files changed, 32 insertions, 0 deletions
diff --git a/tests/http2-test.c b/tests/http2-test.c index d8a1e5f7..19cee8e1 100644 --- a/tests/http2-test.c +++ b/tests/http2-test.c @@ -718,16 +718,28 @@ do_logging_test (Test *test, gconstpointer data) } static void +msg_got_body_data_cb (SoupMessage *msg, + guint chunk_size, + guint64 *response_body_bytes_received) +{ + *response_body_bytes_received += chunk_size; +} + +static void do_metrics_size_test (Test *test, gconstpointer data) { GUri *uri; SoupMessage *msg; GBytes *response; GError *error = NULL; + guint64 response_body_bytes_received = 0; GBytes *bytes = g_bytes_new_static ("Test", sizeof ("Test")); uri = g_uri_parse_relative (base_uri, "/echo_post", SOUP_HTTP_URI_FLAGS, NULL); msg = soup_message_new_from_uri (SOUP_METHOD_POST, uri); + g_signal_connect (msg, "got-body-data", + G_CALLBACK (msg_got_body_data_cb), + &response_body_bytes_received); soup_message_set_request_body_from_bytes (msg, "text/plain", bytes); soup_message_add_flags (msg, SOUP_MESSAGE_COLLECT_METRICS); @@ -745,6 +757,7 @@ do_metrics_size_test (Test *test, gconstpointer data) g_assert_cmpuint (soup_message_metrics_get_response_header_bytes_received (metrics), >, 0); g_assert_cmpuint (soup_message_metrics_get_response_body_size (metrics), ==, g_bytes_get_size (response)); g_assert_cmpuint (soup_message_metrics_get_response_body_bytes_received (metrics), >, soup_message_metrics_get_response_body_size (metrics)); + g_assert_cmpuint (soup_message_metrics_get_response_body_bytes_received (metrics), ==, response_body_bytes_received); g_bytes_unref (response); g_bytes_unref (bytes); diff --git a/tests/streaming-test.c b/tests/streaming-test.c index 7b776d4c..22153325 100644 --- a/tests/streaming-test.c +++ b/tests/streaming-test.c @@ -98,6 +98,14 @@ msg_got_headers_cb (SoupMessage *msg, } static void +msg_got_body_data_cb (SoupMessage *msg, + guint chunk_size, + guint64 *response_body_bytes_received) +{ + *response_body_bytes_received += chunk_size; +} + +static void msg_got_body_cb (SoupMessage *msg, SoupMessageMetrics *metrics) { @@ -113,6 +121,7 @@ do_request (SoupSession *session, GUri *base_uri, char *path) GBytes *body; char *md5; SoupMessageMetrics *metrics; + guint64 response_body_bytes_received = 0; uri = g_uri_parse_relative (base_uri, path, SOUP_HTTP_URI_FLAGS, NULL); msg = soup_message_new_from_uri ("GET", uri); @@ -134,6 +143,9 @@ do_request (SoupSession *session, GUri *base_uri, char *path) g_signal_connect (msg, "got-headers", G_CALLBACK (msg_got_headers_cb), metrics); + g_signal_connect (msg, "got-body-data", + G_CALLBACK (msg_got_body_data_cb), + &response_body_bytes_received); g_signal_connect (msg, "got-body", G_CALLBACK (msg_got_body_cb), metrics); @@ -143,6 +155,7 @@ do_request (SoupSession *session, GUri *base_uri, char *path) soup_test_assert_message_status (msg, SOUP_STATUS_OK); g_assert_cmpint (g_bytes_get_size (body), ==, g_bytes_get_size (full_response)); g_assert_cmpint (soup_message_metrics_get_response_body_size (metrics), ==, g_bytes_get_size (body)); + g_assert_cmpuint (soup_message_metrics_get_response_body_bytes_received (metrics), ==, response_body_bytes_received); g_assert_cmpuint (soup_message_metrics_get_request_header_bytes_sent (metrics), >, 0); g_assert_cmpuint (soup_message_metrics_get_request_body_bytes_sent (metrics), ==, 0); g_assert_cmpuint (soup_message_metrics_get_request_body_size (metrics), ==, 0); @@ -152,6 +165,12 @@ do_request (SoupSession *session, GUri *base_uri, char *path) } else { g_assert_cmpuint (soup_message_metrics_get_response_body_bytes_received (metrics), ==, soup_message_metrics_get_response_body_size (metrics)); } + if (g_str_equal (path, "content-length")) { + goffset content_length; + + content_length = soup_message_headers_get_content_length (soup_message_get_response_headers (msg)); + g_assert_cmpuint (content_length, ==, response_body_bytes_received); + } md5 = g_compute_checksum_for_data (G_CHECKSUM_MD5, (guchar *)g_bytes_get_data (body, NULL), |