Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-22 07:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added cleanup function to test hub

Browse source 
refined group retrieval for RsDataService
also added fix for RsNxsTrasac flag masks
added group data send transaction generation, and fix for request generation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-07-14 17:59:54 +00:00
parent 24f6f874f2
commit d3e5ec2836
12 changed files with 489 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/tests/gxs/nxstesthub.cc
View file

@ -66,9 +66,12 @@ void NxsTestHub::run()
netServicePairs.second->join();
}
void NxsTestHub::cleanUp()
{
mTestScenario->cleanUp();
}
bool NxsTestHub::testsPassed()
{
return false;
}

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

@ -94,6 +94,7 @@ public:
void run();
void cleanUp();
private:
std::pair<p3Service*, p3Service*> mServicePairs;

10
libretroshare/src/tests/gxs/nxstestscenario.cc
View file

@ -88,8 +88,8 @@ void NxsMessageTest::populateStore(RsGeneralDataService* dStore)
init_item(*msg);
init_item(msgMeta);
std::pair<RsNxsMsg*, RsGxsMsgMetaData*> p(msg, msgMeta);
int chosen = 0;
// pick a grp at random to associate the msg to
const std::string& grpId = grpIdList[rand()%nGrp];
msgMeta->mMsgId = msg->msgId;
msgMeta->mGroupId = msg->grpId = grpId;
@ -145,3 +145,11 @@ RsGeneralDataService* NxsMessageTest::dummyDataService2()
{
return mStorePair.second;
}
void NxsMessageTest::cleanUp()
{
mStorePair.first->resetDataStore();
mStorePair.second->resetDataStore();
return;
}

12
libretroshare/src/tests/gxs/nxstestscenario.h
View file

@ -24,6 +24,12 @@ public:
virtual RsGeneralDataService* dummyDataService1() = 0;
virtual RsGeneralDataService* dummyDataService2() = 0;
/*!
* Call to remove files created
* in the test directory
*/
virtual void cleanUp() = 0;
};
@ -38,6 +44,12 @@ public:
RsGeneralDataService* dummyDataService1();
RsGeneralDataService* dummyDataService2();
/*!
* Call to remove files created
* in the test directory
*/
void cleanUp();
public:
/*!

4
libretroshare/src/tests/gxs/rsgxsnetservice_test.cc
View file

@ -23,11 +23,13 @@ int main()
createThread(hub);
// put this thread to sleep for 10 secs
usleep(10000);
sleep(10);
hub.join();
CHECK(hub.testsPassed());
hub.cleanUp();
FINALREPORT("RsGxsNetService Tests");
return TESTRESULT();

4
libretroshare/src/tests/serialiser/rsnxsitems_test.cc
View file

@ -86,7 +86,7 @@ RsSerialType* init_item(RsNxsTransac& rstx){
rstx.clear();
rstx.timeout = rand()%14141;
rstx.timestamp = rand()%14141;
rstx.transactFlag = rand()%2424;
rstx.nItems = rand()%33132;
rstx.transactionNumber = rand()%242112;
@ -162,7 +162,7 @@ bool operator==(const RsNxsTransac& l, const RsNxsTransac& r){
if(l.transactFlag != r.transactFlag) return false;
if(l.transactionNumber != r.transactionNumber) return false;
if(l.timeout != r.timeout) return false;
if(l.timestamp != r.timestamp) return false;
if(l.nItems != r.nItems) return false;