X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestValidate.cxx;h=ebe4a32e109092c9211cf0688a03d6ae396bfbb1;hb=d9f8b4b69e332d38e9c883ba60f40dc858883de9;hp=6162fcf6342a9b320099670bcf558ce817d5594b;hpb=8ea92706ea6ef5e97c3cdca1daa41c9a3063bd7a;p=gdcm.git

diff --git a/Testing/TestValidate.cxx b/Testing/TestValidate.cxx
index 6162fcf6..ebe4a32e 100644
--- a/Testing/TestValidate.cxx
+++ b/Testing/TestValidate.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestValidate.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 20:33:53 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/06/21 14:59:06 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,21 +18,61 @@
 #include "gdcmFile.h"
 #include "gdcmValidator.h"
 
+#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
 
-int TestValidate(int argc, char *argv[])
-{
-  if( argc < 2 )
-    {
-    std::cerr << "ouh les cornes" << std::endl;
-    return 1;
-    }
+//Generated file:
+#include "gdcmDataImages.h"
 
-  const char *filename = argv[1];
+int Validate(std::string const &filename);
 
-   gdcm::File *input = new gdcm::File( filename );
-   gdcm::Validator *v = new gdcm::Validator();
+int Validate(std::string const &filename)
+{
+   GDCM_NAME_SPACE::File *input =  GDCM_NAME_SPACE::File::New( );
+   input->SetFileName(filename);
+   input->Load();
+   GDCM_NAME_SPACE::Validator *v = GDCM_NAME_SPACE::Validator::New();
    v->SetInput( input );
+   input->Delete();
+   v->Delete();
+   return 1; // allways true (we don't want to break the test suite)
+} 
+
+
+int TestValidate(int argc, char *argv[])
+{
+   if ( argc == 2 )
+   {
+      // The test is specified a specific filename, use it instead of looping
+      // over all images
+      const std::string input = argv[1];
+      return Validate( input );
+   }
+   else if ( argc > 2 || argc == 2 )
+   {
+      std::cout << "   Usage: " << argv[0]
+                << " (no arguments needed)." << std::endl;
+      std::cout << "or   Usage: " << argv[0]
+                << " filename.dcm " << std::endl;
+      return 1;
+   }
+   
+   int i =0;
+   int retVal = 0;  //by default : *no* error
+   while( gdcmDataImages[i] != 0 )
+   {
+      std::string filename = GDCM_DATA_ROOT;
+      filename += "/";  //doh!
+      filename += gdcmDataImages[i];
+      std::cout << filename << std::endl;
+      if( Validate( filename ) != 0 )
+      {
+         retVal++;
+      }
 
-   return 0;
+      i++;
+   }
+   retVal = 0; // Never break test suite
+   return retVal;
 }