X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestVR.cxx;h=729157a64ebaeb975260d0b7417ece0e6c70594e;hb=eacd2efd90ffb9015d6358f135cb17a838a29abb;hp=6801c655f3c2c3436660abc2052dc669b134b6e9;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git

diff --git a/Testing/TestVR.cxx b/Testing/TestVR.cxx
index 6801c655..729157a6 100644
--- a/Testing/TestVR.cxx
+++ b/Testing/TestVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 20:03:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/10/18 12:58:25 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,13 +19,75 @@
 
 int TestVR(int , char *[])
 {
-   gdcm::VR vr;
-   // There should be 16 entries
-   vr.Print( std::cout );
+   int error = 0;
+   gdcm::VR *vr = new gdcm::VR();
+ 
+   // There should be 16 entries ...
+   vr->Print( std::cout );
 
-   vr.IsVROfStringRepresentable( "" );
-   vr.IsVROfBinaryRepresentable( "" );
-   vr.IsVROfSequence( "" );
+   // Valid VR
+   if( !vr->IsValidVR( "PN" ) )
+   {
+      std::cerr << "'PN' is not a valid VR" << std::endl;
+      error++;
+   }
+   if( !vr->IsValidVR( "FD" ) )
+   {
+      std::cerr << "'FD' is not a valid VR" << std::endl;
+      error++;
+   }
+   if( vr->IsValidVR( "" ) )
+   {
+      std::cerr << "'' is a valid VR" << std::endl;
+      error++;
+   }
+   if( vr->IsValidVR( "  " ) )
+   {
+      std::cerr << "'  ' is a valid VR" << std::endl;
+      error++;
+   }
+   if( vr->IsValidVR( gdcm::GDCM_VRUNKNOWN ) )
+   {
+      std::cerr << "'  ' is a valid VR" << std::endl;
+      error++;
+   }
 
-   return 0;
+   // String representable
+   if( !vr->IsVROfStringRepresentable( "PN" ) )
+   {
+      std::cerr << "'PN' is not a string representable" << std::endl;
+      error++;
+   }
+   if( vr->IsVROfStringRepresentable( "FD" ) )
+   {
+      std::cerr << "'FD' is a string representable" << std::endl;
+      error++;
+   }
+
+   // Binary representable
+   if( !vr->IsVROfBinaryRepresentable( "FD" ) )
+   {
+      std::cerr << "FD is not a binary representable" << std::endl;
+      error++;
+   }
+   if( vr->IsVROfBinaryRepresentable( "PN" ) )
+   {
+      std::cerr << "'PN' is a binary representable" << std::endl;
+      error++;
+   }
+
+   // Sequence
+   if( vr->IsVROfSequence( "" ) )
+   {
+      std::cerr << "'' is a sequence" << std::endl;
+      error++;
+   }
+   if( !vr->IsVROfSequence( "SQ" ) )
+   {
+      std::cerr << "'SQ' is not a sequence" << std::endl;
+      error++;
+   }
+
+   delete vr;
+   return error;
 }