From ee57ae25d6d238f3cd5c9a94f623552f02761953 Mon Sep 17 00:00:00 2001 From: jpr Date: Mon, 21 Nov 2005 12:15:54 +0000 Subject: [PATCH] Deal with OF --- Testing/TestVR.cxx | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Testing/TestVR.cxx b/Testing/TestVR.cxx index 26e8144f..ab07e894 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/10/25 14:52:31 $ - Version: $Revision: 1.11 $ + Date: $Date: 2005/11/21 12:15:54 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,57 +25,59 @@ int TestVR(int , char *[]) gdcm::Debug::DebugOn(); - // There should be 16 entries ... + // We should test the 27 entries ... vr->Print( std::cout ); // Valid VR if( !vr->IsValidVR( "PN" ) ) { - std::cerr << "'PN' is not a valid VR" << std::endl; + std::cerr << "'PN' is not recognized as a valid VR" << std::endl; error++; } if( !vr->IsValidVR( "FD" ) ) { - std::cerr << "'FD' is not a valid VR" << std::endl; + std::cerr << "'FD' is not recognized as a valid VR" << std::endl; error++; } if( vr->IsValidVR( "" ) ) { - std::cerr << "'' is a valid VR" << std::endl; + std::cerr << "'' is recognized as a valid VR" << std::endl; error++; } if( vr->IsValidVR( " " ) ) { - std::cerr << "' ' is a valid VR" << std::endl; + std::cerr << "' ' is recognized as a valid VR" << std::endl; error++; } if( vr->IsValidVR( "\000/" ) ) { - std::cerr << "' /' is a valid VR" << std::endl; + std::cerr << "' /' is recognized as a valid VR" << std::endl; error++; } if( vr->IsValidVR( gdcm::GDCM_VRUNKNOWN ) ) { - std::cerr << "' ' is a valid VR" << std::endl; + std::cerr << "' ' is recognized as a valid VR" << std::endl; error++; } // String representable + //--------------------- if( !vr->IsVROfStringRepresentable( "PN" ) ) { - std::cerr << "'PN' is not a string representable" << std::endl; + std::cerr << "'PN' is not recognized as a string representable" << std::endl; error++; } - if( vr->IsVROfStringRepresentable( "FD" ) ) + if( vr->IsVROfStringRepresentable( "OB" ) ) { - std::cerr << "'FD' is a string representable" << std::endl; + std::cerr << "'OB' is recognized as a string representable" << std::endl; error++; } // Binary representable - if( !vr->IsVROfBinaryRepresentable( "FD" ) ) + //--------------------- + if( !vr->IsVROfBinaryRepresentable( "OB" ) ) { - std::cerr << "FD is not a binary representable" << std::endl; + std::cerr << "OB is not recognized as a binary representable" << std::endl; error++; } if( vr->IsVROfBinaryRepresentable( "PN" ) ) @@ -85,6 +87,7 @@ int TestVR(int , char *[]) } // Sequence + //--------- if( vr->IsVROfSequence( "" ) ) { std::cerr << "'' is a sequence" << std::endl; @@ -92,7 +95,7 @@ int TestVR(int , char *[]) } if( !vr->IsVROfSequence( "SQ" ) ) { - std::cerr << "'SQ' is not a sequence" << std::endl; + std::cerr << "'SQ' is not recognized as a Sequence" << std::endl; error++; } -- 2.48.1