Problem: default test setUp/tearDown functions duplicated in many test programs

Solution: define setUp/tearDown functions via SETUP_TEARDOWN_TESTCONTEXT macro where possible

tests/test_abstract_ipc.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static const char test_endpoint[] = "ipc://@tmp-tester";
 

tests/test_bind_after_connect_tcp.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_x ()
 {

tests/test_bind_src_address.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_x ()
 {

tests/test_client_server.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void create_inproc_client_server_pair (void **server_, void **client_)
 {

tests/test_conflate.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_x ()
 {

tests/test_connect_delay_tipc.cpp

@@ -31,17 +31,7 @@
 #include "testutil_unity.hpp"
 #include "testutil_security.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_send_one_connected_one_unconnected ()
 {

tests/test_connect_rid.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 const char *rconn1routing_id = "conn1";
 const char *x_routing_id = "X";

tests/test_ctx_options.cpp

@@ -31,15 +31,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 #define WAIT_FOR_BACKGROUND_THREAD_INSPECTION (0)
 

tests/test_dgram.cpp

@@ -32,17 +32,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void str_send_to (void *s_, const char *content_, const char *address_)
 {

tests/test_diffserv.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_diffserv ()
 {

tests/test_disconnect_inproc.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 /// Initialize a zeromq message with a given null-terminated string
 #define ZMQ_PREPARE_STRING(msg, data, size)                                    \

tests/test_filter_ipc.cpp

@@ -33,15 +33,7 @@
 #include <unistd.h>
 #include <grp.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static void bounce_fail (void *server_, void *client_)
 {

tests/test_fork.cpp

@@ -36,15 +36,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 char connect_address[MAX_SOCKET_STRING];
 

tests/test_getsockopt_memset.cpp

@@ -26,15 +26,8 @@
 #include "testutil_unity.hpp"
 
 #include <string.h>
-void setUp ()
-{
-    setup_test_context ();
-}
 
-void tearDown ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    teardown_test_context ();
-}
 
 void test_getsockopt_memset ()
 {

tests/test_heartbeats.cpp

@@ -42,16 +42,7 @@ typedef int raw_socket;
 
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
 
 //  Read one event off the monitor socket; return value and address
 //  by reference, if not null, and event number by value. Returns -1

tests/test_hwm.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 const int MAX_SENDS = 10000;
 

tests/test_hwm_pubsub.cpp

@@ -36,15 +36,7 @@
 //       ensure we have extra space for that:
 #define SOCKET_STRING_LEN (MAX_SOCKET_STRING * 4)
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 int test_defaults (int send_hwm_, int msg_cnt_, const char *endpoint)
 {

tests/test_immediate.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_immediate_1 ()
 {

tests/test_inproc_connect.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static void pusher (void * /*unused*/)
 {

tests/test_invalid_rep.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_invalid_rep ()
 {

tests/test_iov.cpp

@@ -32,17 +32,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 // XSI vector I/O
 #if defined ZMQ_HAVE_UIO

tests/test_ipc_wildcard.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_ipc_wildcard ()
 {

tests/test_issue_566.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  Issue 566 describes a problem in libzmq v4.0.0 where a dealer to router
 //  connection would fail randomly. The test works when the two sockets are

tests/test_last_endpoint.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static void do_bind_and_verify (void *s_, const char *endpoint_)
 {

tests/test_many_sockets.cpp

@@ -34,15 +34,7 @@
 #include <stdlib.h>
 #include <vector>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_system_max ()
 {

tests/test_mock_pub_sub.cpp

@@ -34,15 +34,7 @@ typedef int raw_socket;
 #include <stdlib.h>
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  Read one event off the monitor socket; return value and address
 //  by reference, if not null, and event number by value. Returns -1

tests/test_monitor.cpp

@@ -35,15 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_monitor_invalid_protocol_fails ()
 {

tests/test_msg_ffn.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void ffn (void *data_, void *hint_)
 {

tests/test_msg_flags.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_more ()
 {

tests/test_pair_ipc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_roundtrip ()
 {

tests/test_pair_tcp.cpp

@@ -32,16 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
 
 typedef void (*extra_func_t) (void *socket_);
 

tests/test_pair_tcp_cap_net_admin.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 typedef void (*extra_func_t) (void *socket_);
 

tests/test_pair_tipc.cpp

@@ -31,17 +31,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_roundtrip ()
 {

tests/test_pair_vmci.cpp

@@ -34,15 +34,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_pair_vmci ()
 {

tests/test_poller.cpp

@@ -30,7 +30,6 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
 #include <limits.h>
 
 #ifndef _WIN32
@@ -40,15 +39,7 @@
 #include <unistd.h>
 #endif
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 fd_t get_fd (void *socket_)
 {

tests/test_probe_router.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_probe_router_router ()
 {

tests/test_proxy.cpp

@@ -33,15 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 #define CONTENT_SIZE 13
 #define CONTENT_SIZE_MAX 32

tests/test_proxy_single_socket.cpp

@@ -32,15 +32,7 @@
 
 #include <stdlib.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 // This is our server task.
 // It runs a proxy with a single REP socket as both frontend and backend.

tests/test_proxy_terminate.cpp

@@ -32,15 +32,7 @@
 
 #include <stdlib.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 // This is a test for issue #1382. The server thread creates a SUB-PUSH
 // steerable proxy. The main process then sends messages to the SUB

tests/test_pub_invert_matching.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test ()
 {

tests/test_radio_dish.cpp

@@ -30,8 +30,6 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
-
 #include <string.h>
 
 #ifndef _WIN32
@@ -53,15 +51,7 @@
         _test (true);                                                          \
     }
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void msg_send_expect_success (void *s_, const char *group_, const char *body_)
 {

tests/test_rebind_ipc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_rebind_ipc ()
 {

tests/test_reconnect_ivl.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_reconnect_ivl_against_pair_socket (const char *my_endpoint_,
                                              void *sb_)

tests/test_req_correlate.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_req_correlate ()
 {

tests/test_reqrep_device.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_roundtrip ()
 {

tests/test_reqrep_device_tipc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 // TODO this is heavily duplicated with test_reqrep_device.cpp
 void test_roundtrip ()

tests/test_reqrep_inproc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_roundtrip ()
 {

tests/test_reqrep_ipc.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <stdlib.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_leak ()
 {

tests/test_reqrep_tcp.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_single_connect (int ipv6_)
 {

tests/test_reqrep_tipc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_roundtrip ()
 {

tests/test_reqrep_vmci.cpp

@@ -34,15 +34,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_reqrep_vmci ()
 {

tests/test_router_handover.cpp

@@ -28,20 +28,9 @@
 */
 
 #include "testutil.hpp"
-
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_with_handover ()
 {

tests/test_router_mandatory.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 #ifdef ZMQ_BUILD_DRAFT_API
 bool send_msg_to_peer_if_ready (void *router_, const char *peer_routing_id_)

tests/test_router_mandatory_hwm.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 // DEBUG shouldn't be defined in sources as it will cause a redefined symbol
 // error when it is defined in the build configuration. It appears that the

tests/test_router_mandatory_tipc.cpp

@@ -32,15 +32,7 @@
 
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_router_mandatory_tipc ()
 {

tests/test_router_notify.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_sockopt_router_notify ()
 {

tests/test_scatter_gather.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_scatter_gather_multipart_fails ()
 {

tests/test_security_no_zap_handler.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_no_zap_handler ()
 {

tests/test_security_zap.cpp

@@ -30,15 +30,7 @@
 #include "testutil_security.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static void zap_handler_wrong_version (void * /*unused_*/)
 {

tests/test_setsockopt.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_setsockopt_tcp_recv_buffer ()
 {

tests/test_sockopt_hwm.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 const int MAX_SENDS = 10000;
 

tests/test_spec_dealer.cpp

@@ -30,16 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
 
 // SHALL route outgoing messages to available peers using a round-robin
 // strategy.

tests/test_spec_pushpull.cpp

@@ -33,15 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 char connect_address[MAX_SOCKET_STRING];
 

tests/test_spec_rep.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <stdlib.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 char connect_address[MAX_SOCKET_STRING];
 

tests/test_spec_req.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 char connect_address[MAX_SOCKET_STRING];
 

tests/test_spec_router.cpp

@@ -32,18 +32,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unity.h>
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
+SETUP_TEARDOWN_TESTCONTEXT
 
 // SHALL receive incoming messages from its peers using a fair-queuing
 // strategy.

tests/test_srcfd.cpp

@@ -31,17 +31,8 @@
 #include "testutil_unity.hpp"
 
 #include <string.h>
-#include <unity.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 #define MSG_SIZE 20
 

tests/test_stream.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  ZMTP protocol greeting structure
 

tests/test_stream_disconnect.cpp

@@ -32,15 +32,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 static const int SERVER = 0;
 static const int CLIENT = 1;

tests/test_stream_empty.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_stream_empty ()
 {

tests/test_stream_exceeds_buffer.cpp

@@ -38,15 +38,7 @@
 #include <unistd.h>
 #endif
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_stream_exceeds_buffer ()
 {

tests/test_stream_timeout.cpp

@@ -33,15 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  Read one event off the monitor socket; return value and address
 //  by reference, if not null, and event number by value. Returns -1

tests/test_sub_forward.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test ()
 {

tests/test_sub_forward_tipc.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test ()
 {

tests/test_system.cpp

@@ -39,15 +39,7 @@
 #include <unistd.h>
 #endif
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  Solaris has a default of 256 max files per process
 #ifdef ZMQ_HAVE_SOLARIS

tests/test_term_endpoint.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 /* Use the worst case filename size for the buffer (+1 for trailing NUL), this
  * is larger than MAX_SOCKET_STRING, which is not large enough for IPC */

tests/test_term_endpoint_tipc.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 const char ep[] = "tipc://{5560,0,0}";
 const char name[] = "tipc://{5560,0}@0.0.0";

tests/test_thread_safe.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 //  Client threads loop on send/recv until told to exit
 void client_thread (void *client_)

tests/test_timeo.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_timeo ()
 {

tests/test_unbind_wildcard.cpp

@@ -22,15 +22,7 @@
 
 #include <string.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_address_wildcard_ipv4 ()
 {

tests/test_use_fd.cpp

@@ -32,19 +32,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unity.h>
 #include <unistd.h>
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
 
 #if !defined(ZMQ_HAVE_WINDOWS)
 #include <sys/socket.h>

tests/test_xpub_manual.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_basic ()
 {

tests/test_xpub_nodrop.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test ()
 {

tests/test_xpub_verbose.cpp

@@ -30,15 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 const uint8_t unsubscribe_a_msg[] = {0, 'A'};
 const uint8_t subscribe_a_msg[] = {1, 'A'};

tests/test_xpub_welcome_msg.cpp

@@ -30,17 +30,7 @@
 #include "testutil.hpp"
 #include "testutil_unity.hpp"
 
-#include <unity.h>
+SETUP_TEARDOWN_TESTCONTEXT
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test ()
 {

tests/test_zmq_poll_fd.cpp

@@ -32,21 +32,12 @@
 
 #include <netdb.h>
 #include <string.h>
-#include <unity.h>
 
 #ifndef _WIN32
 #include <unistd.h>
 #endif
 
-void setUp ()
+SETUP_TEARDOWN_TESTCONTEXT
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
 
 void test_poll_fd ()
 {

tests/testutil_unity.hpp

@@ -181,6 +181,12 @@ void recv_array_expect_success (void *socket_,
 // for each test case, and some consistency checks can be performed.
 /////////////////////////////////////////////////////////////////////////////
 
+// Use this is an test executable to perform a default setup and teardown of
+// the test context, which is appropriate for many libzmq test cases.
+#define SETUP_TEARDOWN_TESTCONTEXT                                             \
+    void setUp () { setup_test_context (); }                                   \
+    void tearDown () { teardown_test_context (); }
+
 // The maximum number of sockets that can be managed by the test context.
 #define MAX_TEST_SOCKETS 128