test: switch to new-style ASSERT_EQ macros (#4159)

Switch from old-style ASSERT macro to new-style ASSERT_EQ,... macros.

Using new-style macros makes it easier to debug test failures

Fixes: https://github.com/libuv/libuv/issues/2974

1 files changed, 30 insertions, 30 deletions

diff --git a/test/test-tcp-write-queue-order.c b/test/test-tcp-write-queue-order.c
index 7562c41d..e838c88a 100644
--- a/test/test-tcp-write-queue-order.c
+++ b/test/test-tcp-write-queue-order.c
@@ -67,7 +67,7 @@ static void connect_cb(uv_connect_t* req, int status) {
   int i;
   uv_buf_t buf;
 
-  ASSERT(status == 0);
+  ASSERT_OK(status);
   connect_cb_called++;
 
   buf = uv_buf_init(base, sizeof(base));
@@ -78,19 +78,19 @@ static void connect_cb(uv_connect_t* req, int status) {
                  &buf,
                  1,
                  write_cb);
-    ASSERT(r == 0);
+    ASSERT_OK(r);
   }
 }
 
 
 static void connection_cb(uv_stream_t* tcp, int status) {
-  ASSERT(status == 0);
+  ASSERT_OK(status);
 
-  ASSERT(0 == uv_tcp_init(tcp->loop, &incoming));
-  ASSERT(0 == uv_accept(tcp, (uv_stream_t*) &incoming));
+  ASSERT_OK(uv_tcp_init(tcp->loop, &incoming));
+  ASSERT_OK(uv_accept(tcp, (uv_stream_t*) &incoming));
 
-  ASSERT(0 == uv_timer_init(uv_default_loop(), &timer));
-  ASSERT(0 == uv_timer_start(&timer, timer_cb, 1000, 0));
+  ASSERT_OK(uv_timer_init(uv_default_loop(), &timer));
+  ASSERT_OK(uv_timer_start(&timer, timer_cb, 1000, 0));
 
   connection_cb_called++;
 }
@@ -99,11 +99,11 @@ static void connection_cb(uv_stream_t* tcp, int status) {
 static void start_server(void) {
   struct sockaddr_in addr;
 
-  ASSERT(0 == uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
+  ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
 
-  ASSERT(0 == uv_tcp_init(uv_default_loop(), &server));
-  ASSERT(0 == uv_tcp_bind(&server, (struct sockaddr*) &addr, 0));
-  ASSERT(0 == uv_listen((uv_stream_t*) &server, 128, connection_cb));
+  ASSERT_OK(uv_tcp_init(uv_default_loop(), &server));
+  ASSERT_OK(uv_tcp_bind(&server, (struct sockaddr*) &addr, 0));
+  ASSERT_OK(uv_listen((uv_stream_t*) &server, 128, connection_cb));
 }
 
 
@@ -114,25 +114,25 @@ TEST_IMPL(tcp_write_queue_order) {
 
   start_server();
 
-  ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
-
-  ASSERT(0 == uv_tcp_init(uv_default_loop(), &client));
-  ASSERT(0 == uv_tcp_connect(&connect_req,
-                             &client,
-                             (struct sockaddr*) &addr,
-                             connect_cb));
-  ASSERT(0 == uv_send_buffer_size((uv_handle_t*) &client, &buffer_size));
-
-  ASSERT(0 == uv_run(uv_default_loop(), UV_RUN_DEFAULT));
-
-  ASSERT(connect_cb_called == 1);
-  ASSERT(connection_cb_called == 1);
-  ASSERT(write_callbacks > 0);
-  ASSERT(write_cancelled_callbacks > 0);
-  ASSERT(write_callbacks +
-         write_error_callbacks +
-         write_cancelled_callbacks == REQ_COUNT);
-  ASSERT(close_cb_called == 3);
+  ASSERT_OK(uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
+
+  ASSERT_OK(uv_tcp_init(uv_default_loop(), &client));
+  ASSERT_OK(uv_tcp_connect(&connect_req,
+                           &client,
+                           (struct sockaddr*) &addr,
+                           connect_cb));
+  ASSERT_OK(uv_send_buffer_size((uv_handle_t*) &client, &buffer_size));
+
+  ASSERT_OK(uv_run(uv_default_loop(), UV_RUN_DEFAULT));
+
+  ASSERT_EQ(1, connect_cb_called);
+  ASSERT_EQ(1, connection_cb_called);
+  ASSERT_GT(write_callbacks, 0);
+  ASSERT_GT(write_cancelled_callbacks, 0);
+  ASSERT_EQ(write_callbacks +
+            write_error_callbacks +
+            write_cancelled_callbacks, REQ_COUNT);
+  ASSERT_EQ(3, close_cb_called);
 
   MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;