Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-16 01:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed sometests with new ids

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-02-22 13:51:55 +00:00
parent a6cf0e14d7
commit 216e1ba247
3 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/tests/serialiser/rstunnelitem_test.cc
View file

@ -30,7 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <serialiser/rstunnelitems.h>
#include <serialiser/rstlvutil.h> #include <serialiser/rstlvutil.h>
#include "util/utest.h" #include "util/utest.h"
#include "support.h" #include "support.h"

1
libretroshare/src/tests/serialiser/rsturtleitem_test.cc
View file

@ -30,6 +30,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "turtle/rsturtleitem.h" #include "turtle/rsturtleitem.h"
#include "ft/ftturtlefiletransferitem.h"
#include <serialiser/rstlvutil.h> #include <serialiser/rstlvutil.h>
#include "support.h" #include "support.h"
#include "util/utest.h" #include "util/utest.h"

24
libretroshare/src/tests/serialiser/support.cc
View file

@ -107,7 +107,7 @@ bool operator==(const RsTlvKeySignatureSet& kss1, const RsTlvKeySignatureSet& ks
bool operator==(const RsTlvPeerIdSet& pids1, const RsTlvPeerIdSet& pids2) bool operator==(const RsTlvPeerIdSet& pids1, const RsTlvPeerIdSet& pids2)
{ {
std::list<std::string>::const_iterator it1 = pids1.ids.begin(), std::list<RsPeerId>::const_iterator it1 = pids1.ids.begin(),
it2 = pids2.ids.begin(); it2 = pids2.ids.begin();
@ -204,37 +204,23 @@ bool operator==(const RsTlvImage& img1, const RsTlvImage& img2)
void init_item(RsTlvHashSet& hs) void init_item(RsTlvHashSet& hs)
{ {
std::string hash;
for(int i=0; i < 10; i++) for(int i=0; i < 10; i++)
{ hs.ids.push_back(RsFileHash::random());
randString(SHORT_STR, hash);
hs.ids.push_back(hash);
}
hs.mType = TLV_TYPE_HASHSET;
return; return;
} }
void init_item(RsTlvPeerIdSet& ps) void init_item(RsTlvPeerIdSet& ps)
{ {
std::string peer;
for(int i=0; i < 10; i++) for(int i=0; i < 10; i++)
{ ps.ids.push_back(RsPeerId::random());
randString(SHORT_STR, peer);
ps.ids.push_back(peer);
}
ps.mType = TLV_TYPE_PEERSET;
return; return;
} }
bool operator==(const RsTlvHashSet& hs1,const RsTlvHashSet& hs2) bool operator==(const RsTlvHashSet& hs1,const RsTlvHashSet& hs2)
{ {
if(hs1.mType != hs2.mType) return false; std::list<RsFileHash>::const_iterator it1 = hs1.ids.begin(),
std::list<std::string>::const_iterator it1 = hs1.ids.begin(),
it2 = hs2.ids.begin(); it2 = hs2.ids.begin();
for(; ((it1 != hs1.ids.end()) && (it2 != hs2.ids.end())); it1++, it2++) for(; ((it1 != hs1.ids.end()) && (it2 != hs2.ids.end())); it1++, it2++)
@ -249,7 +235,7 @@ void init_item(RsTlvFileItem& fi)
{ {
fi.age = rand()%200; fi.age = rand()%200;
fi.filesize = rand()%34030313; fi.filesize = rand()%34030313;
randString(SHORT_STR, fi.hash); fi.hash = RsFileHash::random();
randString(SHORT_STR, fi.name); randString(SHORT_STR, fi.name);
randString(SHORT_STR, fi.path); randString(SHORT_STR, fi.path);
fi.piecesize = rand()%232; fi.piecesize = rand()%232;