From 9e86265f915f5b32beed986473af2e636edb5b14 Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Wed, 25 Aug 2010 19:54:28 +0000 Subject: [PATCH] moved test sources to test directory and deleted a few dead files , created new util test directory. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3396 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsserver/testRsChanId.cc | 59 ------ libretroshare/src/serialiser/rsserviceitems.h | 180 ------------------ libretroshare/src/{ => tests}/ft/pqitestor.cc | 0 libretroshare/src/{ => tests}/ft/pqitestor.h | 0 .../src/{ => tests}/tcponudp/udptestfn.cc | 0 .../src/{ => tests}/tcponudp/udptestfn.h | 0 .../src/{ => tests}/util/dir2test.cc | 0 libretroshare/src/{ => tests}/util/dirtest.cc | 0 8 files changed, 239 deletions(-) delete mode 100644 libretroshare/src/rsserver/testRsChanId.cc delete mode 100644 libretroshare/src/serialiser/rsserviceitems.h rename libretroshare/src/{ => tests}/ft/pqitestor.cc (100%) rename libretroshare/src/{ => tests}/ft/pqitestor.h (100%) rename libretroshare/src/{ => tests}/tcponudp/udptestfn.cc (100%) rename libretroshare/src/{ => tests}/tcponudp/udptestfn.h (100%) rename libretroshare/src/{ => tests}/util/dir2test.cc (100%) rename libretroshare/src/{ => tests}/util/dirtest.cc (100%) diff --git a/libretroshare/src/rsserver/testRsChanId.cc b/libretroshare/src/rsserver/testRsChanId.cc deleted file mode 100644 index 82c17cf69..000000000 --- a/libretroshare/src/rsserver/testRsChanId.cc +++ /dev/null @@ -1,59 +0,0 @@ - -/* - * "$Id: testRsChanId.cc,v 1.1 2007-02-19 20:08:30 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2007 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". - * - */ - - - -#include "rstypes.h" -#include -#include -#include - -int main() -{ - RsCertId id; - - int i; - for(i = 0; i < 16; i++) - { - id.data[i] = i+121; - } - - std::cerr << "Cert Id: " << id << std::endl; - - std::ostringstream out; - out << id; - std::string idstr = out.str(); - - std::cerr << "Cert Id (str): " << idstr << std::endl; - - RsCertId id2(idstr); - - std::cerr << "Cert Id2 (from str): " << id2 << std::endl; - return 1; -} - - - diff --git a/libretroshare/src/serialiser/rsserviceitems.h b/libretroshare/src/serialiser/rsserviceitems.h deleted file mode 100644 index deae1f54c..000000000 --- a/libretroshare/src/serialiser/rsserviceitems.h +++ /dev/null @@ -1,180 +0,0 @@ -#ifndef RS_SERVICE_ITEMS_H -#define RS_SERVICE_ITEMS_H - -/* - * libretroshare/src/serialiser: rsserviceitems.h - * - * RetroShare Serialiser. - * - * 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". - * - */ - -#include - -#include "serialiser/rsserviceids.h" - -/**************************************************************************/ - -class RsChannelMsg: public RsItem -{ - public: - RsChannelMsg() - :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_CHANNEL, - RS_PKT_SUBTYPE_DEFAULT) - { return; } -virtual ~RsChannelMsg(); -virtual void clear(); - - RsTlvBinaryData cert; /* Mandatory */ - RsTlvFileSet files; /* Mandatory */ - RsTlvBinaryData sign; /* Mandatory */ -}; - -class RsChannelMsgSerialiser: public RsSerialType -{ - public: - RsChannelMsgSerialiser() - :RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_CHANNEL) - { return; } - -virtual ~RsChannelMsgSerialiser(); - -virtual uint32_t size(RsItem *); -virtual bool serialise (RsItem *item, void *data, uint32_t *size); -virtual RsItem * deserialise(void *data, uint32_t *size); - -}; - -/**************************************************************************/ - -class RsChatItem: public RsItem -{ - public: - RsChatItem() - :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_CHAT, - RS_PKT_SUBTYPE_DEFAULT) - { return; } -virtual ~RsChatItem(); -virtual void clear(); -std::ostream &print(std::ostream &out, uint16_t indent); - - uint32_t chatFlags; - uint32_t sendTime; - - std::string message; - -}; - -class RsChatItemSerialiser: public RsSerialType -{ - public: - RsChatItemSerialiser() - :RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_CHAT) - { return; } -virtual ~RsChatItemSerialiser(); - -virtual uint32_t size(RsItem *); -virtual bool serialise (RsItem *item, void *data, uint32_t *size); -virtual RsItem * deserialise(void *data, uint32_t *size); - -}; - -/**************************************************************************/ - -class RsMessageItem: public RsItem -{ - public: - RsMessageItem() - :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_MSG, - RS_PKT_SUBTYPE_DEFAULT) - { return; } -virtual ~RsMessageItem(); -virtual void clear(); -std::ostream &print(std::ostream &out, uint16_t indent); - - uint32_t msgFlags; - uint32_t sendTime; - uint32_t recvTime; - - std::string subject; - std::string message; - - RsTlvPeerIdSet msgto; - RsTlvPeerIdSet msgcc; - RsTlvPeerIdSet msgbcc; - - RsTlvFileSet attachment; -}; - -class RsMessageItemSerialiser: public RsSerialType -{ - public: - RsMessageItemSerialiser() - :RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_MSG) - { return; } -virtual ~RsMessageItemSerialiser(); - -virtual uint32_t size(RsItem *); -virtual bool serialise (RsItem *item, void *data, uint32_t *size); -virtual RsItem * deserialise(void *data, uint32_t *size); - -}; - -/**************************************************************************/ - -class RsStatus: public RsItem -{ - public: - RsStatus() - :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS, - RS_PKT_SUBTYPE_DEFAULT) - { return; } -virtual ~RsStatus(); -virtual void clear(); -std::ostream &print(std::ostream &out, uint16_t indent); - - /* status */ - uint32_t status; - RsTlvServiceIdSet services; -}; - -class RsStatusSerialiser: public RsSerialType -{ - public: - RsStatusSerialiser() - :RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS) - { return; } -virtual ~RsStatusSerialiser(); - -virtual uint32_t size(RsItem *); -virtual bool serialise (RsItem *item, void *data, uint32_t *size); -virtual RsItem * deserialise(void *data, uint32_t *size); - -}; - -/**************************************************************************/ - -/**************************************************************************/ - -/**************************************************************************/ - -#endif /* RS_SERVICE_ITEMS_H */ - - diff --git a/libretroshare/src/ft/pqitestor.cc b/libretroshare/src/tests/ft/pqitestor.cc similarity index 100% rename from libretroshare/src/ft/pqitestor.cc rename to libretroshare/src/tests/ft/pqitestor.cc diff --git a/libretroshare/src/ft/pqitestor.h b/libretroshare/src/tests/ft/pqitestor.h similarity index 100% rename from libretroshare/src/ft/pqitestor.h rename to libretroshare/src/tests/ft/pqitestor.h diff --git a/libretroshare/src/tcponudp/udptestfn.cc b/libretroshare/src/tests/tcponudp/udptestfn.cc similarity index 100% rename from libretroshare/src/tcponudp/udptestfn.cc rename to libretroshare/src/tests/tcponudp/udptestfn.cc diff --git a/libretroshare/src/tcponudp/udptestfn.h b/libretroshare/src/tests/tcponudp/udptestfn.h similarity index 100% rename from libretroshare/src/tcponudp/udptestfn.h rename to libretroshare/src/tests/tcponudp/udptestfn.h diff --git a/libretroshare/src/util/dir2test.cc b/libretroshare/src/tests/util/dir2test.cc similarity index 100% rename from libretroshare/src/util/dir2test.cc rename to libretroshare/src/tests/util/dir2test.cc diff --git a/libretroshare/src/util/dirtest.cc b/libretroshare/src/tests/util/dirtest.cc similarity index 100% rename from libretroshare/src/util/dirtest.cc rename to libretroshare/src/tests/util/dirtest.cc