Merge pull request #798 from PhenomRetroShare/Fix_TravisCompilation

Fix UnitTest compilation
2024-12-27 00:19:25 -05:00 · 2017-05-05 23:04:28 +02:00 · 2017-05-05 23:04:28 +02:00 · e4dde95621
commit e4dde95621
parent e913f3689a 1c2b43b7e0
19 changed files with 37 additions and 20 deletions
--- a/libretroshare/src/rsitems/rsnxsitems.cc
+++ b/libretroshare/src/rsitems/rsnxsitems.cc
@ -156,6 +156,19 @@ void RsNxsGrp::clear()
    meta.TlvClear();
 }

+RsNxsGrp* RsNxsGrp::clone() const {
+	RsNxsGrp* grp = new RsNxsGrp(this->grp.tlvtype);
+	*grp = *this;
+
+	if(this->metaData)
+	{
+		grp->metaData = new RsGxsGrpMetaData();
+		*(grp->metaData) = *(this->metaData);
+	}
+
+	return grp;
+}
+
 void RsNxsSyncGrpReqItem::clear()
 {
    flag = 0;
--- a/tests/librssimulator/testing/IsolatedServiceTester.cc
+++ b/tests/librssimulator/testing/IsolatedServiceTester.cc
@ -1,6 +1,7 @@

 #include <list>
 #include "retroshare/rsids.h"
+#include "rsitems/rsitem.h"
 #include "serialiser/rsserial.h"

 #include "testing/IsolatedServiceTester.h"
--- a/tests/librssimulator/testing/SetFilter.cc
+++ b/tests/librssimulator/testing/SetFilter.cc
@ -1,6 +1,8 @@

 #include "SetFilter.h"

+#include "rsitems/rsitem.h"
+
 bool SetFilter::filter(const SetPacket &pkt)
 {
 	switch(mFilterMode)
--- a/tests/librssimulator/testing/SetServiceTester.h
+++ b/tests/librssimulator/testing/SetServiceTester.h
@ -2,6 +2,7 @@

 #include <list>
 #include "retroshare/rsids.h"
+#include "rsitems/rsitem.h"
 #include "pqi/p3linkmgr.h"

 #include "SetPacket.h"
--- a/tests/unittests/libretroshare/gxs/common/data_support.h
+++ b/tests/unittests/libretroshare/gxs/common/data_support.h
@ -1,6 +1,6 @@
 #pragma once

-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "gxs/rsgxsdata.h"

 #define RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM 0x012
--- a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h
+++ b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h
@ -2,7 +2,7 @@
 #define RSDATASERVICE_TEST_H

 #include "util/rsthreads.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "gxs/rsgds.h"

 void test_messageStoresAndRetrieve();
--- a/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h
+++ b/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h
@ -6,7 +6,7 @@

 #include "gxs/rsnxs.h"
 #include "gxs/rsgixs.h"
-#include "serialiser/rsgxsitems.h"
+#include "rsitems/rsgxsitems.h"

 class RsDummyNetService: public RsNetworkExchangeService
 {
--- a/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc
+++ b/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc
@ -28,7 +28,7 @@
 */
 #include <gtest/gtest.h>

-#include "serialiser/rsgxsiditems.h"
+#include "rsitems/rsgxsiditems.h"
 #include "support.h"


--- a/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc
+++ b/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc
@ -8,7 +8,7 @@
 #include <gtest/gtest.h>

 #include "support.h"
-#include "serialiser/rsgxsupdateitems.h"
+#include "rsitems/rsgxsupdateitems.h"
 #define RS_SERVICE_TYPE_PLUGIN_SIMPLE_FORUM	0x0010

 RsSerialType* init_item(RsGxsGrpUpdateItem& i)
--- a/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc
+++ b/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc
@ -26,7 +26,7 @@
 #include <iostream>

 #include "util/rsrandom.h"
-#include "serialiser/rsmsgitems.h"
+#include "rsitems/rsmsgitems.h"
 #include "chat/rschatitems.h"

 #include "support.h"
@ -141,7 +141,7 @@ RsSerialType* init_item(RsMsgItem& mi)
 	mi.sendTime = mi.recvTime;
 	mi.msgFlags = mi.recvTime;

-	return new RsMsgSerialiser(true);
+	return new RsMsgSerialiser(RsServiceSerializer::SERIALIZATION_FLAG_NONE);
 }

 RsSerialType* init_item(RsMsgTagType& mtt)
@ -150,7 +150,7 @@ RsSerialType* init_item(RsMsgTagType& mtt)
 	mtt.tagId = rand()%24242;
 	randString(SHORT_STR, mtt.text);

-	return new RsMsgSerialiser();
+	return new RsMsgSerialiser(RsServiceSerializer::SERIALIZATION_FLAG_NONE);
 }


@ -163,7 +163,7 @@ RsSerialType* init_item(RsMsgTags& mt)
 		mt.tagIds.push_back(rand()%21341);
 	}

-	return new RsMsgSerialiser();
+	return new RsMsgSerialiser(RsServiceSerializer::SERIALIZATION_FLAG_NONE);
 }

 RsSerialType* init_item(RsMsgSrcId& ms)
@ -171,7 +171,7 @@ RsSerialType* init_item(RsMsgSrcId& ms)
 	ms.msgId = rand()%434;
    ms.srcId = RsPeerId::random();

-	return new RsMsgSerialiser();
+	return new RsMsgSerialiser(RsServiceSerializer::SERIALIZATION_FLAG_NONE);
 }

 RsSerialType* init_item(RsMsgParentId& ms)
@ -179,7 +179,7 @@ RsSerialType* init_item(RsMsgParentId& ms)
 	ms.msgId = rand()%354;
 	ms.msgParentId = rand()%476;

-	return new RsMsgSerialiser();
+	return new RsMsgSerialiser(RsServiceSerializer::SERIALIZATION_FLAG_NONE);
 }

 bool operator ==(const struct VisibleChatLobbyInfo& l, const struct VisibleChatLobbyInfo& r)
--- a/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc
+++ b/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc
@ -1,7 +1,7 @@

 #include "support.h"
 #include "libretroshare/gxs/common/data_support.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"


 #define NUM_BIN_OBJECTS 5
--- a/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc
+++ b/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc
@ -25,7 +25,7 @@


 #include "support.h"
-#include "serialiser/rsstatusitems.h"
+#include "rsitems/rsstatusitems.h"

 RsSerialType* init_item(RsStatusItem& rsi)
 {
--- a/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc
+++ b/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc
@ -5,7 +5,7 @@

 // from libretroshare
 #include "services/p3statusservice.h"
-#include "serialiser/rsstatusitems.h"
+#include "rsitems/rsstatusitems.h"
 #include "gxs/rsgixs.h"
 #include "gxs/rsdataservice.h"
 #include "gxs/rsgxsnetservice.h"
--- a/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc
+++ b/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc
@ -5,7 +5,7 @@
 #include "gxstestservice.h"

 // libretroshare
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"

 GxsPairServiceTester::GxsPairServiceTester(const RsPeerId &peerId1, const RsPeerId &peerId2, int testMode, bool useIdentityService)
 	:SetServiceTester()
--- a/tests/unittests/libretroshare/services/gxs/gxscircle_tests.cc
+++ b/tests/unittests/libretroshare/services/gxs/gxscircle_tests.cc
@ -4,7 +4,7 @@
 // from librssimulator

 // from libretroshare
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"

 // local
 #include "GxsPairServiceTester.h"
--- a/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc
+++ b/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc
@ -8,7 +8,7 @@
 //#include "gxs/rsgixs.h"
 //#include "gxs/rsdataservice.h"
 //#include "gxs/rsgxsnetservice.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"

 // local
 #include "GxsIsolatedServiceTester.h"
--- a/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc
+++ b/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc
@ -4,7 +4,7 @@
 // from librssimulator

 // from libretroshare
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"

 // local
 #include "GxsPairServiceTester.h"
--- a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h
+++ b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h
@ -30,7 +30,7 @@
 #include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"

-#include "serialiser/rsgxsitems.h"
+#include "rsitems/rsgxsitems.h"
 #include "gxstestservice.h"

 const uint8_t RS_PKT_SUBTYPE_TEST_GROUP_ITEM = 0x02;
--- a/tests/unittests/libretroshare/services/status/status_test.cc
+++ b/tests/unittests/libretroshare/services/status/status_test.cc
@ -7,7 +7,7 @@

 // from libretroshare
 #include "services/p3statusservice.h"
-#include "serialiser/rsstatusitems.h"
+#include "rsitems/rsstatusitems.h"

 #define N_PEERS 10