two tests added

6 files changed, 217 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 38b1e82..aba4e77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Erik Rigtorp <erik@rigtorp.com>
 Frank Denis <zeromq@pureftpd.org>
 George Neill <georgen@neillnet.com>
 Gonzalo Diethelm <gdiethelm@dcv.cl>
+Guido Goldstein <zmq@a-nugget.de>
 Ivo Danihelka <ivo@danihelka.net>
 Joe Thornber <joe.thornber@gmail.com>
 Jon Dyte <jon@totient.co.uk>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 50ba0f3..bad1538 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,10 @@
 INCLUDES = -I$(top_builddir)/include
 LDADD = $(top_builddir)/src/libzmq.la
 
-noinst_PROGRAMS = simple
+noinst_PROGRAMS = simple test_pair test_reqrep
 
 simple_SOURCES = simple.cpp
+test_pair_SOURCES = test_pair.cpp testutil.hpp
+test_reqrep_SOURCES = test_reqrep.cpp testutil.hpp
 
 TESTS = $(noinst_PROGRAMS)
diff --git a/tests/simple.cpp b/tests/simple.cpp
index 4ee2bac..d1c5261 100644
--- a/tests/simple.cpp
+++ b/tests/simple.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <zmq.h>
+#include "../include/zmq.h"
 
 /*  This is the simplest possible test case; test if we can initialize and
     immediately terminate a context. */
diff --git a/tests/test_pair.cpp b/tests/test_pair.cpp
new file mode 100644
index 0000000..01ea5b0
--- /dev/null
+++ b/tests/test_pair.cpp
@@ -0,0 +1,74 @@
+/*
+    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);
+    }
+
+    {
+        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);
+
+        //  Now use polling. Timout makes test abort on error.
+        int rc = zmq::poll (&items [0], 2, 1000);
+        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 ;
+}
diff --git a/tests/test_reqrep.cpp b/tests/test_reqrep.cpp
new file mode 100644
index 0000000..7fa976e
--- /dev/null
+++ b/tests/test_reqrep.cpp
@@ -0,0 +1,74 @@
+/*
+    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);
+    }
+
+    {
+        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);
+
+        //  Now use polling. Timout makes test abort on error.
+        int rc = zmq::poll(&items [0], 2, 1000);
+        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 ;
+}
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
new file mode 100644
index 0000000..7c0a127
--- /dev/null
+++ b/tests/testutil.hpp
@@ -0,0 +1,64 @@
+/*
+    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/>.
+*/
+
+#ifndef __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
+#define __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
+
+#include "../include/zmq.hpp"
+
+#include <utility>
+
+namespace zmqtestutil
+{
+
+    typedef std::pair <zmq::socket_t*, zmq::socket_t*> socket_pair;
+
+    socket_pair create_bound_pair (zmq::context_t *context_,
+        int t1_, int t2_, const char *transport_)
+    {
+        zmq::socket_t *s1 = new zmq::socket_t (*context_, t1_);
+        zmq::socket_t *s2 = new zmq::socket_t (*context_, t2_);
+        s1->bind (transport_);
+        s2->connect (transport_);
+        return socket_pair (s1, s2);
+    }
+
+    std::string ping_pong (const socket_pair &sp_, const std::string &orig_msg_)
+    {
+        zmq::socket_t &s1 = *sp_.first;
+        zmq::socket_t &s2 = *sp_.second;
+
+        //  Construct message to send.
+        zmq::message_t ping (orig_msg_.size ());
+        memcpy (ping.data (), orig_msg_.c_str (), orig_msg_.size ());
+
+        //  Send ping out.
+        s1.send (ping, 0);
+
+        //  Get pong from connected socket.
+        zmq::message_t pong;
+        s2.recv (&pong, 0);
+
+        //  Return received data as std::string.
+        return std::string ((char*) pong.data(), pong.size());
+    }
+
+}
+
+#endif