generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-18 03:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Added tests for transports per socket

Browse Source
This commit is contained in:
Guido Goldstein
2010-08-28 13:58:23 +02:00
committed by Martin Sustrik
parent 6ec783e702
commit 0a8473dedd
10 changed files with 235 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/Makefile.am
View File

@@ -1,10 +1,19 @@
INCLUDES = -I$(top_builddir)/include INCLUDES = -I$(top_builddir)/include
LDADD = $(top_builddir)/src/libzmq.la LDADD = $(top_builddir)/src/libzmq.la
noinst_PROGRAMS = simple test_pair test_reqrep noinst_PROGRAMS = test_pair_inproc \
test_pair_ipc \
test_pair_tcp \
test_reqrep_inproc \
test_reqrep_ipc \
test_reqrep_tcp
simple_SOURCES = simple.cpp test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp
test_pair_SOURCES = test_pair.cpp testutil.hpp test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
test_reqrep_SOURCES = test_reqrep.cpp testutil.hpp test_pair_tcp_SOURCES = test_pair_tcp.cpp testutil.hpp
test_reqrep_inproc_SOURCES = test_reqrep_inproc.cpp testutil.hpp
test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
test_reqrep_tcp_SOURCES = test_reqrep_tcp.cpp testutil.hpp
TESTS = $(noinst_PROGRAMS) TESTS = $(noinst_PROGRAMS)

78
tests/test_pair.cpp
View File

@@ -1,78 +0,0 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <assert.h>
#include <string>
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main ()
{
zmq::context_t context (1);
zmq::pollitem_t items [2];
socket_pair p = create_bound_pair (&context, ZMQ_PAIR, ZMQ_PAIR,
"tcp://127.0.0.1:2000");
// First test simple ping pong.
const string expect ("XXX");
{
const string returned = zmqtestutil::ping_pong (p, expect);
assert (expect == returned);
// Adjust socket state so that poll shows only 1 pending message.
zmq::message_t mx ;
p.first->recv (&mx, 0);
}
{
zmq::message_t m1 (expect.size ());
memcpy (m1.data (), expect.c_str (), expect.size ());
items [0].socket = *p.first;
items [0].fd = 0;
items [0].events = ZMQ_POLLIN;
items [0].revents = 0;
items [1].socket = *p.second;
items [1].fd = 0;
items [1].events = ZMQ_POLLIN;
items [1].revents = 0;
p.first->send (m1, 0);
int rc = zmq::poll (&items [0], 2, -1);
assert (rc == 1);
assert ((items [1].revents & ZMQ_POLLIN) != 0);
zmq::message_t m2;
p.second->recv (&m2, 0);
const string ret ((char*) m2.data (), m2.size ());
assert (expect == ret);
}
// Delete sockets.
delete (p.first);
delete (p.second);
return 0 ;
assert (false);
}

16
tests/simple.cpp → tests/test_pair_inproc.cpp
View File

@@ -17,16 +17,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/zmq.h" #include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
/* This is the simplest possible test case; test if we can initialize and
immediately terminate a context. */
int main (int argc, char *argv []) int main (int argc, char *argv [])
{ {
void *ctx; const char *transport = "inproc://tester" ;
basic_tests (transport, ZMQ_PAIR, ZMQ_PAIR);
ctx = zmq_init (1); return 0 ;
zmq_term (ctx);
return 0;
} }

30
tests/test_pair_ipc.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main (int argc, char *argv [])
{
const char *transport = "ipc:///tmp/tester" ;
basic_tests (transport, ZMQ_PAIR, ZMQ_PAIR);
return 0 ;
}

30
tests/test_pair_tcp.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main (int argc, char *argv [])
{
const char *transport = "tcp://127.0.0.1:5555" ;
basic_tests (transport, ZMQ_PAIR, ZMQ_PAIR);
return 0 ;
}

77
tests/test_reqrep.cpp
View File

@@ -1,77 +0,0 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <assert.h>
#include <string>
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main()
{
zmq::context_t context (1);
zmq::pollitem_t items [2];
socket_pair p = create_bound_pair (&context, ZMQ_REQ, ZMQ_REP,
"tcp://127.0.0.1:2000");
// First test simple ping pong.
const string expect ("XXX");
{
const string returned = zmqtestutil::ping_pong (p, expect);
assert (expect == returned);
// Adjust socket state, so that first is clean for another send.
zmq::message_t mx ;
p.first->recv(&mx, 0);
}
{
zmq::message_t m1 (expect.size ());
memcpy (m1.data (), expect.c_str (), expect.size ());
items [0].socket = *p.first;
items [0].fd = 0;
items [0].events = ZMQ_POLLIN;
items [0].revents = 0;
items [1].socket = *p.second;
items [1].fd = 0;
items [1].events = ZMQ_POLLIN;
items [1].revents = 0;
p.first->send (m1, 0);
int rc = zmq::poll(&items [0], 2, -1);
assert (rc == 1);
assert ((items [1].revents & ZMQ_POLLIN) != 0);
zmq::message_t m2 ;
p.second->recv (&m2, 0);
const string ret ((char*) m2.data (), m2.size ());
assert (expect == ret);
}
// Delete sockets.
delete (p.first);
delete (p.second);
return 0 ;
}

30
tests/test_reqrep_inproc.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main (int argc, char *argv [])
{
const char *transport = "inproc://tester" ;
basic_tests (transport, ZMQ_REQ, ZMQ_REP);
return 0 ;
}

30
tests/test_reqrep_ipc.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main (int argc, char *argv [])
{
const char *transport = "ipc:///tmp/tester" ;
basic_tests (transport, ZMQ_REQ, ZMQ_REP);
return 0 ;
}

30
tests/test_reqrep_tcp.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the Lesser GNU 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
Lesser GNU General Public License for more details.
You should have received a copy of the Lesser GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
using namespace std;
using namespace zmqtestutil;
int main (int argc, char *argv [])
{
const char *transport = "tcp://127.0.0.1:5555" ;
basic_tests (transport, ZMQ_REQ, ZMQ_REP);
return 0 ;
}

69
tests/testutil.hpp
View File

@@ -20,15 +20,21 @@
#ifndef __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__ #ifndef __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
#define __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__ #define __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
#include "../include/zmq.hpp" #include <assert.h>
#include <iostream>
#include <string>
#include <utility> #include <utility>
#include "../include/zmq.hpp"
namespace zmqtestutil namespace zmqtestutil
{ {
using namespace std ;
typedef std::pair <zmq::socket_t*, zmq::socket_t*> socket_pair; typedef std::pair <zmq::socket_t*, zmq::socket_t*> socket_pair;
// Create a pair of sockets connected to each other.
socket_pair create_bound_pair (zmq::context_t *context_, socket_pair create_bound_pair (zmq::context_t *context_,
int t1_, int t2_, const char *transport_) int t1_, int t2_, const char *transport_)
{ {
@@ -39,6 +45,7 @@ namespace zmqtestutil
return socket_pair (s1, s2); return socket_pair (s1, s2);
} }
// Send a message from one socket in the pair to the other and back.
std::string ping_pong (const socket_pair &sp_, const std::string &orig_msg_) std::string ping_pong (const socket_pair &sp_, const std::string &orig_msg_)
{ {
zmq::socket_t &s1 = *sp_.first; zmq::socket_t &s1 = *sp_.first;
@@ -56,13 +63,67 @@ namespace zmqtestutil
s2.recv (&pong, 0); s2.recv (&pong, 0);
// Send message via s2, so state is clean in case of req/rep. // Send message via s2, so state is clean in case of req/rep.
std::string ret((char *)pong.data(), pong.size()); std::string ret ((char*) pong.data(), pong.size ());
s2.send(pong, 0); s2.send (pong, 0);
// Return received data as std::string. // Return received data as std::string.
return ret ; return ret ;
} }
/* Run basic tests for the given transport.
Basic tests are:
* ping pong as defined above.
* send receive where the receive is signalled by zmq::poll
*/
void basic_tests (const char *transport_, int t1_, int t2_)
{
zmq::context_t context (1);
zmq::pollitem_t items [2];
socket_pair p = create_bound_pair (&context, t1_, t2_, transport_);
// First test simple ping pong.
const string expect ("XXX");
{
const string returned = zmqtestutil::ping_pong (p, expect);
assert (expect == returned);
// Adjust socket state so that poll shows only 1 pending message.
zmq::message_t mx ;
p.first->recv (&mx, 0);
}
{
// Now poll is used to singal that a message is ready to read.
zmq::message_t m1 (expect.size ());
memcpy (m1.data (), expect.c_str (), expect.size ());
items [0].socket = *p.first;
items [0].fd = 0;
items [0].events = ZMQ_POLLIN;
items [0].revents = 0;
items [1].socket = *p.second;
items [1].fd = 0;
items [1].events = ZMQ_POLLIN;
items [1].revents = 0;
p.first->send (m1, 0);
int rc = zmq::poll (&items [0], 2, -1);
assert (rc == 1);
assert ((items [1].revents & ZMQ_POLLIN) != 0);
zmq::message_t m2;
p.second->recv (&m2, 0);
const string ret ((char*) m2.data (), m2.size ());
assert (expect == ret);
}
// Delete sockets.
delete (p.first);
delete (p.second);
}
} }
#endif #endif