3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: monitor events are output as decimal in assertion messages

Browse Source 
Solution: output as hex instead
This commit is contained in:
Simon Giesecke 2019-02-05 03:40:42 -05:00
parent a86592f78c
commit 19c6aa5c92
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_monitor.cpp
View File

@ -171,7 +171,7 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
event = get_monitor_event_v2 (client_mon, NULL, &client_local_address, event = get_monitor_event_v2 (client_mon, NULL, &client_local_address,
&client_remote_address); &client_remote_address);
} }
TEST_ASSERT_EQUAL (ZMQ_EVENT_CONNECTED, event); TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CONNECTED, event);
TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address); TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address);
TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address, TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address,
strlen (expected_prefix_)); strlen (expected_prefix_));
@ -192,11 +192,11 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL); event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
// Sometimes the server sees the client closing before it gets closed. // Sometimes the server sees the client closing before it gets closed.
if (event != ZMQ_EVENT_DISCONNECTED) { if (event != ZMQ_EVENT_DISCONNECTED) {
TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event); TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CLOSED, event);
event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL); event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
} }
if (event != ZMQ_EVENT_DISCONNECTED) { if (event != ZMQ_EVENT_DISCONNECTED) {
TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event); TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_MONITOR_STOPPED, event);
} }
free (client_local_address); free (client_local_address);
free (client_remote_address); free (client_remote_address);

2
tests/testutil_monitoring.hpp
View File

@ -306,7 +306,7 @@ void expect_monitor_event_v2 (void *monitor_,
expected_remote_address_ ? &remote_address : NULL); expected_remote_address_ ? &remote_address : NULL);
bool failed = false; bool failed = false;
if (event != expected_event_) { if (event != expected_event_) {
fprintf (stderr, "Expected monitor event %lld, but received %lld\n", fprintf (stderr, "Expected monitor event %llx, but received %llx\n",
(long long) expected_event_, (long long) event); (long long) expected_event_, (long long) event);
failed = true; failed = true;
} }