3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00
Code Issues Projects Releases Wiki Activity

Problem: test_sockopt_hwm not using unity

Browse Source 
Solution: migrate test_sockopt_hwm to unity
This commit is contained in:
Simon Giesecke 2018-02-11 12:29:06 +01:00
parent a5738529e8
commit 922053237f
2 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -625,7 +625,8 @@ tests_test_atomics_SOURCES = tests/test_atomics.cpp
tests_test_atomics_LDADD = src/libzmq.la tests_test_atomics_LDADD = src/libzmq.la
tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
tests_test_sockopt_hwm_LDADD = src/libzmq.la tests_test_sockopt_hwm_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_sockopt_hwm_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp
tests_test_setsockopt_LDADD = src/libzmq.la tests_test_setsockopt_LDADD = src/libzmq.la

60
tests/test_sockopt_hwm.cpp
View File

@ -29,6 +29,16 @@
#include "testutil.hpp" #include "testutil.hpp"
#include <unity.h>
void setUp ()
{
}
void tearDown ()
{
}
const int MAX_SENDS = 10000; const int MAX_SENDS = 10000;
void test_change_before_connected () void test_change_before_connected ()
@ -41,9 +51,9 @@ void test_change_before_connected ()
int val = 2; int val = 2;
rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val)); rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
zmq_connect (connect_socket, "inproc://a"); zmq_connect (connect_socket, "inproc://a");
zmq_bind (bind_socket, "inproc://a"); zmq_bind (bind_socket, "inproc://a");
@ -51,15 +61,15 @@ void test_change_before_connected ()
size_t placeholder = sizeof (val); size_t placeholder = sizeof (val);
val = 0; val = 0;
rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder); rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
assert (val == 2); TEST_ASSERT_EQUAL_INT (2, val);
int send_count = 0; int send_count = 0;
while (send_count < MAX_SENDS while (send_count < MAX_SENDS
&& zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0) && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
++send_count; ++send_count;
assert (send_count == 4); TEST_ASSERT_EQUAL_INT (4, send_count);
zmq_close (bind_socket); zmq_close (bind_socket);
zmq_close (connect_socket); zmq_close (connect_socket);
@ -76,29 +86,29 @@ void test_change_after_connected ()
int val = 1; int val = 1;
rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val)); rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
zmq_connect (connect_socket, "inproc://a"); zmq_connect (connect_socket, "inproc://a");
zmq_bind (bind_socket, "inproc://a"); zmq_bind (bind_socket, "inproc://a");
val = 5; val = 5;
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
size_t placeholder = sizeof (val); size_t placeholder = sizeof (val);
val = 0; val = 0;
rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder); rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
assert (val == 5); TEST_ASSERT_EQUAL_INT (5, val);
int send_count = 0; int send_count = 0;
while (send_count < MAX_SENDS while (send_count < MAX_SENDS
&& zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0) && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
++send_count; ++send_count;
assert (send_count == 6); TEST_ASSERT_EQUAL_INT (6, send_count);
zmq_close (bind_socket); zmq_close (bind_socket);
zmq_close (connect_socket); zmq_close (connect_socket);
@ -120,7 +130,8 @@ int test_fill_up_to_hwm (void *socket, int sndhwm)
{ {
int send_count = send_until_wouldblock (socket); int send_count = send_until_wouldblock (socket);
fprintf (stderr, "sndhwm==%i, send_count==%i\n", sndhwm, send_count); fprintf (stderr, "sndhwm==%i, send_count==%i\n", sndhwm, send_count);
assert (send_count <= sndhwm + 1 && send_count > (sndhwm / 10)); TEST_ASSERT_LESS_OR_EQUAL_INT (sndhwm + 1, send_count);
TEST_ASSERT_GREATER_THAN_INT (sndhwm / 10, send_count);
return send_count; return send_count;
} }
@ -134,11 +145,11 @@ void test_decrease_when_full ()
int val = 1; int val = 1;
rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val)); rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
int sndhwm = 100; int sndhwm = 100;
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
zmq_bind (bind_socket, "inproc://a"); zmq_bind (bind_socket, "inproc://a");
zmq_connect (connect_socket, "inproc://a"); zmq_connect (connect_socket, "inproc://a");
@ -149,14 +160,14 @@ void test_decrease_when_full ()
// Decrease snd hwm // Decrease snd hwm
sndhwm = 70; sndhwm = 70;
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
int sndhwm_read = 0; int sndhwm_read = 0;
size_t sndhwm_read_size = sizeof (sndhwm_read); size_t sndhwm_read_size = sizeof (sndhwm_read);
rc = rc =
zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm_read, &sndhwm_read_size); zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm_read, &sndhwm_read_size);
assert (rc == 0); TEST_ASSERT_EQUAL_INT (0, rc);
assert (sndhwm_read == sndhwm); TEST_ASSERT_EQUAL_INT (sndhwm, sndhwm_read);
msleep (SETTLE_TIME); msleep (SETTLE_TIME);
@ -167,11 +178,11 @@ void test_decrease_when_full ()
read_count < MAX_SENDS read_count < MAX_SENDS
&& zmq_recv (connect_socket, &read_data, sizeof (read_data), ZMQ_DONTWAIT) && zmq_recv (connect_socket, &read_data, sizeof (read_data), ZMQ_DONTWAIT)
== sizeof (read_data)) { == sizeof (read_data)) {
assert (read_count == read_data); TEST_ASSERT_EQUAL_INT (read_data, read_count);
++read_count; ++read_count;
} }
assert (read_count == send_count); TEST_ASSERT_EQUAL_INT (send_count, read_count);
// Give io thread some time to catch up // Give io thread some time to catch up
msleep (SETTLE_TIME); msleep (SETTLE_TIME);
@ -187,7 +198,12 @@ void test_decrease_when_full ()
int main () int main ()
{ {
test_change_before_connected (); setup_test_environment ();
test_change_after_connected ();
test_decrease_when_full (); UNITY_BEGIN ();
RUN_TEST (test_change_before_connected);
RUN_TEST (test_change_after_connected);
RUN_TEST (test_decrease_when_full);
return UNITY_END ();
} }