X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=d53cbc71e940dd1b6961f58993d87ce8e359ea1d;hb=e8439d97c8441809e9a5236e729bae1a25ffb418;hp=43b987ad651a0d26366cad8b0d39843fffd662ab;hpb=64429225702c1ca65ea3b6882be0e19c94509843;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 43b987ad..d53cbc71 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -10,6 +10,10 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 SET(TEST_SOURCES
   TestBug.cxx
   TestHash.cxx
+  TestTS.cxx
+  TestVR.cxx
+  TestUtil.cxx
+  TestDicomString.cxx
 )
 
 # add tests that require data
@@ -18,19 +22,24 @@ IF (GDCM_DATA_ROOT)
     TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
     PrintAllDocument.cxx             # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
+    TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     PrintDicomDir.cxx
-    TestChangeHeader.cxx
-    TestDicomDir.cxx      #require DICOMDIR
-    BuildUpDicomDir.cxx
-    makeDicomDir.cxx
+    #TestChangeHeader.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
+    TestCopyDicom.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
+    # Include the VTK library
+    INCLUDE(${VTK_USE_FILE})
+
     INCLUDE_DIRECTORIES(
       ${GDCM_SOURCE_DIR}/vtk/
       )
     SET(TEST_SOURCES ${TEST_SOURCES}
-      ShowDicom.cxx    
+      ShowDicom.cxx
       )
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
@@ -76,7 +85,7 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   FILE(GLOB GDCM_DATA_IMAGES_GLOB
     "${GDCM_DATA_ROOT}/*.acr"
     "${GDCM_DATA_ROOT}/*.dcm"
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     "${GDCM_DATA_ROOT}/*.ima"
     )
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
@@ -88,7 +97,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     "${GDCM_DATA_ROOT}/*.dcm"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA
     "${GDCM_DATA_ROOT}/*.ima"
@@ -101,31 +110,21 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
-  "gdcm-JPEG-LossLessThoravision.dcm" # serial killer
-  "cr172241.dcm"           #temporarily remove as it kills my gnome session
-                           # (but not kde)
-  "emptyImage.dcm"         #the png looks ugly...
-  "irmPhlipsNew1.dcm"      #png looks ugly
-  "mriThruVPRO.dcm"        #png looks ugly
-  "gdcm-MR-SIEMENS-16-1.acr"   #segfaults TestReadWriteReadCompare
-  #segfaults TestReadWriteReadCompare: this image looks corrupted:
-  # - it's pixel data is 132096 bytes long
-  # - it has a size of 256x256 with 16 bytes per pixel, i.e. a size
-  #   of 256*256*2 = 131072 bytes.
-  # Since there is a missmatch, when we have the following call stack:
-  #  gdcmFile::GetImageData()
-  #     PixelData = new uint8_t[ImageDataSize];
-  #     \--->::GetImageDataIntoVector(destination, ImageDataSize)
-  #       \---> ::ReadPixelData(destination)
-  #         \---> fread(destination, Header->GetPixelAreaLength(), 1, fp);
-  # we get a segfault because :
-  #   - destination is ImageDataSize i.e. 131072 bytes long
-  #   - Header->GetPixelAreaLength() = 132096 bytes long
-  "oldACR00001.ima"
+  # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
+  "gdcm-JPEG-LossLessThoravision.dcm"
+  
+  # Mathieu: temporarily remove as it kills my gnome session (but not kde)
+  # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded
+  #      in memory)  
+  "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
   )
 
-#   gdcm-ACR-LibIDO seems to be cut
-#   test.acr is very bright
+IF(APPLE)
+  SET(BLACK_LIST ${BLACK_LIST}
+    "SIEMENS_GBS_III-16-ACR_NEMA_1.acr"  # This image contains a wrong length
+    # Which led us to read pass the end of the file. This seg fault on MacOSX
+    )
+ENDIF(APPLE)
 
 # This is a GLOB expression, change it into a list separated with a comma and \n
 SET(GDCM_DATA_IMAGES)