Commit d6f48e8f authored by Jean-Loup Haberbusch's avatar Jean-Loup Haberbusch
Browse files

Merge branch 'bug/restrict-testaction' into 'develop'

Bug/restrict testaction

See merge request !4
parents 6061a9e1 f4419802
......@@ -19,11 +19,6 @@ camitk_extension(ACTION_EXTENSION
TEST_FILES bassin.msh BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
)
# TODO fix this (good example of exception handling coming from itk!)
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
# set_tests_properties("action-itkfilters-level1-27" PROPERTIES WILL_FAIL true)
endif()
# Test failure due to ITK exception
# For now consider these fail tests as passed until this can be taken care of in the save() method
# TODO check if it possible to avoid this exception
......
......@@ -7,6 +7,6 @@ camitk_extension(ACTION_EXTENSION
DESCRIPTION "Feature PML actions which aims at displaying and manipulating structural information about a PML component."
AUTO_TEST
TEST_FILES
TEST_FILES Mesh.off BigEndian.hdr diaphragm.pml truthcube.pml
TEST_FILES Mesh.off brain.mha diaphragm.pml truthcube.pml
)
# Disable this action as long as the Interactive viewer does not consider the arbitrary viewer back.
camitk_extension(DISABLED
ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Control of the arbitrary slice on image component"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
TEST_FILES bassin.msh brain.mha head1.STL liver-smooth.obj Mesh.off mixed_3D_beam.msh ramp1.gipl robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk sinus.mhd
)
## Call CamiTK CMake Macro to define the action
#camitk_extension( ACTION_EXTENSION
# CEP_NAME SDK
# DESCRIPTION "Control of the arbitrary slice on image component"
# TEST_APPLICATION ${APPLICATION_TEST_ACTION}
# TEST_FILES bassin.msh BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm diaphragm.pml head1.STL LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr liver-smooth.obj Mesh.off mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd mixed_3D_beam.msh ramp1.gipl robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk testrgba1.nrrd truthcube.pml
# )
## Recursively update the shiboken path variable containing the CamiTK SDK tree structure
#set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
......@@ -5,7 +5,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Helps you to crop a volume to keep only an interesting subsample"
AUTO_TEST
TEST_FILES Mesh.off BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES Mesh.off brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -3,7 +3,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Displays the image look-up-table (lut)"
AUTO_TEST
TEST_FILES scissors.obj BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES scissors.obj brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -3,5 +3,5 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Re-sample image volumes"
AUTO_TEST
TEST_FILES liver-smooth.obj BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES liver-smooth.obj brain.mha sinus.mhd
)
......@@ -4,7 +4,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Action-multipicking allows one to make several pixel picking on an image component (volumic image)"
AUTO_TEST
TEST_FILES structured.vtk BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES structured.vtk brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -4,5 +4,5 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Allows changing the color of the image pixels"
AUTO_TEST
TEST_FILES mixed_3D_beam.msh BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES mixed_3D_beam.msh brain.mha sinus.mhd
)
......@@ -3,7 +3,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Use marching cube algorithm to create a surfacic mesh from a volumic image"
AUTO_TEST
TEST_FILES sinus_skin.vtk BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES sinus_skin.vtk brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -4,12 +4,9 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Allows one to reorient a volumic image."
AUTO_TEST
TEST_FILES skull1.stl BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES skull1.stl brain.mha sinus.mhd
)
# As the Reorient image action, when applied, needs its dialog box initialized, it cannot
# pass this test.
# Remove when action reorient image has been updated consequently
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
#TODO set_tests_properties("action-reorientimage-level1-15" PROPERTIES WILL_FAIL true)
endif()
# Reorient image action, when applied, needs its dialog box initialized, the result is always ABORTED
# TODO rewrite this action so that the dialog is not needed and reorientation can be set
# using parameters
......@@ -2,7 +2,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Display in 3D the component"
AUTO_TEST
TEST_FILES bassin.msh BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES bassin.msh brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -4,7 +4,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Use ray tracing to produce a 3D reprensation of the image"
AUTO_TEST
TEST_FILES Mesh.off BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES Mesh.off brain.mha sinus.mhd
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -3,7 +3,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Provides basic actions on meshes"
AUTO_TEST
TEST_FILES brain.mha bassin.msh diaphragm.pml head1.STL liver-smooth.obj Mesh.off robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk truthcube.pml pointcloud-with-data.vtk polydata-with-data.vtk cube-with-point-and-cell-data.vtk fieldfile.vtk check-with-color-pointdata.vtk plate-with-data.vtk female.vtk brainImageSmooth.vtk structuredgrid-with-data.vtk male.vtk cube-with-tensors.vtk imageBoundingBox.vtk binary-mesh-with-pointdata.vtk unstructured_binary_with_celldata.vtk
TEST_FILES brain.mha bassin.msh liver-smooth.obj Mesh.off robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk pointcloud-with-data.vtk polydata-with-data.vtk cube-with-point-and-cell-data.vtk fieldfile.vtk check-with-color-pointdata.vtk plate-with-data.vtk female.vtk brainImageSmooth.vtk structuredgrid-with-data.vtk male.vtk cube-with-tensors.vtk imageBoundingBox.vtk binary-mesh-with-pointdata.vtk unstructured_binary_with_celldata.vtk
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -3,7 +3,7 @@ camitk_extension(ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Helps building simple 3D objects"
AUTO_TEST
TEST_FILES brain.mha bassin.msh diaphragm.pml head1.STL liver-smooth.obj Mesh.off mixed_3D_beam.msh robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk truthcube.pml pointcloud-with-data.vtk polydata-with-data.vtk
TEST_FILES brain.mha bassin.msh head1.STL liver-smooth.obj Mesh.off mixed_3D_beam.msh robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk pointcloud-with-data.vtk polydata-with-data.vtk
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
......
......@@ -6,19 +6,12 @@ camitk_extension(ACTION_EXTENSION
INCLUDE_DIRECTORIES ${CAMITK_INCLUDE_DIR}/components/vtkmesh
INSTALL_ALL_HEADERS
AUTO_TEST
TEST_FILES brain.mha bassin.msh diaphragm.pml head1.STL liver-smooth.obj Mesh.off robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk truthcube.pml pointcloud-with-data.vtk polydata-with-data.vtk cube-with-point-and-cell-data.vtk fieldfile.vtk check-with-color-pointdata.vtk plate-with-data.vtk female.vtk brainImageSmooth.vtk structuredgrid-with-data.vtk male.vtk cube-with-tensors.vtk imageBoundingBox.vtk binary-mesh-with-pointdata.vtk unstructured_binary_with_celldata.vtk
TEST_FILES brain.mha bassin.msh head1.STL liver-smooth.obj Mesh.off robot.wrl scissors.obj simple.vtk sinus_skin.vtk sinus_skull.vtk skull1.stl structured.vtk pointcloud-with-data.vtk polydata-with-data.vtk cube-with-point-and-cell-data.vtk fieldfile.vtk check-with-color-pointdata.vtk plate-with-data.vtk female.vtk brainImageSmooth.vtk structuredgrid-with-data.vtk male.vtk cube-with-tensors.vtk imageBoundingBox.vtk binary-mesh-with-pointdata.vtk unstructured_binary_with_celldata.vtk
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# "Append Meshes" action will always fail as only one mesh is given in input by testaction
# "Append Meshes" action will always abort as only one mesh is given in input by testaction
# "Append Meshes" needs two meshes (appends first mesh to second mesh)
# The following lines will inverse the result of the test, and therefor transform
# a fail to a pass
# This is needed until there is a way to tell testaction that this action
# needs two mesh in input
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
#TODO set_tests_properties("action-meshprocessing-level1-18" PROPERTIES WILL_FAIL true)
#TODO set_tests_properties("action-meshprocessing-level1-20" PROPERTIES WILL_FAIL true)
endif()
# TODO write a auto test using the asm
......@@ -50,5 +50,5 @@ camitk_add_test(EXECUTABLE_ARGS "-f ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp -d badd
find_program (BASH_PROGRAM bash)
if (BASH_PROGRAM)
# use "ctest -VV -R cepgenerator-test" to run just this test
add_test(${APPLICATION_TARGET_NAME}-bash-test ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test/cepgenerator-test.sh -inbuild ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
add_test(${APPLICATION_TARGET_NAME}-bash-test ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/testing/cepgenerator-test.sh -inbuild ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
endif (BASH_PROGRAM)
......@@ -16,5 +16,5 @@ set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_
# Add config test
find_program (BASH_PROGRAM bash)
if (BASH_PROGRAM)
add_test(${APPLICATION_TARGET_NAME}-bash-test ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test/config-test.sh -inbuild ${PROJECT_BINARY_DIR})
add_test(${APPLICATION_TARGET_NAME}-bash-test ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/testing/config-test.sh -inbuild ${PROJECT_BINARY_DIR})
endif (BASH_PROGRAM)
# Call CamiTK CMake Macro to define the action
camitk_extension(ACTION_EXTENSION
AUTO_TEST
TEST_FILES bassin.msh BigEndian.hdr BigEndian.img BigEndianCompressed1.hdr BigEndianCompressed1.img biorad.pic brain.mha cthead1.lsm LittleEndian1.hdr LittleEndian1.img LittleEndianCompressed1.hdr LittleEndianCompressed1.img LittleEndianZ1.hdr mini-complex-slow1.nrrd mini-ten-nomask-slow1.nrrd mini-vector-slow1.nrrd ramp1.gipl
TEST_FILES bassin.msh brain.mha sinus.mhd
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment