Check new accessors

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 07cbf7889967795faabda4ac0ba69ce221514dfe..da8c06aa326d994dafc1ceb7e07b54aea3581be0 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(TEST_SOURCES
   TestDicomDirElement.cxx
   TestDicomString.cxx
   TestEnumVR.cxx
-
+  TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
 )
 IF(UNIX)
   SET(TEST_SOURCES ${TEST_SOURCES}
@@ -37,17 +37,18 @@ IF (GDCM_DATA_ROOT)
     TestFileAccessors.cxx
     TestMakeIcon.cxx
     TestLoadAllDocumentsNoPrivNoSeq.cxx # includes generated gdcmDataImages.h
-    TestPrintAllDocument.cxx         # includes generated gdcmDataImages.h
-    #TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
-    TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
-    TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
-    #TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
-    #    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
+    #TestLoadAllDocumentsNoShadow.cxx   # includes generated gdcmDataImages.h
+    TestPrintAllDocument.cxx            # includes generated gdcmDataImages.h
+    #TestAllEntryVerify.cxx             # includes generated gdcmDataImages.h
+    TestAllReadCompareDicom.cxx         # includes generated gdcmDataImages.h
+    TestReadWriteReadCompare.cxx        # includes generated gdcmDataImages.h 
+    #TestCopyDicom.cxx                  # includes generated gdcmDataImages.h 
+    #    TestCopyRescaleDicom.cxx       # includes generated gdcmDataImages.h 
     #TestChangeHeader.cxx
     #    TestAnonymize.cxx
     TestDirList.cxx
     TestDicomDir.cxx                 # require DICOMDIR
-    TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
+
     TestMakeDicomDir.cxx             # writes a file named "NewDICOMDIR"
     TestSerieHelper.cxx              # uses gdcmData as a default root directory    
     TestAllVM.cxx

diff --git a/Testing/TestBuildUpDicomDir.cxx b/Testing/TestBuildUpDicomDir.cxx
index de16a5f0a789563414d62bd434887f14c2670afb..11aff99f3105b890b8824b84b1c65453cb76b43e 100644 (file)
--- a/Testing/TestBuildUpDicomDir.cxx
+++ b/Testing/TestBuildUpDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestBuildUpDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/06/21 14:59:06 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2007/08/20 13:25:32 $
+  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
@@ -214,6 +214,17 @@ int TestBuildUpDicomDir(int argc, char *argv[])
       return 1;
    }
    // Check some value we are sure
+   
+   int numberOfPatients = newDicomDir->GetNumberOfPatients();
+   if (numberOfPatients != 3)
+   {
+      std::cout<<"  wrong GetNumberOfPatients() : " << newDicomDir->GetNumberOfPatients()
+               <<" (should be 3)" <<std::endl;
+
+      newDicomDir->Delete();
+      return 1;   
+   }
+   
    p1 = newDicomDir->GetFirstPatient();
    p2 = newDicomDir->GetNextPatient();
    p3 = newDicomDir->GetNextPatient();