X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftools%2FtoolTestRunner.cxx;h=42226b781d9634bc1919c97d16391b3bd0da49e5;hb=2db65b693062a7d5bb04df546be45f9b9513997f;hp=4e13ec09ee31fd67304cd869ea326b3dfdb82ec1;hpb=bb98e5f2a4d79848b855cd8c6e73c2ad70058ae6;p=clitk.git

diff --git a/tests/tools/toolTestRunner.cxx b/tests/tools/toolTestRunner.cxx
index 4e13ec0..42226b7 100644
--- a/tests/tools/toolTestRunner.cxx
+++ b/tests/tools/toolTestRunner.cxx
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <itksys/SystemTools.hxx>
 const int NO_OUTPUT_OPTION=-1;
+const int TEST_EXITED=1;
 int getOutputOptionIndex(int argc, char** argv){
   for(int i=1; i<argc; i++){
       std::string s = argv[i];
@@ -32,48 +33,87 @@ int getOutputOptionIndex(int argc, char** argv){
   }
   return NO_OUTPUT_OPTION;
 }
-char* getTmpFileName(){
-  char buffer [L_tmpnam];
-  char * pointer;
 
-  char* back = tmpnam (buffer);
-  if(back==NULL){
-    std::cout<<"fail to get temporary file name"<<std::endl;
+std::string getTmpFileName(){
+#ifdef _WIN32
+  char fileName[L_tmpnam_s];
+  errno_t err = tmpnam_s(fileName);
+#else
+  char fileName[] = "/tmp/vvTempXXXXXX";
+  int err=0;
+  int fd = mkstemp(fileName);
+  if(fd==-1) err=1;
+#endif
+  if(err){
+   std::cout<<"couldnot create file. Exiting"<<std::endl;
+   exit(TEST_EXITED);
+  }
+  return std::string(fileName);
+}
+
+void assertFalse(int fail, const std::string &message=""){
+  if(fail){
+    std::cout<<message<<std::endl; 
     exit(1);
   }
-  return pointer;
 }
-//todo, check if files exist
 /**
  * argv
  * [1] executable
  * [2] random options
  * [2.x] -o
- * [2.x+1] outFileName
  * [3] reference file
  * 
- * [2.x] and [2.x+1] are optional
+ * [2.x] is optional. If set a temporary file will be generated. So NO need to pass a random outputFileName
  */
 int main(int argc, char** argv){
+  //reference file must exist or we fail
+  char* refFile = argv[argc-1];
+  assertFalse(!(itksys::SystemTools::FileExists(refFile, true)), "refFile "+std::string(refFile)+" doesn't exist");
+  
   std::ostringstream cmd_line;
-  for(int i=1; i<argc; i++){
+  cmd_line<<CLITK_TEST_TOOLS_PATH;
+  for(int i=1; i<argc-1; i++){
+      //we should ensure the file exists, find an -i index or a long file name maybe?
       cmd_line<<argv[i]<<" ";
   }
+
+  //look for the need of generating an output file
   int outputOptionIndex = getOutputOptionIndex(argc, argv);
-  char* outFile;
+  std::string outFile;
   if(NO_OUTPUT_OPTION==outputOptionIndex){
-    outFile = getTmpFileName();
-    cmd_line<<" "<<outFile;
+     outFile = getTmpFileName();
+     cmd_line<<">"<<outFile;
   }else{
-    outFile = argv[outputOptionIndex];
+     outFile = argv[argc-2];
   }
-  
-  std::cout<<"running "<<cmd_line.str()<<std::endl;
+  std::cout<<cmd_line.str()<<std::endl;;
+  //run the command line
   system(cmd_line.str().c_str());
-  //files should be equal, so if this is the case return success=0
-  char* refFile = argv[argc-1];
-  std::cout<<"comapring "<<outFile<<" to "<<refFile<<std::endl;
-  bool fail = (itksys::SystemTools::FilesDiffer(outFile, refFile))?0:1;
-  remove(outFile);
-  return fail;
+  
+  //compare source files
+  assertFalse((itksys::SystemTools::FilesDiffer(outFile.c_str(), refFile)), "Source Files are different");
+  
+  //eventually raw files associated
+  //should be passed as a boolean to check also for raw or not
+  
+  std::string refRawFile = std::string(refFile)+".raw";
+  
+  
+  int found=outFile.find_last_of(".");
+  std::string rawFile = outFile.substr(0, found)+".raw";
+  if((itksys::SystemTools::FileExists(refRawFile.c_str(), true))){
+    //compare the raw stuff
+    if((itksys::SystemTools::FileExists(rawFile.c_str(), true))){
+       std::cout<<"Checking raws"<<std::endl;
+       assertFalse(itksys::SystemTools::FilesDiffer(refRawFile.c_str(), rawFile.c_str()), "Raws are different");
+    }
+    //file is not removed if there is a fail
+    remove(rawFile.c_str());
+  }
+  //neither the mhd is
+  remove(outFile.c_str());
+  
+  //success
+  return 0;
 }