Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-10 23:52:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed relatedMsgData bug (PARENT | LATEST), same issue as ALL_VERSION opt flags, was using origMsgId used for filtering (filtering worked as bugged request was actually requesting all msgs instead).

Browse source 
Added test for (PARENT | LATEST)
All tests passed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-11-17 18:45:14 +00:00
parent d591d795bd
commit ae5cbecaba
4 changed files with 204 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/gxs/rsgxsdataaccess.cc
View file

@ -1221,7 +1221,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
{ {
// add as latest. (overwriting if necessary) // add as latest. (overwriting if necessary)
origMsgTs[meta->mOrigMsgId] = std::make_pair(meta->mMsgId, meta->mPublishTs); origMsgTs[meta->mOrigMsgId] = std::make_pair(meta->mMsgId, meta->mPublishTs);
metaMap.insert(std::make_pair(meta->mOrigMsgId, meta)); metaMap.insert(std::make_pair(meta->mMsgId, meta));
} }
} }
@ -1275,7 +1275,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
filteredOutMsgIds[grpId] = outMsgIds; filteredOutMsgIds[grpId] = outMsgIds;
filterMsgList(filteredOutMsgIds, opts, filterMap); filterMsgList(filteredOutMsgIds, opts, filterMap);
if(!outMsgIds.empty()) if(!filteredOutMsgIds[grpId].empty())
{ {
if(req->Options.mReqType == GXS_REQUEST_TYPE_MSG_RELATED_IDS) if(req->Options.mReqType == GXS_REQUEST_TYPE_MSG_RELATED_IDS)
{ {

194
libretroshare/src/tests/gxs/genexchangetester.cpp
View file

@ -979,6 +979,7 @@ bool GenExchangeTester::testMsgRelatedChildDataRetrieval()
for(int i=0; i < nMsgs; i++) for(int i=0; i < nMsgs; i++)
{ {
RsDummyMsg* msg = msgs[i]; RsDummyMsg* msg = msgs[i];
RsDummyMsg* msgCopy = NULL;
if(first){ if(first){
msg->meta.mParentId = ""; msg->meta.mParentId = "";
@ -989,8 +990,14 @@ bool GenExchangeTester::testMsgRelatedChildDataRetrieval()
msg->meta.mParentId = firstMsgId.second; msg->meta.mParentId = firstMsgId.second;
msg->meta.mGroupId = firstMsgId.first; msg->meta.mGroupId = firstMsgId.first;
msg->meta.mOrigMsgId = ""; msg->meta.mOrigMsgId = "";
msgCopy = new RsDummyMsg();
} }
// make a copy of msg for store in data out
if(msgCopy)
*msgCopy = *msg;
mTestService->publishDummyMsg(token, msg); mTestService->publishDummyMsg(token, msg);
pollForToken(token, opts); pollForToken(token, opts);
RsGxsGrpMsgIdPair msgId; RsGxsGrpMsgIdPair msgId;
@ -1007,7 +1014,8 @@ bool GenExchangeTester::testMsgRelatedChildDataRetrieval()
// don't add the id to be related // don't add the id to be related
if(!first) if(!first)
{ {
mMsgRelatedDataMapOut[firstMsgId].push_back(msg); msgCopy->meta.mMsgId = msgId.second;
mMsgRelatedDataMapOut[firstMsgId].push_back(msgCopy);
} }
if(first){ if(first){
@ -1040,12 +1048,22 @@ bool GenExchangeTester::testMsgRelatedChildDataRetrieval()
std::vector<RsGxsMsgItem*>& msgDataIn = mMsgRelatedDataMapIn[mit->first]; std::vector<RsGxsMsgItem*>& msgDataIn = mMsgRelatedDataMapIn[mit->first];
vit_in = msgDataIn.begin(); vit_in = msgDataIn.begin();
for(; vit_in != msgDataIn.end(); vit_in++) RsGxsMsgItem* mItem = *vit_out;
{ RsDummyMsg* msgOut = dynamic_cast<RsDummyMsg*>(*vit_out);
if(*vit_in == *vit_out)
found = true;
}
if(msgOut)
{
for(; vit_in != msgDataIn.end(); vit_in++)
{
RsDummyMsg* msgIn = dynamic_cast<RsDummyMsg*>(*vit_in);
if(msgIn)
{
if(msgIn->meta.mMsgId == msgOut->meta.mMsgId)
found = true;
}
}
}
if(!found){ if(!found){
breakDown(); breakDown();
return false; return false;
@ -1062,6 +1080,170 @@ bool GenExchangeTester::testMsgRelatedChildDataRetrieval()
return true; return true;
} }
bool GenExchangeTester::testMsgRelatedChildDataRetrieval_Multi()
{
// start up
setUp();
setUpGrps(GXS_SERV::FLAG_PRIVACY_PUBLIC);
/********************/
// create msgs
// then make all requests immediately then poll afterwards for each and run outbound test
// we want only latest for now
int nMsgs = 5; // test a large number of msgs
std::vector<RsDummyMsg*> msgs;
createMsgs(msgs, nMsgs);
RsTokReqOptions opts;
opts.mReqType = 4000;
uint32_t token;
bool first = true;
RsGxsGrpMsgIdPair firstMsgId;
// everyone is parent of first msg
RsGxsMessageId msgIdVersion;
for(int i=0; i < nMsgs; i++)
{
RsDummyMsg* msg = msgs[i];
RsDummyMsg* msgCopy = NULL;
bool getMsgVersionId= false;
if(first){
msg->meta.mParentId = "";
msg->meta.mOrigMsgId = "";
}
else
{
// every even numbered msg is a version of the one before
msg->meta.mParentId = firstMsgId.second;
msg->meta.mGroupId = firstMsgId.first;
msg->meta.mOrigMsgId = "";
// every even numbered msg is version of the previous odd numbered msg
if((i%2))
{
getMsgVersionId = true;
}
else
{
/** just in case put it to sleep so publish time is sufficiently later **/
double timeDelta = 2.;
#ifndef WINDOWS_SYS
usleep((int) (timeDelta * 1000000));
#else
Sleep((int) (timeDelta * 1000));
#endif
msg->meta.mOrigMsgId = msgIdVersion;
msgCopy = new RsDummyMsg();
}
}
// make a copy of msg for store in data out
if(msgCopy)
*msgCopy = *msg;
mTestService->publishDummyMsg(token, msg);
pollForToken(token, opts);
RsGxsGrpMsgIdPair msgId;
mTestService->acknowledgeTokenMsg(token, msgId);
if(msgId.first.empty() || msgId.second.empty())
{
breakDown();
std::cerr << "serious error: Acknowledgement failed! " << std::endl;
return false;
}
// don't add the id to be related
if(!first)
{
if(getMsgVersionId)
{
msgIdVersion = msgId.second;
}else
{
msgCopy->meta.mMsgId = msgId.second;
mMsgRelatedDataMapOut[firstMsgId].push_back(msgCopy);
}
}
if(first){
firstMsgId.second = msgId.second;
firstMsgId.first = msgId.first;
first = false;
}
}
opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA;
opts.mOptions = RS_TOKREQOPT_MSG_PARENT | RS_TOKREQOPT_MSG_LATEST;
std::vector<RsGxsGrpMsgIdPair> msgIdList;
msgIdList.push_back(firstMsgId);
mTokenService->requestMsgRelatedInfo(token, 0, opts, msgIdList);
pollForToken(token, opts);
GxsMsgRelatedDataMap::iterator mit = mMsgRelatedDataMapOut.begin();
for(; mit != mMsgRelatedDataMapOut.end(); mit++)
{
std::vector<RsGxsMsgItem*>& msgDataOut = mit->second;
std::vector<RsGxsMsgItem*>::iterator vit_out = msgDataOut.begin(), vit_in;
for(; vit_out != msgDataOut.end(); vit_out++)
{
bool found = false;
std::vector<RsGxsMsgItem*>& msgDataIn = mMsgRelatedDataMapIn[mit->first];
vit_in = msgDataIn.begin();
RsGxsMsgItem* mItem = *vit_out;
RsDummyMsg* msgOut = dynamic_cast<RsDummyMsg*>(*vit_out);
if(msgOut)
{
for(; vit_in != msgDataIn.end(); vit_in++)
{
RsDummyMsg* msgIn = dynamic_cast<RsDummyMsg*>(*vit_in);
if(msgIn)
{
if(msgIn->meta.mMsgId == msgOut->meta.mMsgId)
found = true;
}
}
}
if(!found){
breakDown();
return false;
}
}
}
/********************/
// complete
breakDown();
return true;
}
bool GenExchangeTester::testSpecificMsgMetaRetrieval() bool GenExchangeTester::testSpecificMsgMetaRetrieval()

1
libretroshare/src/tests/gxs/genexchangetester.h
View file

@ -36,6 +36,7 @@ public:
// request msg related tests // request msg related tests
bool testMsgRelatedChildIdRetrieval(); bool testMsgRelatedChildIdRetrieval();
bool testMsgRelatedChildDataRetrieval(); bool testMsgRelatedChildDataRetrieval();
bool testMsgRelatedChildDataRetrieval_Multi();
bool testMsgAllVersions(); bool testMsgAllVersions();

25
libretroshare/src/tests/gxs/rsgenexchange_test.cc
View file

@ -14,19 +14,20 @@ int main()
{ {
GenExchangeTester tester; GenExchangeTester tester;
// CHECK(tester.testMsgSubmissionRetrieval()); REPORT("testMsgSubmissionRetrieval()"); CHECK(tester.testMsgSubmissionRetrieval()); REPORT("testMsgSubmissionRetrieval()");
// CHECK(tester.testSpecificMsgMetaRetrieval()); REPORT("testSpecificMsgMetaRetrieval()"); CHECK(tester.testSpecificMsgMetaRetrieval()); REPORT("testSpecificMsgMetaRetrieval()");
// CHECK(tester.testMsgIdRetrieval()); REPORT("tester.testMsgIdRetrieval()"); CHECK(tester.testMsgIdRetrieval()); REPORT("tester.testMsgIdRetrieval()");
// CHECK(tester.testMsgIdRetrieval_OptParents()); REPORT("tester.testRelatedMsgIdRetrieval_Parents()"); CHECK(tester.testMsgIdRetrieval_OptParents()); REPORT("tester.testRelatedMsgIdRetrieval_Parents()");
// CHECK(tester.testMsgIdRetrieval_OptOrigMsgId()); REPORT("tester.testRelatedMsgIdRetrieval_OrigMsgId()"); CHECK(tester.testMsgIdRetrieval_OptOrigMsgId()); REPORT("tester.testRelatedMsgIdRetrieval_OrigMsgId()");
// CHECK(tester.testMsgIdRetrieval_OptLatest()); REPORT("tester.testRelatedMsgIdRetrieval_Latest()"); CHECK(tester.testMsgIdRetrieval_OptLatest()); REPORT("tester.testRelatedMsgIdRetrieval_Latest()");
// CHECK(tester.testMsgMetaModRequest()); REPORT("tester.testMsgMetaModRequest()"); CHECK(tester.testMsgMetaModRequest()); REPORT("tester.testMsgMetaModRequest()");
//CHECK(tester.testMsgRelatedChildDataRetrieval()); REPORT("tester.testMsgRelatedChildDataRetrieval()"); CHECK(tester.testMsgRelatedChildDataRetrieval()); REPORT("tester.testMsgRelatedChildDataRetrieval()");
// CHECK(tester.testMsgAllVersions()); REPORT("tester.testMsgAllVersions()"); CHECK(tester.testMsgRelatedChildDataRetrieval_Multi()); REPORT("tester.testMsgRelatedChildDataRetrieval_Multi()");
CHECK(tester.testMsgAllVersions()); REPORT("tester.testMsgAllVersions()");
// CHECK(tester.testGrpSubmissionRetrieval()); REPORT("tester.testGrpSubmissionRetrieval()"); CHECK(tester.testGrpSubmissionRetrieval()); REPORT("tester.testGrpSubmissionRetrieval()");
// CHECK(tester.testGrpMetaRetrieval()); REPORT("tester.testGrpMetaRetrieval()"); CHECK(tester.testGrpMetaRetrieval()); REPORT("tester.testGrpMetaRetrieval()");
// CHECK(tester.testGrpIdRetrieval()); REPORT("tester.testGrpIdRetrieval()"); CHECK(tester.testGrpIdRetrieval()); REPORT("tester.testGrpIdRetrieval()");
CHECK(tester.testGrpMetaModRequest()); REPORT("tester.testGrpMetaModRequest()"); CHECK(tester.testGrpMetaModRequest()); REPORT("tester.testGrpMetaModRequest()");
FINALREPORT("RsGenExchangeTest"); FINALREPORT("RsGenExchangeTest");