X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tests%2Ftools%2FclitkImageInfoTest.cxx;h=a2ab2b56f61fb87c4d5ec22af4b83bff383094ba;hb=837aef6981c3be047edeca988ef538cbcc1a1f71;hp=5e7476bc9add5f989fd1efd62fd42b2a1454c05c;hpb=20b024a1acc712ffbd3aeb5628c4f9cb41b51fb4;p=clitk.git

diff --git a/tests/tools/clitkImageInfoTest.cxx b/tests/tools/clitkImageInfoTest.cxx
index 5e7476b..a2ab2b5 100644
--- a/tests/tools/clitkImageInfoTest.cxx
+++ b/tests/tools/clitkImageInfoTest.cxx
@@ -24,21 +24,21 @@
 #include <itksys/SystemTools.hxx>
 static inline void compare(std::string mhd, std::string ref){
   std::ostringstream cmd_line;
-  ASSERT_TRUE(itksys::SystemTools::FileExists(mhd.c_str(), true));
-  cmd_line << TOOLS_PATH<<"clitkImageInfo " << mhd << " > clitkImageInfoTest.out";
-  std::cout << "Executing " << cmd_line.str() << std::endl;
+  cmd_line << CLITK_TEST_TOOLS_PATH<<"clitkImageInfo " << mhd << " > clitkImageInfoTest.out";
   system(cmd_line.str().c_str());
   
-  bool differ = itksys::SystemTools::FilesDiffer("clitkImageInfoTest.out", ref.c_str());
+  EXPECT_FALSE( itksys::SystemTools::FilesDiffer("clitkImageInfoTest.out", ref.c_str()) );
   remove("clitkImageInfoTest.out");
-  EXPECT_FALSE(differ);
 }
 TEST(clitkImageInfoTest, main){
-  std::string mhd1=std::string(CLITK_DATA_PATH)+"4d/mhd/00.mhd";
-  std::string ref1=std::string(CLITK_DATA_PATH)+"tools/clitkImageInfoTestValidate3D.out";
-  compare(mhd1, ref1);
+  std::string mhd1=std::string(CLITK_TEST_DATA_PATH)+"Deformation4D.mhd";
+  ASSERT_TRUE(itksys::SystemTools::FileExists(mhd1.c_str(), true));
+  
+  std::string mhd2=std::string(CLITK_TEST_DATA_PATH)+"Lung3D.mhd";
+  ASSERT_TRUE(itksys::SystemTools::FileExists(mhd2.c_str(), true));
   
-  std::string mhd2=std::string(CLITK_DATA_PATH)+"4d/mhd/bh.mhd";
-  std::string ref2=std::string(CLITK_DATA_PATH)+"tools/clitkImageInfoTestValidate4D.out";
-  compare(mhd2, ref2);
+  mhd1+=" "+mhd2;
+  std::string ref1=std::string(CLITK_TEST_DATA_PATH)+"clitkImageInfoTestRef.out";
+  ASSERT_TRUE(itksys::SystemTools::FileExists(ref1.c_str(), true));
+  compare(mhd1, ref1);
 }
\ No newline at end of file