3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00
Code Issues Projects Releases Wiki Activity

Renamed test_router_raw_empty to test_stream_empty

Browse Source 
* The ZMQ_ROUTER_RAW API was deprecated in favor of ZMQ_STREAM
* Same issue hit router.cpp, which I've fixed
This commit is contained in:
Pieter Hintjens 2013-10-28 21:00:42 +01:00
parent c2c0f39d36
commit eaba5dfe37
5 changed files with 64 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,6 +22,7 @@ autom4te.cache
.*~
tools/curve_keygen.o
tools/curve_keygen
tests/test_stream_empty
tests/test_issue_566
tests/test_ctx_destroy
tests/test_term_endpoint

2
src/stream.cpp
View File

@ -142,6 +142,8 @@ int zmq::stream_t::xsend (msg_t *msg_)
current_out->terminate (false);
int rc = msg_->close ();
errno_assert (rc == 0);
rc = msg_->init ();
errno_assert (rc == 0);
current_out = NULL;
return 0;
}

2
tests/Makefile.am
View File

@ -20,9 +20,9 @@ noinst_PROGRAMS = test_system \
test_linger \
test_monitor \
test_router_mandatory \
test_router_raw_empty \
test_probe_router \
test_stream \
test_stream_empty \
test_disconnect_inproc \
test_ctx_options \
test_ctx_destroy \

65
tests/test_router_raw_empty.cpp
View File

@ -1,65 +0,0 @@
/*
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
0MQ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
int main (void) {
setup_test_environment();
void *ctx = zmq_ctx_new();
assert(ctx);
void *router = zmq_socket(ctx, ZMQ_ROUTER);
assert(router);
void *dealer = zmq_socket(ctx, ZMQ_DEALER);
assert(dealer);
int one=1;
int rc = zmq_setsockopt(router, ZMQ_ROUTER_RAW, &one, sizeof(int));
assert(rc >= 0);
rc = zmq_setsockopt(router, ZMQ_ROUTER_MANDATORY, &one, sizeof(int));
assert(rc >= 0);
rc = zmq_bind(router, "tcp://127.0.0.1:5555");
rc = zmq_connect(dealer, "tcp://127.0.0.1:5555");
zmq_send(dealer, "", 0, 0);
zmq_msg_t ident, empty;
zmq_msg_init(&ident);
rc = zmq_msg_recv(&ident, router, 0);
assert(rc >= 0);
rc = zmq_msg_init_data(&empty, (void*)"", 0, NULL, NULL);
assert(rc >= 0);
rc = zmq_msg_send(&ident, router, ZMQ_SNDMORE);
assert(rc >= 0);
rc = zmq_msg_close(&ident);
assert(rc >= 0);
rc = zmq_msg_send(&empty, router, 0);
assert(rc >= 0);
// This close used to fail with Bad Address
rc = zmq_msg_close(&empty);
assert(rc >= 0);
close_zero_linger(dealer);
close_zero_linger(router);
zmq_ctx_term(ctx);
}

60
tests/test_stream_empty.cpp Normal file
View File

@ -0,0 +1,60 @@
/*
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
0MQ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
int main (void) {
setup_test_environment ();
void *ctx = zmq_ctx_new ();
assert (ctx);
void *stream = zmq_socket (ctx, ZMQ_STREAM);
assert (stream);
void *dealer = zmq_socket (ctx, ZMQ_DEALER);
assert (dealer);
int rc = zmq_bind (stream, "tcp://127.0.0.1:5555");
assert (rc >= 0);
rc = zmq_connect (dealer, "tcp://127.0.0.1:5555");
assert (rc >= 0);
zmq_send (dealer, "", 0, 0);
zmq_msg_t ident, empty;
zmq_msg_init (&ident);
rc = zmq_msg_recv (&ident, stream, 0);
assert (rc >= 0);
rc = zmq_msg_init_data (&empty, (void *) "", 0, NULL, NULL);
assert (rc >= 0);
rc = zmq_msg_send (&ident, stream, ZMQ_SNDMORE);
assert (rc >= 0);
rc = zmq_msg_close (&ident);
assert (rc >= 0);
rc = zmq_msg_send (&empty, stream, 0);
assert (rc >= 0);
// This close used to fail with Bad Address
rc = zmq_msg_close (&empty);
assert (rc >= 0);
close_zero_linger (dealer);
close_zero_linger (stream);
zmq_ctx_term (ctx);
}