Merge pull request #3211 from sigiesec/migrate-and-extend-probe-router-test

Migrate and extend probe router test
This commit is contained in:
Luca Boccassi 2018-08-13 17:40:07 +01:00 committed by GitHub
commit dbe289509e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 41 deletions

View File

@ -538,7 +538,8 @@ tests_test_router_handover_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_router_handover_CPPFLAGS = ${UNITY_CPPFLAGS} tests_test_router_handover_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_probe_router_SOURCES = tests/test_probe_router.cpp tests_test_probe_router_SOURCES = tests/test_probe_router.cpp
tests_test_probe_router_LDADD = src/libzmq.la tests_test_probe_router_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_probe_router_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_stream_SOURCES = tests/test_stream.cpp tests_test_stream_SOURCES = tests/test_stream.cpp
tests_test_stream_LDADD = src/libzmq.la tests_test_stream_LDADD = src/libzmq.la

View File

@ -28,59 +28,94 @@
*/ */
#include "testutil.hpp" #include "testutil.hpp"
#include "testutil_unity.hpp"
int main (void) void setUp ()
{ {
setup_test_environment (); setup_test_context ();
size_t len = MAX_SOCKET_STRING; }
char my_endpoint[MAX_SOCKET_STRING];
void *ctx = zmq_ctx_new ();
assert (ctx);
void tearDown ()
{
teardown_test_context ();
}
void test_probe_router_router ()
{
// Create server and bind to endpoint // Create server and bind to endpoint
void *server = zmq_socket (ctx, ZMQ_ROUTER); void *server = test_context_socket (ZMQ_ROUTER);
assert (server);
int rc = zmq_bind (server, "tcp://127.0.0.1:*"); char my_endpoint[MAX_SOCKET_STRING];
assert (rc == 0); bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
// Create client and connect to server, doing a probe // Create client and connect to server, doing a probe
void *client = zmq_socket (ctx, ZMQ_ROUTER); void *client = test_context_socket (ZMQ_ROUTER);
assert (client); TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
rc = zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1);
assert (rc == 0);
int probe = 1; int probe = 1;
rc = zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)); TEST_ASSERT_SUCCESS_ERRNO (
assert (rc == 0); zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
rc = zmq_connect (client, my_endpoint); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
assert (rc == 0);
// We expect a routing id=X + empty message from client // We expect a routing id=X + empty message from client
recv_string_expect_success (server, "X", 0);
unsigned char buffer[255]; unsigned char buffer[255];
rc = zmq_recv (server, buffer, 255, 0); TEST_ASSERT_EQUAL_INT (
assert (rc == 1); 0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0)));
assert (buffer[0] == 'X');
rc = zmq_recv (server, buffer, 255, 0);
assert (rc == 0);
// Send a message to client now // Send a message to client now
rc = zmq_send (server, "X", 1, ZMQ_SNDMORE); send_string_expect_success (server, "X", ZMQ_SNDMORE);
assert (rc == 1); send_string_expect_success (server, "Hello", 0);
rc = zmq_send (server, "Hello", 5, 0);
assert (rc == 5);
rc = zmq_recv (client, buffer, 255, 0); // receive the routing ID, which is auto-generated in this case, since the
assert (rc == 5); // peer did not set one explicitly
TEST_ASSERT_EQUAL_INT (
5, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 255, 0)));
rc = zmq_close (server); recv_string_expect_success (client, "Hello", 0);
assert (rc == 0);
rc = zmq_close (client); test_context_socket_close (server);
assert (rc == 0); test_context_socket_close (client);
}
rc = zmq_ctx_term (ctx);
assert (rc == 0); void test_probe_router_dealer ()
{
return 0; // Create server and bind to endpoint
void *server = test_context_socket (ZMQ_ROUTER);
char my_endpoint[MAX_SOCKET_STRING];
bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
// Create client and connect to server, doing a probe
void *client = test_context_socket (ZMQ_DEALER);
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
int probe = 1;
TEST_ASSERT_SUCCESS_ERRNO (
zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
// We expect a routing id=X + empty message from client
recv_string_expect_success (server, "X", 0);
unsigned char buffer[255];
TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0));
// Send a message to client now
send_string_expect_success (server, "X", ZMQ_SNDMORE);
send_string_expect_success (server, "Hello", 0);
recv_string_expect_success (client, "Hello", 0);
test_context_socket_close (server);
test_context_socket_close (client);
}
int main ()
{
setup_test_environment ();
UNITY_BEGIN ();
RUN_TEST (test_probe_router_router);
RUN_TEST (test_probe_router_dealer);
return UNITY_END ();
} }