From 61080e98168b84dd1ffaae4e4c0367ae818f95b1 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sat, 5 Apr 2014 16:01:08 +0000
Subject: [PATCH] fixed initialisation of random ids

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../libretroshare/gxs/common/data_support.cc  | 50 ++++++++++++-------
 .../libretroshare/serialiser/tlvtypes_test.cc |  4 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/tests/unittests/libretroshare/gxs/common/data_support.cc b/tests/unittests/libretroshare/gxs/common/data_support.cc
index 7652fce41..9e53f6c4b 100644
--- a/tests/unittests/libretroshare/gxs/common/data_support.cc
+++ b/tests/unittests/libretroshare/gxs/common/data_support.cc
@@ -1,6 +1,7 @@
 #include "libretroshare/serialiser/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){
 
@@ -88,33 +89,46 @@ void init_item(RsNxsMsg& nxm)
 void init_item(RsGxsGrpMetaData* metaGrp)
 {
 
-    metaGrp->mGroupId.random();
-    metaGrp->mOrigGrpId.random();
-    metaGrp->mAuthorId.random();
+    init_random(metaGrp->mGroupId);
+    init_random(metaGrp->mOrigGrpId);
+    init_random(metaGrp->mAuthorId);
+    init_random(metaGrp->mCircleId);
+    init_random(metaGrp->mParentGrpId);
     randString(SHORT_STR, metaGrp->mGroupName);
+    randString(SHORT_STR, metaGrp->mServiceString);
 
     init_item(metaGrp->signSet);
     init_item(metaGrp->keys);
 
     metaGrp->mPublishTs = rand()%3452;
     metaGrp->mGroupFlags = rand()%43;
+    metaGrp->mSignFlags = rand()%43;
+    metaGrp->mAuthenFlags = rand()%43;
 
-    metaGrp->mGroupStatus = rand()%313;
     metaGrp->mSubscribeFlags = rand()%2251;
+    metaGrp->mPop = rand()%5262;
     metaGrp->mMsgCount = rand()%2421;
     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)
 {
 
-    metaMsg->mGroupId.random();
-    metaMsg->mMsgId.random();
-    metaMsg->mThreadId.random();
-    metaMsg->mParentId.random();
-    metaMsg->mAuthorId.random();
-    metaMsg->mOrigMsgId.random();
+    init_random(metaMsg->mGroupId) ;
+    init_random(metaMsg->mMsgId) ;
+    init_random(metaMsg->mThreadId) ;
+    init_random(metaMsg->mParentId) ;
+    init_random(metaMsg->mAuthorId) ;
+    init_random(metaMsg->mOrigMsgId) ;
+
     randString(SHORT_STR, metaMsg->mMsgName);
 
     init_item(metaMsg->signSet);
@@ -132,7 +146,7 @@ RsSerialType* init_item(RsNxsGrp& nxg)
 {
     nxg.clear();
 
-    nxg.grpId.random();
+    init_random(nxg.grpId) ;
     nxg.transactionNumber = rand()%23;
     init_item(nxg.grp);
     init_item(nxg.meta);
@@ -145,8 +159,8 @@ RsSerialType* init_item(RsNxsMsg& nxm)
 {
     nxm.clear();
 
-    nxm.msgId.random();
-    nxm.grpId.random();
+    init_random(nxm.msgId) ;
+    init_random(nxm.grpId) ;
     init_item(nxm.msg);
     init_item(nxm.meta);
     nxm.transactionNumber = rand()%23;
@@ -171,7 +185,7 @@ RsSerialType* init_item(RsNxsSyncMsg& rsgm)
     rsgm.flag = RsNxsSyncMsg::FLAG_USE_SYNC_HASH;
     rsgm.createdSince = rand()%24232;
     rsgm.transactionNumber = rand()%23;
-    rsgm.grpId.random();
+    init_random(rsgm.grpId) ;
     randString(SHORT_STR, rsgm.syncHash);
 
     return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
@@ -184,7 +198,7 @@ RsSerialType* init_item(RsNxsSyncGrpItem& rsgl)
     rsgl.flag = RsNxsSyncGrpItem::FLAG_RESPONSE;
     rsgl.transactionNumber = rand()%23;
     rsgl.publishTs = rand()%23;
-    rsgl.grpId.random();
+    init_random(rsgl.grpId) ;
 
     return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
 }
@@ -195,8 +209,8 @@ RsSerialType* init_item(RsNxsSyncMsgItem& rsgml)
 
     rsgml.flag = RsNxsSyncGrpItem::FLAG_RESPONSE;
     rsgml.transactionNumber = rand()%23;
-    rsgml.grpId.random();
-    rsgml.msgId.random();
+    init_random(rsgml.grpId) ;
+    init_random(rsgml.msgId) ;
 
     return new RsNxsSerialiser(RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM);
 }
diff --git a/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc b/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc
index 8fb009a5d..9f9fb3265 100644
--- a/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc
+++ b/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc
@@ -253,7 +253,7 @@ TEST(libretroshare_serialiser, test_RsTlvBinData)
 
 
 	b1.setBinData(data, bin_size);
-	delete data;
+	delete[] data;
 
 	//do check
 	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.binData.setBinData(image_data, bin_size);
 
-	delete image_data;
+	delete[] image_data;
 
 	EXPECT_TRUE(test_SerialiseTlvItem(std::cerr, &image1, &image2));
 }