Another bunch of tests refactored

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/tests/msg.c b/tests/msg.c
index 1ac2244..5b7fb15 100644
--- a/tests/msg.c
+++ b/tests/msg.c
@@ -23,7 +23,7 @@
 #include "../src/nn.h"
 #include "../src/pair.h"
 
-#include "../src/utils/err.c"
+#include "testutil.h"
 
 #include <string.h>
 
@@ -39,14 +39,10 @@ int main ()
     struct nn_iovec iov;
     struct nn_msghdr hdr;
 
-    sb = nn_socket (AF_SP, NN_PAIR);
-    errno_assert (sb != -1);
-    rc = nn_bind (sb, SOCKET_ADDRESS);
-    errno_assert (rc >= 0);
-    sc = nn_socket (AF_SP, NN_PAIR);
-    errno_assert (sc != -1);
-    rc = nn_connect (sc, SOCKET_ADDRESS);
-    errno_assert (rc >= 0);
+    sb = test_socket (AF_SP, NN_PAIR);
+    test_bind (sb, SOCKET_ADDRESS);
+    sc = test_socket (AF_SP, NN_PAIR);
+    test_connect (sc, SOCKET_ADDRESS);
 
     buf1 = nn_allocmsg (256, 0);
     alloc_assert (buf1);
@@ -94,10 +90,8 @@ int main ()
     rc = nn_freemsg (buf2);
     errno_assert (rc == 0);
 
-    rc = nn_close (sc);
-    errno_assert (rc == 0);
-    rc = nn_close (sb);
-    errno_assert (rc == 0);
+    test_close (sc);
+    test_close (sb);
 
     return 0;
 }