From a24d833a12adb99f56ef9474a5308265d3ba50ad Mon Sep 17 00:00:00 2001 From: drbob Date: Thu, 24 Jun 2010 17:22:58 +0000 Subject: [PATCH] * Split the pqiperson test out into tesetconnect.cc * Added incomplete pqipersongrp_test git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3199 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/tests/pqi/Makefile | 6 +- libretroshare/src/tests/pqi/pqiperson_test.cc | 148 +--------- .../src/tests/pqi/pqipersongrp_test.cc | 266 ++++++++++++++++++ libretroshare/src/tests/pqi/testconnect.cc | 186 ++++++++++++ 4 files changed, 457 insertions(+), 149 deletions(-) create mode 100644 libretroshare/src/tests/pqi/pqipersongrp_test.cc create mode 100644 libretroshare/src/tests/pqi/testconnect.cc diff --git a/libretroshare/src/tests/pqi/Makefile b/libretroshare/src/tests/pqi/Makefile index 6d71ee56b..f8e52eccb 100644 --- a/libretroshare/src/tests/pqi/Makefile +++ b/libretroshare/src/tests/pqi/Makefile @@ -8,7 +8,7 @@ include $(RS_TOP_DIR)/tests/scripts/config.mk ############################################################### TESTOBJ = net_test.o dht_test.o net_test1.o netiface_test.o dht_test.o -TESTOBJ += pkt_test.o pqiarchive_test.o pqiperson_test.o +TESTOBJ += pkt_test.o testconnect.o pqiarchive_test.o pqiperson_test.o #conn_test.o TESTS = net_test net_test1 netiface_test pqiarchive_test pqiperson_test @@ -42,8 +42,8 @@ netiface_test: netiface_test.o pqiarchive_test: pqiarchive_test.o pkt_test.o $(CC) $(CFLAGS) -o pqiarchive_test pkt_test.o pqiarchive_test.o $(LIBS) -pqiperson_test: pqiperson_test.o - $(CC) $(CFLAGS) -o pqiperson_test pqiperson_test.o $(LIBS) +pqiperson_test: pqiperson_test.o testconnect.o + $(CC) $(CFLAGS) -o pqiperson_test pqiperson_test.o testconnect.o $(LIBS) diff --git a/libretroshare/src/tests/pqi/pqiperson_test.cc b/libretroshare/src/tests/pqi/pqiperson_test.cc index db7ab7f23..02d4ea4ed 100644 --- a/libretroshare/src/tests/pqi/pqiperson_test.cc +++ b/libretroshare/src/tests/pqi/pqiperson_test.cc @@ -39,6 +39,8 @@ #include "pqi/pqiperson.h" #include "pqi/pqibin.h" +#include "testconnect.h" + #include "util/rsnet.h" #include #include @@ -85,154 +87,8 @@ int main(int argc, char **argv) * Test structure *****************/ - -#define NUM_CONN_MAX 10 #define NUM_CHILDREN 3 -#define TST_STATE_CONNECT 0x0001 -#define TST_STATE_LISTEN 0x0002 - -/* static test variables */ -uint32_t testCounter = 0; -pqiconnect *testConnectPointer[NUM_CONN_MAX]; -uint32_t testConnectState[NUM_CONN_MAX]; -std::list testConnectTimes[NUM_CONN_MAX]; -std::list testConnectAddrs[NUM_CONN_MAX]; - -std::list testResetState[NUM_CONN_MAX]; -std::list testResetTimes[NUM_CONN_MAX]; - -uint32_t findWhichConnect(pqiconnect *conn) -{ - int i; - for(i = 0; i < NUM_CONN_MAX; i++) - { - if (testConnectPointer[i] == conn) - { - return i; - } - } - // error. - FAILED("Connect Missing"); - exit(1); - return 0; -} - -void addTestConnect(pqiconnect *pqi) -{ - testConnectPointer[testCounter] = pqi; - testConnectState[testCounter] = 0; - testCounter++; - if (testCounter > NUM_CONN_MAX) - { - FAILED("Too Many Connects"); - exit(1); - } -} - -void resetTestConnects() -{ - testCounter = 0; - int i; - for(i = 0; i < NUM_CONN_MAX; i++) - { - testConnectAddrs[i].clear(); - testConnectTimes[i].clear(); - testResetState[i].clear(); - testResetTimes[i].clear(); - } -} - - -class testConnect: public pqiconnect -{ - public: - - testConnect(RsSerialiser *rss, NetBinInterface *ni_in) - :pqiconnect(rss, ni_in) - { - } - - virtual ~testConnect() - { - return; - } - - /* dummyConnect */ - virtual int connect(struct sockaddr_in raddr) - { - int cidx = findWhichConnect(this); - time_t now = time(NULL); - - testConnectState[cidx] |= TST_STATE_CONNECT; - testConnectTimes[cidx].push_back(now); - testConnectAddrs[cidx].push_back(raddr); - - std::cerr << "testConnect[" << cidx << "].connect() called"; - std::cerr << std::endl; - return 0; - } - - virtual int listen() - { - int cidx = findWhichConnect(this); - testConnectState[cidx] |= TST_STATE_LISTEN; - std::cerr << "testConnect[" << cidx << "].listen() called"; - std::cerr << std::endl; - return 1; - } - - virtual int stoplistening() - { - int cidx = findWhichConnect(this); - testConnectState[cidx] &= ~TST_STATE_LISTEN; - std::cerr << "testConnect[" << cidx << "].stoplistening() called"; - std::cerr << std::endl; - return 1; - } - - virtual int reset() - { - int cidx = findWhichConnect(this); - time_t now = time(NULL); - - // reset everything except listening. - testResetState[cidx].push_back(testConnectState[cidx]); - testResetTimes[cidx].push_back(now); - testConnectState[cidx] &= TST_STATE_LISTEN; - - std::cerr << "testConnect[" << cidx << "].reset() called"; - std::cerr << std::endl; - return 1; - } - - // leave this as is virtual int disconnect() { return ni -> reset(); } - - virtual bool connect_parameter(uint32_t type, uint32_t value) - { - int cidx = findWhichConnect(this); - //testConnectState[cidx] |= TST_STATE_LISTEN; - std::cerr << "testConnect[" << cidx << "].connect_parameter() called"; - std::cerr << std::endl; - return true; - } - - virtual int getConnectAddress(struct sockaddr_in &raddr) - { - int cidx = findWhichConnect(this); - if (testConnectAddrs[cidx].size() > 0) - { - raddr = testConnectAddrs[cidx].back(); - return 1; - } - std::cerr << "testConnect[" << cidx << "].getConnectAddress() called"; - std::cerr << std::endl; - return 0; - } - -}; // end of testConnect. - - pqiperson *createTestPerson(std::string id, pqipersongrp *ppg) { /* now add test children */ diff --git a/libretroshare/src/tests/pqi/pqipersongrp_test.cc b/libretroshare/src/tests/pqi/pqipersongrp_test.cc new file mode 100644 index 000000000..e363b32b6 --- /dev/null +++ b/libretroshare/src/tests/pqi/pqipersongrp_test.cc @@ -0,0 +1,266 @@ +/* + * libretroshare/src/test/pqi pqiperson_test.cc + * + * 3P/PQI network interface for RetroShare. + * + * Copyright 2007-2008 by Robert Fernie. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2 as published by the Free Software Foundation. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "retroshare@lunamutt.com". + * + */ + +/****** + * pqiperson acts as the wrapper for all connection methods to a single peer. + * + * This test creates, a pqiperson and simulates connections, disconnections. + * packets passing through. + * + */ + + + + + + +#include "pqi/pqiperson.h" +#include "pqi/pqibin.h" + +#include "testconnect.h" + +#include "util/rsnet.h" +#include +#include +#include "util/utest.h" + +INITTEST(); + +int test_person_basic_reset(); +int test_person_basic_listen(); + + +int main(int argc, char **argv) +{ + std::cerr << "pqiperson_test" << std::endl; + + test_person_basic_reset(); + test_person_basic_listen(); + + FINALREPORT("pqiperson_test"); + + return TESTRESULT(); +} + +/****************************************************** + * + * tests() + * + **** ensure that functions call children + * pqiperson::reset() + * pqiperson::listen() + * pqiperson::stoplistening() + * + * + * pqiperson::connect(...) + * -> check that gets through to children. + * -> check that cannot have simultaneous connections. + * -> + * + */ + + +/******************************************************* + * + * Test structure + *****************/ + +#define NUM_CHILDREN 3 + +pqiperson *createTestPerson(std::string id, pqipersongrp *ppg); + +class pqipersongrpTestHarness: public pqipersongrp +{ + public: + pqipersongrpTestHarness(SecurityPolicy *pol, unsigned long flags) + :pqipersongrp(pol, flags) + { + return; + } + + protected: + + /********* FUNCTIONS to OVERLOAD for specialisation ********/ +virtual pqilistener *createListener(struct sockaddr_in laddr) +{ + return new pqilistener(laddr); +} + +virtual pqiperson *createPerson(std::string id, pqilistener *listener) +{ + return createTestPerson(id, this); +} + + /********* FUNCTIONS to OVERLOAD for specialisation ********/ +}; + + + + +pqiperson *createTestPerson(std::string id, pqipersongrp *ppg) +{ + /* now add test children */ + { + std::cerr << "createTestPerson()"; + std::cerr << std::endl; + } + + pqiperson *pqip = new pqiperson(id, ppg); + + /* construct the serialiser .... + * Needs: + * * FileItem + * * FileData + * * ServiceGeneric + */ + + RsSerialiser *rss = new RsSerialiser(); + rss->addSerialType(new RsFileItemSerialiser()); + rss->addSerialType(new RsCacheItemSerialiser()); + rss->addSerialType(new RsServiceSerialiser()); + + NetBinDummy *dummy1 = new NetBinDummy(pqip, id, PQI_CONNECT_TUNNEL); + pqiconnect *pqisc = new testConnect(rss, dummy1); + addTestConnect(pqisc); + pqip -> addChildInterface(PQI_CONNECT_TCP, pqisc); + + RsSerialiser *rss2 = new RsSerialiser(); + rss2->addSerialType(new RsFileItemSerialiser()); + rss2->addSerialType(new RsCacheItemSerialiser()); + rss2->addSerialType(new RsServiceSerialiser()); + + NetBinDummy *dummy2 = new NetBinDummy(pqip, id, PQI_CONNECT_TUNNEL); + pqiconnect *pqicontun = new testConnect(rss2, dummy2); + addTestConnect(pqicontun); + pqip -> addChildInterface(PQI_CONNECT_TUNNEL, pqicontun); + + + RsSerialiser *rss3 = new RsSerialiser(); + rss3->addSerialType(new RsFileItemSerialiser()); + rss3->addSerialType(new RsCacheItemSerialiser()); + rss3->addSerialType(new RsServiceSerialiser()); + + NetBinDummy *dummy3 = new NetBinDummy(pqip, id, PQI_CONNECT_UDP); + pqiconnect *pqiusc = new testConnect(rss3, dummy3); + addTestConnect(pqiusc); + pqip -> addChildInterface(PQI_CONNECT_UDP, pqiusc); + + return pqip; +} + + +/* First Sets of Tests are very basic: + * reset() + * connect() + * listen() / stoplistening() + * disconnect() + */ + +int test_person_basic_reset() +{ + /* reset test */ + resetTestConnects(); + + /* create test person */ + std::string id = "12345678901234567890123456789012"; + + pqipersongrp *ppg = pqipersongrpTestHarness(NULL, 0); + + /* setup fake other bits */ + + + /* add peers - and watch it all happen! */ + + + + pqiperson *person = createTestPerson(id, ppg); + + /* reset person */ + person->reset(); + + /* count number of resets */ + CHECK(NUM_CHILDREN == testCounter); + + int i; + for(i = 0; i < NUM_CHILDREN; i++) + { + CHECK(testResetTimes[i].size() == 1); + CHECK(testConnectState[i] == 0); + CHECK(testConnectTimes[i].size() == 0); + } + + /* clean up */ + delete person; + + REPORT("test_person_basic_reset()"); + + return 1; +} + + +int test_person_basic_listen() +{ + /* reset test */ + resetTestConnects(); + + /* create test person */ + std::string id = "12345678901234567890123456789012"; + pqipersongrp *ppg = NULL; + pqiperson *person = createTestPerson(id, ppg); + + /* reset person */ + person->listen(); + + /* count number of resets */ + CHECK(NUM_CHILDREN == testCounter); + + int i; + for(i = 0; i < NUM_CHILDREN; i++) + { + CHECK(testResetTimes[i].size() == 0); + CHECK(testConnectTimes[i].size() == 0); + CHECK(testConnectState[i] == TST_STATE_LISTEN); + } + + person->stoplistening(); + + for(i = 0; i < NUM_CHILDREN; i++) + { + CHECK(testResetTimes[i].size() == 0); + CHECK(testConnectTimes[i].size() == 0); + CHECK(testConnectState[i] == 0); + } + + /* clean up */ + delete person; + + REPORT("test_person_basic_listen()"); + + return 1; +} + + + + diff --git a/libretroshare/src/tests/pqi/testconnect.cc b/libretroshare/src/tests/pqi/testconnect.cc new file mode 100644 index 000000000..bc9193e7b --- /dev/null +++ b/libretroshare/src/tests/pqi/testconnect.cc @@ -0,0 +1,186 @@ +/* + * libretroshare/src/test/pqi testconnect.cc + * + * 3P/PQI network interface for RetroShare. + * + * Copyright 2007-2008 by Robert Fernie. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2 as published by the Free Software Foundation. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "retroshare@lunamutt.com". + * + */ + +/****** + * pqiperson acts as the wrapper for all connection methods to a single peer. + * + * This test creates, a pqiperson and simulates connections, disconnections. + * packets passing through. + * + */ + + +#include "testconnect.h" +#include "pqi/pqibin.h" +#include +#include + +/******************************************************* + * + * Test structure + *****************/ + + +#define NUM_CONN_MAX 10 +#define NUM_CHILDREN 3 + +#define TST_STATE_CONNECT 0x0001 +#define TST_STATE_LISTEN 0x0002 + +/* static test variables */ +uint32_t testCounter = 0; +pqiconnect *testConnectPointer[NUM_CONN_MAX]; +uint32_t testConnectState[NUM_CONN_MAX]; +std::list testConnectTimes[NUM_CONN_MAX]; +std::list testConnectAddrs[NUM_CONN_MAX]; + +std::list testResetState[NUM_CONN_MAX]; +std::list testResetTimes[NUM_CONN_MAX]; + +uint32_t findWhichConnect(pqiconnect *conn) +{ + int i; + for(i = 0; i < NUM_CONN_MAX; i++) + { + if (testConnectPointer[i] == conn) + { + return i; + } + } + // error. + std::cerr << "Connect Missing" << std::endl; + exit(1); + return 0; +} + +void addTestConnect(pqiconnect *pqi) +{ + testConnectPointer[testCounter] = pqi; + testConnectState[testCounter] = 0; + testCounter++; + if (testCounter > NUM_CONN_MAX) + { + std::cerr << "Too Many Connects" << std::endl; + exit(1); + } +} + +void resetTestConnects() +{ + testCounter = 0; + int i; + for(i = 0; i < NUM_CONN_MAX; i++) + { + testConnectAddrs[i].clear(); + testConnectTimes[i].clear(); + testResetState[i].clear(); + testResetTimes[i].clear(); + } +} + + +testConnect::testConnect(RsSerialiser *rss, NetBinInterface *ni_in) + :pqiconnect(rss, ni_in) +{ + +} + +testConnect::~testConnect() +{ + return; +} + + /* dummyConnect */ +int testConnect::connect(struct sockaddr_in raddr) +{ + int cidx = findWhichConnect(this); + time_t now = time(NULL); + + testConnectState[cidx] |= TST_STATE_CONNECT; + testConnectTimes[cidx].push_back(now); + testConnectAddrs[cidx].push_back(raddr); + + std::cerr << "testConnect[" << cidx << "].connect() called"; + std::cerr << std::endl; + return 0; +} + +int testConnect::listen() +{ + int cidx = findWhichConnect(this); + testConnectState[cidx] |= TST_STATE_LISTEN; + std::cerr << "testConnect[" << cidx << "].listen() called"; + std::cerr << std::endl; + return 1; +} + +int testConnect::stoplistening() +{ + int cidx = findWhichConnect(this); + testConnectState[cidx] &= ~TST_STATE_LISTEN; + std::cerr << "testConnect[" << cidx << "].stoplistening() called"; + std::cerr << std::endl; + return 1; +} + +int testConnect::reset() +{ + int cidx = findWhichConnect(this); + time_t now = time(NULL); + + // reset everything except listening. + testResetState[cidx].push_back(testConnectState[cidx]); + testResetTimes[cidx].push_back(now); + testConnectState[cidx] &= TST_STATE_LISTEN; + + std::cerr << "testConnect[" << cidx << "].reset() called"; + std::cerr << std::endl; + return 1; +} + +// leave this as is virtual int disconnect() { return ni -> reset(); } + +bool testConnect::connect_parameter(uint32_t type, uint32_t value) +{ + int cidx = findWhichConnect(this); + //testConnectState[cidx] |= TST_STATE_LISTEN; + std::cerr << "testConnect[" << cidx << "].connect_parameter() called"; + std::cerr << std::endl; + return true; +} + +int testConnect::getConnectAddress(struct sockaddr_in &raddr) +{ + int cidx = findWhichConnect(this); + if (testConnectAddrs[cidx].size() > 0) + { + raddr = testConnectAddrs[cidx].back(); + return 1; + } + std::cerr << "testConnect[" << cidx << "].getConnectAddress() called"; + std::cerr << std::endl; + return 0; +} +