X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=f18303c52bb38acd834e486d5594ac7d06085532;hb=de628879bbc28ca8a1c93f293d7b6c49692ebe55;hp=c64b83a4a23d312df9b1ca98a45413f9d095e87c;hpb=d48c371ecec591e9c3d67d8bbeb1911999dbfd37;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c64b83a4..f18303c5 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -14,6 +14,8 @@ SET(TEST_SOURCES
   TestVR.cxx
   TestUtil.cxx
   TestDicomString.cxx
+  TestDict.cxx
+  TestWriteSimple.cxx
 )
 
 # add tests that require data
@@ -23,13 +25,13 @@ IF (GDCM_DATA_ROOT)
     PrintAllDocument.cxx             # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
-    PrintDicomDir.cxx
     #TestChangeHeader.cxx
+    TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
+    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
     TestDicomDir.cxx                 # require DICOMDIR
     BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
     makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
-    TestCopyDicom.cxx
-    TestCopyRescaleDicom.cxx
+    TestDirList.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -40,9 +42,9 @@ IF (GDCM_DATA_ROOT)
       ${GDCM_SOURCE_DIR}/vtk/
       )
     SET(TEST_SOURCES ${TEST_SOURCES}
-      ShowDicom.cxx
-      ShowDicomSeq.cxx
-      TestWriteWithVTK.cxx
+      VTKTestRead.cxx
+      VTKTestReadSeq.cxx
+      VTKTestWrite.cxx
       )
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
@@ -135,24 +137,20 @@ 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
   # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
-  "gdcm-JPEG-LossLessThoravision.dcm"
-  
-  # Bad decompression of the jpeg part
-  "GE_RHAPSODE-16-MONO2-JPEG-Fragments.dcm"
+  #"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"
+  #"KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
+  
+  # Multiframe Papyrus format image
+  # Just to remember this format exist, and is gdcm::Header compliant
+  # (NOT gdcm::File ...)
+  # any contribution is welcome
+  "PET-cardio-Multiframe-Papyrus.dcm" 
   )
 
-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)
 FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})