Merge branch 'master' of /home/dsarrut/clitk3.server

Conflicts:
	tests/tools/CMakeLists.txt

diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
index d79be30e30b6de4ef219df7d433c6e4f03ca96cc..f1b9a7b88ba8ebad2f9f47a5c5d1526f4def6e6a 100644 (file)
--- a/tests/tools/CMakeLists.txt
+++ b/tests/tools/CMakeLists.txt
@@ -26,12 +26,28 @@ SET(exe ${EXECUTABLE_OUTPUT_PATH}/toolTestRunner)
 SET(p ${CLITK_TEST_DATA_PATH})
 #=========================================================
 # clitkImageInfo
-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)
+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 -i ${p}Deformation4D.mhd ${p}Deformation4D_ref.spacing)
-message(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)
+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

diff --git a/tests/tools/clitkImageInfoTest.cxx b/tests/tools/clitkImageInfoTest.cxx
index 0b3f30394a178b6cb08c7dffdfbeacc17091f312..a2ab2b56f61fb87c4d5ec22af4b83bff383094ba 100644 (file)
--- a/tests/tools/clitkImageInfoTest.cxx
+++ b/tests/tools/clitkImageInfoTest.cxx
@@ -24,7 +24,7 @@
 #include <itksys/SystemTools.hxx>
 static inline void compare(std::string mhd, std::string ref){
   std::ostringstream cmd_line;
-  cmd_line << TOOLS_PATH<<"clitkImageInfo " << mhd << " > clitkImageInfoTest.out";
+  cmd_line << CLITK_TEST_TOOLS_PATH<<"clitkImageInfo " << mhd << " > clitkImageInfoTest.out";
   system(cmd_line.str().c_str());
   
   EXPECT_FALSE( itksys::SystemTools::FilesDiffer("clitkImageInfoTest.out", ref.c_str()) );