From f4363aeb44e06a2d01608ad4053de1c8f7d6a51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9?= Date: Mon, 16 Mar 2026 20:51:03 -0500 Subject: [PATCH] test: remove unused headers and use newer ASSERT macros (#4760) --- test/test-poll.c | 2 +- test/test-udp-try-send.c | 55 +++++++++++++++------------------------- 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/test/test-poll.c b/test/test-poll.c index e291e7377..46da49d7f 100644 --- a/test/test-poll.c +++ b/test/test-poll.c @@ -663,7 +663,7 @@ TEST_IMPL(poll_bad_fdtype) { #ifdef __APPLE__ ASSERT_OK(pipe(fd)); /* Pipes should be permitted in kqueue. */ - ASSERT_EQ(0, uv_poll_init(uv_default_loop(), &poll_handle, fd[0])); + ASSERT_OK(uv_poll_init(uv_default_loop(), &poll_handle, fd[0])); ASSERT_OK(close(fd[0])); ASSERT_OK(close(fd[1])); diff --git a/test/test-udp-try-send.c b/test/test-udp-try-send.c index 6181fbbbf..d423720b1 100644 --- a/test/test-udp-try-send.c +++ b/test/test-udp-try-send.c @@ -22,8 +22,6 @@ #include "uv.h" #include "task.h" -#include -#include #include #define CHECK_HANDLE(handle) \ @@ -86,32 +84,6 @@ TEST_IMPL(udp_try_send) { struct sockaddr_in addr; static char buffer[64 * 1024]; uv_buf_t buf; - int r; - - ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr)); - - r = uv_udp_init(uv_default_loop(), &server); - ASSERT_OK(r); - - r = uv_udp_bind(&server, (const struct sockaddr*) &addr, 0); - ASSERT_OK(r); - - r = uv_udp_recv_start(&server, alloc_cb, sv_recv_cb); - ASSERT_OK(r); - - ASSERT_OK(uv_ip4_addr("127.0.0.1", TEST_PORT, &addr)); - - r = uv_udp_init(uv_default_loop(), &client); - ASSERT_OK(r); - - buf = uv_buf_init(buffer, sizeof(buffer)); - - r = uv_udp_try_send(&client, &buf, 0, (const struct sockaddr*) &addr); - ASSERT_EQ(r, UV_EINVAL); - - r = uv_udp_try_send(&client, &buf, 1, (const struct sockaddr*) &addr); - ASSERT_EQ(r, UV_EMSGSIZE); - uv_buf_t* bufs[] = {&buf, &buf}; unsigned int nbufs[] = {1, 1}; struct sockaddr* addrs[] = { @@ -119,22 +91,35 @@ TEST_IMPL(udp_try_send) { (struct sockaddr*) &addr, }; + ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr)); + ASSERT_OK(uv_udp_init(uv_default_loop(), &server)); + ASSERT_OK(uv_udp_bind(&server, (const struct sockaddr*) &addr, 0)); + ASSERT_OK(uv_udp_recv_start(&server, alloc_cb, sv_recv_cb)); + ASSERT_OK(uv_ip4_addr("127.0.0.1", TEST_PORT, &addr)); + ASSERT_OK(uv_udp_init(uv_default_loop(), &client)); + + buf = uv_buf_init(buffer, sizeof(buffer)); + + ASSERT_EQ(uv_udp_try_send(&client, &buf, 0, (const struct sockaddr*) &addr), + UV_EINVAL); + + ASSERT_EQ(uv_udp_try_send(&client, &buf, 1, (const struct sockaddr*) &addr), + UV_EMSGSIZE); + ASSERT_EQ(0, sv_recv_cb_called); buf = uv_buf_init("HELO", 4); - r = uv_udp_try_send2(&client, 2, bufs, nbufs, addrs, /*flags*/0); - ASSERT_EQ(r, 2); + ASSERT_EQ(2, uv_udp_try_send2(&client, 2, bufs, nbufs, addrs, /*flags*/0)); - uv_run(uv_default_loop(), UV_RUN_DEFAULT); + ASSERT_OK(uv_run(uv_default_loop(), UV_RUN_DEFAULT)); ASSERT_EQ(2, sv_recv_cb_called); - r = uv_udp_recv_start(&server, alloc_cb, sv_recv_cb); - ASSERT_OK(r); + ASSERT_OK(uv_udp_recv_start(&server, alloc_cb, sv_recv_cb)); buf = uv_buf_init("EXIT", 4); - r = uv_udp_try_send(&client, &buf, 1, (const struct sockaddr*) &addr); - ASSERT_EQ(4, r); + ASSERT_EQ(uv_udp_try_send(&client, &buf, 1, (const struct sockaddr*) &addr), + 4); uv_run(uv_default_loop(), UV_RUN_DEFAULT);