diff --git a/DWIConvert/TestSuite/CMakeLists.txt b/DWIConvert/TestSuite/CMakeLists.txt index 5d87dcf0cb..e359fe7ae8 100644 --- a/DWIConvert/TestSuite/CMakeLists.txt +++ b/DWIConvert/TestSuite/CMakeLists.txt @@ -7,7 +7,7 @@ set(DWITarDir ${TestData_DIR}/DWI_TestData_TARBALLS) # 1 upload testcase file into BRAINSTools/Public/ in http://slicer.kitware.com; # 2 download the key file(MD5); # 3 put the MD5 file into /Volumes/scratch/hxie1/Projects/BRAINSTools/TestData/DWI_TestData_TARBALLS; -# 4 Ctest will automatically find it and download it +# 4 rerun CCMake, then Ctest will automatically find it and download it set(ALL_DICOM_TARBALLS ${DWITarDir}/DWIConvertGeSignaHdxBMatrixTest.tar.gz @@ -51,7 +51,7 @@ ${DWITarDir}/SiemensTrioTimBigEndian1.tar.gz ${DWITarDir}/SiemensVerio.tar.gz ${DWITarDir}/DWIConvertMultiShellFSITestSmallSize.tar.gz ${DWITarDir}/SpaceThicknessDiffDicom.tar.gz -#${DWITarDir}/DWIConvertMultiShellFSITest.tar.gz +#${DWITarDir}/DWIConvertMultiShellFSITest.tar.gz (for 640M big file) ) # accumulator for test names that actually force @@ -102,7 +102,7 @@ foreach(CLP DWICompare DWISimpleCompare) endforeach() ## Tool for comparing if BVec and BVal files are the same. -add_executable(BFileCompareTool BFileCompareTool.cpp chop.cpp) +add_executable(BFileCompareTool BFileCompareTool.cpp) target_link_libraries(BFileCompareTool DWIConvertSupportLib BRAINSCommonLib ) # @@ -136,10 +136,6 @@ set(TstOutput ${CMAKE_CURRENT_BINARY_DIR}) set(DWIBASELINE_DIR ${TestData_DIR}/DWI_TestData_OUTPUTS) -## DUMMYPROG -add_executable(chop chop.cpp) -target_link_libraries(chop BRAINSCommonLib) - # # pretty useless test except for slight increase in coverage # and verify the programs got built @@ -439,7 +435,7 @@ ExternalData_Add_Test( ${PROJECT_NAME}FetchData NAME DWIConvertSiemensTrio_Syngo ) AddDataDependency(DWIConvertSiemensTrio_Syngo2004A_2Test) -# add a ctest case supporting multi-shell FSL data by Hui Xie on Jan 28th, 2017 +# multi-shell FSL data for 640M bif file # the blank space between "ExternalData_Add_Test( " and "${PROJECT_NAME}FetchData NAME" below is critical. #[[ExternalData_Add_Test( ${PROJECT_NAME}FetchData NAME DWIConvertMultiShellFSITest COMMAND ${CMAKE_COMMAND} @@ -468,6 +464,7 @@ ExternalData_Add_Test( ${PROJECT_NAME}FetchData NAME SpaceThicknessDiffDicom AddDataDependency(SpaceThicknessDiffDicom) +# multishell data test for small size file ExternalData_Add_Test( ${PROJECT_NAME}FetchData NAME DWIConvertMultiShellFSITestSmallSize COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=$ diff --git a/DWIConvert/TestSuite/chop.cpp b/DWIConvert/TestSuite/chop.cpp deleted file mode 100644 index 92a330fde9..0000000000 --- a/DWIConvert/TestSuite/chop.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// -// Created by Hans Johnson on 3/7/17. -// - -#include -#include - -#include - -int main() { - typedef itk::Image IMType; - - typedef itk::ImageFileReader IFR; - typedef itk::ImageFileWriter IFW; - - IFR::Pointer ifr= IFR::New(); - ifr->SetFileName("/scratch/hxie1/Research/DWIConvertRefactor/RyanEckbo/dwi98.nii.gz"); - ifr->Update(); - - IMType::Pointer img = ifr->GetOutput(); - - itk::ExtractImageFilter::Pointer eif=itk::ExtractImageFilter::New(); - - eif->SetInput(img); - - IMType::RegionType region= img->GetLargestPossibleRegion(); - IMType::RegionType::SizeType size= region.GetSize(); - size[3]=10; - region.SetSize(size); - eif->SetExtractionRegion(region); - eif->Update(); - - IFW::Pointer ifw = IFW::New(); - ifw->SetFileName("/scratch/hxie1/Research/DWIConvertRefactor/RyanEckbo/dwi10.nii.gz"); - ifw->SetInput(eif->GetOutput()); - ifw->Update(); -}