From d93cbc059cd1e42773d1aec19f8b49a972f2eac3 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 26 Jan 2017 09:57:56 -0800 Subject: Added more plumbing to facilitate test writing & compatibility. Also, while here fixed a bug for the PAIR protocol in compat mode. It should now be possible to import more of the nanomsg tests directly with little or no modification. --- tests/CMakeLists.txt | 1 + tests/compat_block.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/compat_testutil.h | 2 ++ 3 files changed, 71 insertions(+) create mode 100644 tests/compat_block.c (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 57230f33..9545f661 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -86,5 +86,6 @@ add_nng_test(survey 5) add_nng_test(tcp 5) # compatbility tests +add_nng_compat_test(compat_block 5) add_nng_compat_test(compat_cmsg 5) add_nng_compat_test(compat_reqrep 5) diff --git a/tests/compat_block.c b/tests/compat_block.c new file mode 100644 index 00000000..e873cc86 --- /dev/null +++ b/tests/compat_block.c @@ -0,0 +1,68 @@ +/* + Copyright (c) 2012 Martin Sustrik All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom + the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. +*/ + +#include "nng_compat.h" +#include "compat_testutil.h" + +/* This test checks whether blocking on send/recv works as expected. */ + +#define SOCKET_ADDRESS "inproc://a" + +int sc; +int sb; + +void worker (NN_UNUSED void *arg) +{ + /* Wait 0.1 sec for the main thread to block. */ + nn_sleep (100); + + test_send (sc, "ABC"); + + /* Wait 0.1 sec for the main thread to process the previous message + and block once again. */ + nn_sleep (100); + + test_send (sc, "ABC"); +} + +int main () +{ + struct nn_thread thread; + + sb = test_socket (AF_SP, NN_PAIR); + test_bind (sb, SOCKET_ADDRESS); + sc = test_socket (AF_SP, NN_PAIR); + test_connect (sc, SOCKET_ADDRESS); + + nn_thread_init (&thread, worker, NULL); + + test_recv (sb, "ABC"); + test_recv (sb, "ABC"); + + nn_thread_term (&thread); + + test_close (sc); + test_close (sb); + + return 0; +} + diff --git a/tests/compat_testutil.h b/tests/compat_testutil.h index 58020331..79adb104 100644 --- a/tests/compat_testutil.h +++ b/tests/compat_testutil.h @@ -60,6 +60,8 @@ static int test_setsockopt_impl (char *file, int line, int sock, int level, #define test_setsockopt(s, l, o, v, z) test_setsockopt_impl (__FILE__, \ __LINE__, (s), (l), (o), (v), (z)) +#define NN_UNUSED + static int test_socket_impl (char *file, int line, int family, int protocol) { -- cgit v1.2.3-70-g09d2