Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed initialisation of random ids

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-05 16:01:08 +00:00
parent 679efe2ff3
commit 61080e9816
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/unittests/libretroshare/gxs/common/data_support.cc
View file

@ -1,6 +1,7 @@
#include "libretroshare/serialiser/support.h" #include "libretroshare/serialiser/support.h"
#include "data_support.h" #include "data_support.h"
template<class T> void init_random(T& t) { t = T::random() ; }
bool operator==(const RsNxsGrp& l, const RsNxsGrp& r){ bool operator==(const RsNxsGrp& l, const RsNxsGrp& r){
@ -88,33 +89,46 @@ void init_item(RsNxsMsg& nxm)
void init_item(RsGxsGrpMetaData* metaGrp) void init_item(RsGxsGrpMetaData* metaGrp)
{ {
metaGrp->mGroupId.random(); init_random(metaGrp->mGroupId);
metaGrp->mOrigGrpId.random(); init_random(metaGrp->mOrigGrpId);
metaGrp->mAuthorId.random(); init_random(metaGrp->mAuthorId);
init_random(metaGrp->mCircleId);
init_random(metaGrp->mParentGrpId);
randString(SHORT_STR, metaGrp->mGroupName); randString(SHORT_STR, metaGrp->mGroupName);
randString(SHORT_STR, metaGrp->mServiceString);
init_item(metaGrp->signSet); init_item(metaGrp->signSet);
init_item(metaGrp->keys); init_item(metaGrp->keys);
metaGrp->mPublishTs = rand()%3452; metaGrp->mPublishTs = rand()%3452;
metaGrp->mGroupFlags = rand()%43; metaGrp->mGroupFlags = rand()%43;
metaGrp->mSignFlags = rand()%43;
metaGrp->mAuthenFlags = rand()%43;
metaGrp->mGroupStatus = rand()%313;
metaGrp->mSubscribeFlags = rand()%2251; metaGrp->mSubscribeFlags = rand()%2251;
metaGrp->mPop = rand()%5262;
metaGrp->mMsgCount = rand()%2421; metaGrp->mMsgCount = rand()%2421;
metaGrp->mLastPost = rand()%2211; metaGrp->mLastPost = rand()%2211;
metaGrp->mPop = rand()%5262; metaGrp->mReputationCutOff = rand()%5262;
metaGrp->mGroupStatus = rand()%313;
metaGrp->mRecvTS = rand()%313;
metaGrp->mOriginator = RsPeerId::random() ;
metaGrp->mInternalCircle = RsGxsCircleId::random() ;
metaGrp->mHash = RsFileHash::random() ;
} }
void init_item(RsGxsMsgMetaData* metaMsg) void init_item(RsGxsMsgMetaData* metaMsg)
{ {
metaMsg->mGroupId.random(); init_random(metaMsg->mGroupId) ;
metaMsg->mMsgId.random(); init_random(metaMsg->mMsgId) ;
metaMsg->mThreadId.random(); init_random(metaMsg->mThreadId) ;
metaMsg->mParentId.random(); init_random(metaMsg->mParentId) ;
metaMsg->mAuthorId.random(); init_random(metaMsg->mAuthorId) ;
metaMsg->mOrigMsgId.random(); init_random(metaMsg->mOrigMsgId) ;
randString(SHORT_STR, metaMsg->mMsgName); randString(SHORT_STR, metaMsg->mMsgName);
init_item(metaMsg->signSet); init_item(metaMsg->signSet);
@ -132,7 +146,7 @@ RsSerialType* init_item(RsNxsGrp& nxg)
{ {
nxg.clear(); nxg.clear();
nxg.grpId.random(); init_random(nxg.grpId) ;
nxg.transactionNumber = rand()%23; nxg.transactionNumber = rand()%23;
init_item(nxg.grp); init_item(nxg.grp);
init_item(nxg.meta); init_item(nxg.meta);
@ -145,8 +159,8 @@ RsSerialType* init_item(RsNxsMsg& nxm)
{ {
nxm.clear(); nxm.clear();
nxm.msgId.random(); init_random(nxm.msgId) ;
nxm.grpId.random(); init_random(nxm.grpId) ;
init_item(nxm.msg); init_item(nxm.msg);
init_item(nxm.meta); init_item(nxm.meta);
nxm.transactionNumber = rand()%23; nxm.transactionNumber = rand()%23;
@ -171,7 +185,7 @@ RsSerialType* init_item(RsNxsSyncMsg& rsgm)
rsgm.flag = RsNxsSyncMsg::FLAG_USE_SYNC_HASH; rsgm.flag = RsNxsSyncMsg::FLAG_USE_SYNC_HASH;
rsgm.createdSince = rand()%24232; rsgm.createdSince = rand()%24232;
rsgm.transactionNumber = rand()%23; rsgm.transactionNumber = rand()%23;
rsgm.grpId.random(); init_random(rsgm.grpId) ;
randString(SHORT_STR, rsgm.syncHash); randString(SHORT_STR, rsgm.syncHash);
return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM); return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
@ -184,7 +198,7 @@ RsSerialType* init_item(RsNxsSyncGrpItem& rsgl)
rsgl.flag = RsNxsSyncGrpItem::FLAG_RESPONSE; rsgl.flag = RsNxsSyncGrpItem::FLAG_RESPONSE;
rsgl.transactionNumber = rand()%23; rsgl.transactionNumber = rand()%23;
rsgl.publishTs = rand()%23; rsgl.publishTs = rand()%23;
rsgl.grpId.random(); init_random(rsgl.grpId) ;
return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM); return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
} }
@ -195,8 +209,8 @@ RsSerialType* init_item(RsNxsSyncMsgItem& rsgml)
rsgml.flag = RsNxsSyncGrpItem::FLAG_RESPONSE; rsgml.flag = RsNxsSyncGrpItem::FLAG_RESPONSE;
rsgml.transactionNumber = rand()%23; rsgml.transactionNumber = rand()%23;
rsgml.grpId.random(); init_random(rsgml.grpId) ;
rsgml.msgId.random(); init_random(rsgml.msgId) ;
return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM); return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
} }

4
tests/unittests/libretroshare/serialiser/tlvtypes_test.cc
View file

@ -253,7 +253,7 @@ TEST(libretroshare_serialiser, test_RsTlvBinData)
b1.setBinData(data, bin_size); b1.setBinData(data, bin_size);
delete data; delete[] data;
//do check //do check
EXPECT_TRUE(test_SerialiseTlvItem(std::cerr, &b1, &b2)); EXPECT_TRUE(test_SerialiseTlvItem(std::cerr, &b1, &b2));
@ -278,7 +278,7 @@ TEST(libretroshare_serialiser, test_RsTlvImage)
image1.image_type = RSTLV_IMAGE_TYPE_PNG; image1.image_type = RSTLV_IMAGE_TYPE_PNG;
image1.binData.setBinData(image_data, bin_size); image1.binData.setBinData(image_data, bin_size);
delete image_data; delete[] image_data;
EXPECT_TRUE(test_SerialiseTlvItem(std::cerr, &image1, &image2)); EXPECT_TRUE(test_SerialiseTlvItem(std::cerr, &image1, &image2));
} }