Commit 6f8b6046 authored by Simon Giesecke's avatar Simon Giesecke

Problem: test_radio_dish not using unity

Solution: migrate to unity, and split test cases
parent cdc298f5
...@@ -874,7 +874,8 @@ tests_test_timers_SOURCES = tests/test_timers.cpp ...@@ -874,7 +874,8 @@ tests_test_timers_SOURCES = tests/test_timers.cpp
tests_test_timers_LDADD = src/libzmq.la tests_test_timers_LDADD = src/libzmq.la
tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
tests_test_radio_dish_LDADD = src/libzmq.la tests_test_radio_dish_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_radio_dish_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_udp_SOURCES = tests/test_udp.cpp tests_test_udp_SOURCES = tests/test_udp.cpp
tests_test_udp_LDADD = src/libzmq.la tests_test_udp_LDADD = src/libzmq.la
......
...@@ -28,165 +28,162 @@ ...@@ -28,165 +28,162 @@
*/ */
#include "testutil.hpp" #include "testutil.hpp"
#include "testutil_unity.hpp"
int msg_send (zmq_msg_t *msg_, void *s_, const char *group_, const char *body_) #include <unity.h>
void setUp ()
{ {
int rc = zmq_msg_init_size (msg_, strlen (body_)); setup_test_context ();
if (rc != 0) }
return rc;
memcpy (zmq_msg_data (msg_), body_, strlen (body_)); void tearDown ()
{
teardown_test_context ();
}
rc = zmq_msg_set_group (msg_, group_); void msg_send_expect_success (void *s_, const char *group_, const char *body_)
if (rc != 0) { {
zmq_msg_close (msg_); zmq_msg_t msg;
return rc; const size_t len = strlen (body_);
} TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, len));
rc = zmq_msg_send (msg_, s_, 0); memcpy (zmq_msg_data (&msg), body_, len);
zmq_msg_close (msg_); TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_group (&msg, group_));
return rc; int rc = zmq_msg_send (&msg, s_, 0);
TEST_ASSERT_EQUAL_INT ((int) len, rc);
// TODO isn't the msg closed by zmq_msg_send?
zmq_msg_close (&msg);
} }
int msg_recv_cmp (zmq_msg_t *msg_, void msg_recv_cmp (void *s_, const char *group_, const char *body_)
void *s_,
const char *group_,
const char *body_)
{ {
int rc = zmq_msg_init (msg_); zmq_msg_t msg;
if (rc != 0) const size_t len = strlen (body_);
return -1; TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
int recv_rc = zmq_msg_recv (msg_, s_, 0); int recv_rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, s_, 0));
if (recv_rc == -1) TEST_ASSERT_EQUAL_INT (len, recv_rc);
return -1;
TEST_ASSERT_EQUAL_STRING (group_, zmq_msg_group (&msg));
if (strcmp (zmq_msg_group (msg_), group_) != 0) {
zmq_msg_close (msg_); TEST_ASSERT_EQUAL_STRING_LEN (body_, zmq_msg_data (&msg), len);
return -1;
} zmq_msg_close (&msg);
char *body = (char *) malloc (sizeof (char) * (zmq_msg_size (msg_) + 1));
memcpy (body, zmq_msg_data (msg_), zmq_msg_size (msg_));
body[zmq_msg_size (msg_)] = '\0';
if (strcmp (body, body_) != 0) {
zmq_msg_close (msg_);
return -1;
}
zmq_msg_close (msg_);
free (body);
return recv_rc;
} }
int main (void) void test_leave_unjoined_fails ()
{ {
size_t len = MAX_SOCKET_STRING; void *dish = test_context_socket (ZMQ_DISH);
char my_endpoint[MAX_SOCKET_STRING];
setup_test_environment ();
void *ctx = zmq_ctx_new ();
assert (ctx);
void *radio = zmq_socket (ctx, ZMQ_RADIO); // Leaving a group which we didn't join
void *dish = zmq_socket (ctx, ZMQ_DISH); TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_leave (dish, "Movies"));
int rc = zmq_bind (radio, "tcp://127.0.0.1:*"); test_context_socket_close (dish);
assert (rc == 0); }
rc = zmq_getsockopt (radio, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
// Leaving a group which we didn't join void test_join_too_long_fails ()
rc = zmq_leave (dish, "Movies"); {
assert (rc == -1); void *dish = test_context_socket (ZMQ_DISH);
// Joining too long group // Joining too long group
char too_long_group[ZMQ_GROUP_MAX_LENGTH + 2]; char too_long_group[ZMQ_GROUP_MAX_LENGTH + 2];
for (int index = 0; index < ZMQ_GROUP_MAX_LENGTH + 2; index++) for (int index = 0; index < ZMQ_GROUP_MAX_LENGTH + 2; index++)
too_long_group[index] = 'A'; too_long_group[index] = 'A';
too_long_group[ZMQ_GROUP_MAX_LENGTH + 1] = '\0'; too_long_group[ZMQ_GROUP_MAX_LENGTH + 1] = '\0';
rc = zmq_join (dish, too_long_group); TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, too_long_group));
assert (rc == -1);
// Joining test_context_socket_close (dish);
rc = zmq_join (dish, "Movies"); }
assert (rc == 0);
void test_join_twice_fails ()
{
void *dish = test_context_socket (ZMQ_DISH);
TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
// Duplicate Joining // Duplicate Joining
rc = zmq_join (dish, "Movies"); TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, "Movies"));
assert (rc == -1);
test_context_socket_close (dish);
}
void test_radio_dish ()
{
size_t len = MAX_SOCKET_STRING;
char my_endpoint[MAX_SOCKET_STRING];
void *radio = test_context_socket (ZMQ_RADIO);
bind_loopback_ipv4 (radio, my_endpoint, len);
void *dish = test_context_socket (ZMQ_DISH);
// Joining
TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
// Connecting // Connecting
rc = zmq_connect (dish, my_endpoint); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dish, my_endpoint));
assert (rc == 0);
msleep (SETTLE_TIME); msleep (SETTLE_TIME);
zmq_msg_t msg;
// This is not going to be sent as dish only subscribe to "Movies" // This is not going to be sent as dish only subscribe to "Movies"
rc = msg_send (&msg, radio, "TV", "Friends"); msg_send_expect_success (radio, "TV", "Friends");
assert (rc == 7);
// This is going to be sent to the dish // This is going to be sent to the dish
rc = msg_send (&msg, radio, "Movies", "Godfather"); msg_send_expect_success (radio, "Movies", "Godfather");
assert (rc == 9);
// Check the correct message arrived // Check the correct message arrived
rc = msg_recv_cmp (&msg, dish, "Movies", "Godfather"); msg_recv_cmp (dish, "Movies", "Godfather");
assert (rc == 9);
// Join group during connection optvallen // Join group during connection optvallen
rc = zmq_join (dish, "TV"); TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
assert (rc == 0);
zmq_sleep (1); zmq_sleep (1);
// This should arrive now as we joined the group // This should arrive now as we joined the group
rc = msg_send (&msg, radio, "TV", "Friends"); msg_send_expect_success (radio, "TV", "Friends");
assert (rc == 7);
// Check the correct message arrived // Check the correct message arrived
rc = msg_recv_cmp (&msg, dish, "TV", "Friends"); msg_recv_cmp (dish, "TV", "Friends");
assert (rc == 7);
// Leaving groupr // Leaving group
rc = zmq_leave (dish, "TV"); TEST_ASSERT_SUCCESS_ERRNO (zmq_leave (dish, "TV"));
assert (rc == 0);
zmq_sleep (1); zmq_sleep (1);
// This is not going to be sent as dish only subscribe to "Movies" // This is not going to be sent as dish only subscribe to "Movies"
rc = msg_send (&msg, radio, "TV", "Friends"); msg_send_expect_success (radio, "TV", "Friends");
assert (rc == 7);
// This is going to be sent to the dish // This is going to be sent to the dish
rc = msg_send (&msg, radio, "Movies", "Godfather"); msg_send_expect_success (radio, "Movies", "Godfather");
assert (rc == 9);
// test zmq_poll with dish // test zmq_poll with dish
zmq_pollitem_t items[] = { zmq_pollitem_t items[] = {
{radio, 0, ZMQ_POLLIN, 0}, // read publications {radio, 0, ZMQ_POLLIN, 0}, // read publications
{dish, 0, ZMQ_POLLIN, 0}, // read subscriptions {dish, 0, ZMQ_POLLIN, 0}, // read subscriptions
}; };
rc = zmq_poll (items, 2, 2000); int rc = zmq_poll (items, 2, 2000);
assert (rc == 1); TEST_ASSERT_EQUAL_INT (1, rc);
assert (items[1].revents == ZMQ_POLLIN); TEST_ASSERT_EQUAL_INT (ZMQ_POLLIN, items[1].revents);
// Check the correct message arrived // Check the correct message arrived
rc = msg_recv_cmp (&msg, dish, "Movies", "Godfather"); msg_recv_cmp (dish, "Movies", "Godfather");
assert (rc == 9);
rc = zmq_close (dish); test_context_socket_close (dish);
assert (rc == 0); test_context_socket_close (radio);
}
rc = zmq_close (radio);
assert (rc == 0);
rc = zmq_ctx_term (ctx); int main (void)
assert (rc == 0); {
setup_test_environment ();
return 0; UNITY_BEGIN ();
RUN_TEST (test_leave_unjoined_fails);
RUN_TEST (test_join_too_long_fails);
RUN_TEST (test_join_twice_fails);
RUN_TEST (test_radio_dish);
return UNITY_END ();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment