From 386de330307dd7b98dd533c6bcdafdf72cbb36df Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Sun, 24 Mar 2019 13:21:43 -0400 Subject: [PATCH] Problem: code from bind_loopback_tipc is duplicated Solution: call bind_loopback_tipc where applicable --- tests/test_address_tipc.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/test_address_tipc.cpp b/tests/test_address_tipc.cpp index 778822f7..55f3c267 100644 --- a/tests/test_address_tipc.cpp +++ b/tests/test_address_tipc.cpp @@ -28,6 +28,8 @@ */ #include "testutil.hpp" +#include "testutil_unity.hpp" + #include @@ -68,7 +70,6 @@ void test_tipc_port_name_and_domain () void test_tipc_port_identity () { char endpoint[256]; - size_t size = 256; unsigned int z, c, n, ref; void *ctx = zmq_ctx_new (); @@ -80,15 +81,11 @@ void test_tipc_port_identity () void *sc = zmq_socket (ctx, ZMQ_REQ); TEST_ASSERT_NOT_NULL (sc); - // Test binding to random Port Identity - int rc = zmq_bind (sb, "tipc://<*>"); - TEST_ASSERT_EQUAL_INT (0, rc); + // Test binding to random Port Identity and + // test resolving assigned address, should return a properly formatted string + bind_loopback_tipc (sb, endpoint, sizeof endpoint); - // Test resolving assigned address, should return a properly formatted string - rc = zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, &endpoint[0], &size); - TEST_ASSERT_EQUAL_INT (0, rc); - - rc = sscanf (&endpoint[0], "tipc://<%u.%u.%u:%u>", &z, &c, &n, &ref); + int rc = sscanf (&endpoint[0], "tipc://<%u.%u.%u:%u>", &z, &c, &n, &ref); TEST_ASSERT_EQUAL_INT (4, rc); TEST_ASSERT_NOT_EQUAL_MESSAGE (