X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftools%2FCMakeLists.txt;h=f1b9a7b88ba8ebad2f9f47a5c5d1526f4def6e6a;hb=59e48d3c825fac8848e79357909c211745934089;hp=7713d096597de1958146250a7038b673b257ea60;hpb=bb98e5f2a4d79848b855cd8c6e73c2ad70058ae6;p=clitk.git

diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
index 7713d09..f1b9a7b 100644
--- a/tests/tools/CMakeLists.txt
+++ b/tests/tools/CMakeLists.txt
@@ -9,7 +9,7 @@ SET (CUSTOM_TEST_SRC
   vvMainTest.cxx
 )
 ADD_EXECUTABLE(toolsTest ${CUSTOM_TEST_SRC})
-ADD_DEFINITIONS(-DTOOLS_PATH=\"${PROJECT_BINARY_DIR}/bin/\")
+ADD_DEFINITIONS(-DCLITK_TEST_TOOLS_PATH=\"${PROJECT_BINARY_DIR}/bin/\")
 TARGET_LINK_LIBRARIES(toolsTest vvLib ${vvExternalLibs} gtest)
 
 # Add all tests found in the source code, calling the executable to run them
@@ -23,12 +23,31 @@ SET (srcs
 ADD_EXECUTABLE(toolTestRunner ${srcs})
 TARGET_LINK_LIBRARIES(toolTestRunner vvLib ${vvExternalLibs})
 SET(exe ${EXECUTABLE_OUTPUT_PATH}/toolTestRunner) 
+SET(p ${CLITK_TEST_DATA_PATH})
 #=========================================================
 # clitkImageInfo
-ADD_TEST(clitkImageInfo_1 ${exe} clitkImageInfo Deformation4D.mhd Deformation4D_ref.info)
-ADD_TEST(clitkImageInfo_2 ${exe} clitkImageInfo Lung3D.mhd Lung3D_ref.info)
+ADD_TEST(clitkImageInfo_1    ${exe} clitkImageInfo ${p}Deformation4D.mhd ${p}Deformation4D_ref.info)
+ADD_TEST(clitkImageInfo_2    ${exe} clitkImageInfo ${p}Lung3D.mhd 	 ${p}Lung3D_ref.info)
 #=========================================================
 # clitkGetSpacing
-ADD_TEST(clitkGetSpacing_1 ${exe} clitkGetSpacing Deformation4D.mhd Cropped_Deformation4D_ref.spacing)
-ADD_TEST(clitkGetSpacing_2 ${exe} clitkGetSpacing Lung3D.mhd Cropped_Deformation4D_ref.spacing)
-UNSET(exe)
\ No newline at end of file
+ADD_TEST(clitkGetSpacing_1   ${exe} clitkGetSpacing -i ${p}Deformation4D.mhd ${p}Deformation4D_ref.spacing)
+ADD_TEST(clitkGetSpacing_2   ${exe} clitkGetSpacing -i ${p}Lung3D.mhd 	     ${p}Lung3D_ref.spacing)
+#=========================================================
+# clitkGetOrigin
+ADD_TEST(clitkGetOrigin_1    ${exe} clitkGetOrigin -i ${p}Deformation4D.mhd ${p}Deformation4D_ref.origin)
+ADD_TEST(clitkGetOrigin_2    ${exe} clitkGetOrigin -i ${p}Lung3D.mhd 	    ${p}Lung3D_ref.origin)
+#=========================================================
+# clitkGetSize
+ADD_TEST(clitkGetSize_1      ${exe} clitkGetSize -i ${p}Deformation4D.mhd   ${p}Deformation4D_ref.size)
+ADD_TEST(clitkGetSize_2      ${exe} clitkGetSize -i ${p}Lung3D.mhd 	    ${p}Lung3D_ref.size)
+#=========================================================
+# clitkGetDirection
+ADD_TEST(clitkGetDirection_1 ${exe} clitkGetDirection -i ${p}Deformation4D.mhd  ${p}Deformation4D_ref.direction)
+ADD_TEST(clitkGetDirection_2 ${exe} clitkGetDirection -i ${p}Lung3D.mhd 	${p}Lung3D_ref.direction)
+
+
+
+
+
+UNSET(exe)
+UNSET(p)
\ No newline at end of file