Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed util tests

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-12-27 15:58:55 +00:00
parent 7e19517451
commit d1752bbdcb
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/tests/util/dirtest.cc
View File

@ -27,6 +27,7 @@
#include "util/rsdir.h" #include "util/rsdir.h"
#include "util/utest.h"
#include <iostream> #include <iostream>
#include <list> #include <list>
@ -34,6 +35,8 @@
bool testRsDirUtils(std::string path); bool testRsDirUtils(std::string path);
INITTEST() ;
int main() int main()
{ {
@ -62,6 +65,10 @@ int main()
{ {
testRsDirUtils(*it); testRsDirUtils(*it);
} }
FINALREPORT("dirtest");
return TESTRESULT() ;
} }
bool testRsDirUtils(std::string path) bool testRsDirUtils(std::string path)

21
libretroshare/src/tests/util/sha1_test.cc
View File

@ -27,7 +27,8 @@
#include "util/rsdir.h" #include "util/rsdir.h"
#include "../common/argstream.h" #include "util/utest.h"
#include <common/argstream.h>
#include <iostream> #include <iostream>
#include <list> #include <list>
@ -40,6 +41,8 @@ void printHelp(int argc,char *argv[])
std::cerr << "Usage: " << argv[0] << " [test file]" << std::endl ; std::cerr << "Usage: " << argv[0] << " [test file]" << std::endl ;
} }
INITTEST() ;
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
std::string inputfile ; std::string inputfile ;
@ -55,11 +58,7 @@ int main(int argc,char *argv[])
FILE *f = RsDirUtil::rs_fopen(inputfile.c_str(),"r") ; FILE *f = RsDirUtil::rs_fopen(inputfile.c_str(),"r") ;
if(f == NULL) CHECK(f != NULL) ;
{
std::cerr << "Cannot open file " << inputfile << " for read !" << std::endl;
return -1 ;
}
std::cerr << "Testing sha1" << std::endl; std::cerr << "Testing sha1" << std::endl;
uint32_t SIZE = 1024*1024 ; uint32_t SIZE = 1024*1024 ;
@ -79,13 +78,11 @@ int main(int argc,char *argv[])
RsDirUtil::getFileHash(inputfile.c_str(),hash,size) ; RsDirUtil::getFileHash(inputfile.c_str(),hash,size) ;
std::cerr << "Old method : " << hash << std::endl; std::cerr << "Old method : " << hash << std::endl;
if(hash != sum.toStdString()) CHECK(hash == sum.toStdString()) ;
return -1 ;
Sha1CheckSum H(hash) ; Sha1CheckSum H(hash) ;
std::cerr << "Hashed transformed: " << H.toStdString() << std::endl; std::cerr << "Hashed transformed: " << H.toStdString() << std::endl;
if(hash != H.toStdString()) CHECK(hash == H.toStdString()) ;
return -1 ;
std::cerr << "Computing all chunk hashes:" << std::endl; std::cerr << "Computing all chunk hashes:" << std::endl;
@ -100,6 +97,8 @@ int main(int argc,char *argv[])
} }
fclose(f) ; fclose(f) ;
return 0 ;
FINALREPORT("Sha1Test") ;
return TESTRESULT() ;
} }