added tests for rstunnel item serialization

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3182 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/tests/serialiser/Makefile

@@ -10,12 +10,12 @@ include $(RS_TOP_DIR)/tests/scripts/config.mk
 TESTOBJ  = tlvbase_test.o tlvbase_test2.o tlvfileitem_test.o 
 TESTOBJ += tlvitems_test.o tlvstack_test.o tlvconfig_test.o 
 TESTOBJ += rsserial_test.o rstlvwidetest.o tlvrandom_test.o
-TESTOBJ += rsturtleitem_test.o
+TESTOBJ += rsturtleitem_test.o rstunnelitem_test.o
 
 TESTS  = tlvbase_test tlvbase_test2 tlvfileitem_test 
 TESTS += tlvitems_test tlvstack_test tlvconfig_test
 TESTS += rstlvwidetest tlvrandom_test rsserial_test 
-TESTS += rsturtleitem_test
+TESTS += rsturtleitem_test rstunnelitem_test
 
 #rsbaseitem_test
 
@@ -54,6 +54,9 @@ tlvrandom_test : tlvrandom_test.o
 rsturtleitem_test : rsturtleitem_test.o
 	$(CC) $(CFLAGS) -o rsturtleitem_test rsturtleitem_test.o $(OBJ) $(LIBS)
 
+rstunnelitem_test : rstunnelitem_test.o
+	$(CC) $(CFLAGS) -o rstunnelitem_test rstunnelitem_test.o $(OBJ) $(LIBS)
+
 
 ###############################################################
 include $(RS_TOP_DIR)/scripts/rules.mk

libretroshare/src/tests/serialiser/rstunnelitem_test.cc

@@ -0,0 +1,163 @@
+
+/*
+ * libretroshare/src/serialiser: rstunnelitems_test.cc
+ *
+ * RetroShare Serialiser.
+ *
+ * Copyright 2007-2008 by Cyril Soler
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+/******************************************************************
+ */
+
+#include <iostream>
+#include <sstream>
+#include <serialiser/rstunnelitems.h>
+#include <serialiser/rstlvutil.h>
+#include "util/utest.h"
+
+INITTEST();
+
+void init_item(RsTunnelDataItem& item)
+{
+	uint32_t S = lrand48()%20000 ;
+	item.encoded_data = malloc(S) ;
+	item.encoded_data_len = S ;
+	for(uint32_t i=0;i<S;++i)
+		((unsigned char *)item.encoded_data)[i] = lrand48()%256 ;
+	item.sourcePeerId = "67641e38df0e75432033d222eae93fff" ;
+	item.relayPeerId = "6013bfc2cea7ab823af7a79fb3ca0df1" ;
+	item.destPeerId = "1d5768db7cd4720d0eb75cc1917da332" ;
+}
+bool operator==(const RsTunnelDataItem& it1,const RsTunnelDataItem& it2)
+{
+	if(it1.encoded_data_len != it2.encoded_data_len) return false ;
+	if(it1.sourcePeerId != it2.sourcePeerId) return false ;
+	if(it1.relayPeerId != it2.relayPeerId) return false ;
+	if(it1.destPeerId != it2.destPeerId) return false ;
+
+	for(uint32_t i=0;i<it1.encoded_data_len;++i)
+		if( ((unsigned char *)it1.encoded_data)[i] != ((unsigned char *)it2.encoded_data)[i])
+			return false ;
+	return true ;
+}
+void init_item(RsTunnelHandshakeItem& item)
+{
+	item.sourcePeerId = "67641e38df0e75432033d222eae93fff" ;
+	item.relayPeerId = "6013bfc2cea7ab823af7a79fb3ca0df1" ;
+	item.destPeerId = "1d5768db7cd4720d0eb75cc1917da332" ;
+
+	item.sslCertPEM = "" ;
+	uint32_t s=lrand48()%20 ;
+	for(uint32_t i=0;i<s;++i)
+		item.sslCertPEM += "6013bfc2cea7ab823af7a79fb3ca0df1" ;
+	item.connection_accepted = lrand48() ;
+}
+bool operator==(const RsTunnelHandshakeItem& it1,const RsTunnelHandshakeItem& it2)
+{
+	if(it1.sourcePeerId != it2.sourcePeerId) return false ;
+	if(it1.relayPeerId != it2.relayPeerId) return false ;
+	if(it1.destPeerId != it2.destPeerId) return false ;
+	if(it1.sslCertPEM != it2.sslCertPEM) return false ;
+	if(it1.connection_accepted != it2.connection_accepted) return false ;
+
+	return true ;
+}
+
+template<class T> int test_RsItem()
+{
+	/* make a serialisable RsTurtleItem */
+
+	RsSerialiser srl;
+
+	/* initialise */
+	T rsfi ;
+	init_item(rsfi) ;
+
+	/* attempt to serialise it before we add it to the serialiser */
+
+	CHECK(0 == srl.size(&rsfi));
+
+	static const uint32_t MAX_BUFSIZE = 22000 ;
+
+	char *buffer = new char[MAX_BUFSIZE];
+	uint32_t sersize = MAX_BUFSIZE;
+
+	CHECK(false == srl.serialise(&rsfi, (void *) buffer, &sersize));
+
+	/* now add to serialiser */
+
+	RsTunnelSerialiser *rsfis = new RsTunnelSerialiser();
+	srl.addSerialType(rsfis);
+
+	uint32_t size = srl.size(&rsfi);
+	bool done = srl.serialise(&rsfi, (void *) buffer, &sersize);
+
+	std::cerr << "test_Item() size: " << size << std::endl;
+	std::cerr << "test_Item() done: " << done << std::endl;
+	std::cerr << "test_Item() sersize: " << sersize << std::endl;
+
+	std::cerr << "test_Item() serialised:" << std::endl;
+	displayRawPacket(std::cerr, (void *) buffer, sersize);
+
+	CHECK(done == true);
+
+	uint32_t sersize2 = sersize;
+	RsItem *output = srl.deserialise((void *) buffer, &sersize2);
+
+	CHECK(output != NULL);
+	CHECK(sersize2 == sersize);
+
+	T *outfi = dynamic_cast<T *>(output);
+
+	CHECK(outfi != NULL);
+
+	if (outfi)
+		CHECK(*outfi == rsfi) ;
+
+	sersize2 = MAX_BUFSIZE;
+	bool done2 = srl.serialise(outfi, (void *) &(buffer[16*8]), &sersize2);
+
+	CHECK(done2) ;
+	CHECK(sersize2 == sersize);
+
+	displayRawPacket(std::cerr, (void *) buffer, 16 * 8 + sersize2);
+
+	delete[] buffer ;
+	return 1;
+}
+
+int main()
+{
+//	srand48(1) ;	// always use the same random numbers
+	std::cerr << "RsTurtleItem Tests" << std::endl;
+
+	for(uint32_t i=0;i<20;++i)
+	{
+		test_RsItem<RsTunnelDataItem     >(); REPORT("Serialise/Deserialise RsTunnelDataItem");          
+		test_RsItem<RsTunnelHandshakeItem>(); REPORT("Serialise/Deserialise RsTunnelHandshakeItem");
+	}
+	
+	FINALREPORT("RstunnelItem Tests");
+
+	return TESTRESULT();
+}
+
+

libretroshare/src/tests/serialiser/rsturtleitem_test.cc

@@ -245,11 +245,11 @@ template<class T> int test_RsTurtleItem()
 	uint32_t size = srl.size(&rsfi);
 	bool done = srl.serialise(&rsfi, (void *) buffer, &sersize);
 
-	std::cerr << "test_RsFileItem() size: " << size << std::endl;
+	std::cerr << "test_Item() size: " << size << std::endl;
-	std::cerr << "test_RsFileItem() done: " << done << std::endl;
+	std::cerr << "test_Item() done: " << done << std::endl;
-	std::cerr << "test_RsFileItem() sersize: " << sersize << std::endl;
+	std::cerr << "test_Item() sersize: " << sersize << std::endl;
 
-	std::cerr << "test_RsFileItem() serialised:" << std::endl;
+	std::cerr << "test_Item() serialised:" << std::endl;
 	displayRawPacket(std::cerr, (void *) buffer, sersize);
 
 	CHECK(done == true);
@@ -283,6 +283,8 @@ int main()
 {
 	std::cerr << "RsTurtleItem Tests" << std::endl;
 
+	for(uint32_t i=0;i<20;++i)
+	{
 		test_RsTurtleItem<RsTurtleFileMapRequestItem>(); REPORT("Serialise/Deserialise RsTurtleFileMapRequestItem");
 		test_RsTurtleItem<RsTurtleFileMapItem       >(); REPORT("Serialise/Deserialise RsTurtleFileMapItem");
 		test_RsTurtleItem<RsTurtleFileDataItem      >(); REPORT("Serialise/Deserialise RsTurtleFileDataItem");
@@ -292,6 +294,7 @@ int main()
 		test_RsTurtleItem<RsTurtleSearchResultItem  >(); REPORT("Serialise/Deserialise RsTurtleSearchResultItem ");
 		test_RsTurtleItem<RsTurtleStringSearchRequestItem    >(); REPORT("Serialise/Deserialise RsTurtleStringSearchRequestItem ");
 		test_RsTurtleItem<RsTurtleRegExpSearchRequestItem    >(); REPORT("Serialise/Deserialise RsTurtleRegExpSearchRequestItem ");
+	}
 	
 	FINALREPORT("RsturtleItem Tests");