diff --git a/Modules/Core/tests/CMakeLists.txt b/Modules/Core/tests/CMakeLists.txt index 810c1c9134..ced45d7a0a 100644 --- a/Modules/Core/tests/CMakeLists.txt +++ b/Modules/Core/tests/CMakeLists.txt @@ -1,227 +1,226 @@ # The core tests need relaxed compiler flags... # TODO fix core tests to compile without these additional no-error flags if(MSVC_VERSION) # disable deprecated warnings (they would lead to errors) mitkFunctionCheckCAndCXXCompilerFlags("/wd4996" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) else() mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=deprecated" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=deprecated-declarations" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() -if(TARGET ${TESTDRIVER}) MITK_CREATE_MODULE_TESTS(US_MODULE) -mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES ITK|ITKThresholding+ITKTestKernel VTK|vtkTestingRendering tinyxml) - -mitkAddCustomModuleTest(mitkVolumeCalculatorTest_Png2D-bw mitkVolumeCalculatorTest - ${MITK_DATA_DIR}/Png2D-bw.png - ${MITK_DATA_DIR}/Pic2DplusT.nrrd -) - -mitkAddCustomModuleTest(mitkEventMapperTest_Test1And2 mitkEventMapperTest - ${MITK_DATA_DIR}/TestStateMachine1.xml - ${MITK_DATA_DIR}/TestStateMachine2.xml -) - -mitkAddCustomModuleTest(mitkEventConfigTest_CreateObjectInDifferentWays mitkEventConfigTest - ${MITK_SOURCE_DIR}/Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml -) - -mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest - ${MITK_DATA_DIR}/Pic3D.nrrd - ${MITK_DATA_DIR}/BallBinary30x30x30.nrrd -) - -mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest - ${MITK_DATA_DIR}/US4DCyl.nrrd -) - -mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest - ${MITK_DATA_DIR}/TestStateMachine1.xml - ${MITK_DATA_DIR}/TestStateMachine2.xml -) - -mitkAddCustomModuleTest(mitkDicomSeriesReaderTest_CTImage mitkDicomSeriesReaderTest - ${MITK_DATA_DIR}/TinyCTAbdomen - ${MITK_DATA_DIR}/DICOMReader/Broken-Series -) - -mitkAddCustomModuleTest(mitkPointSetReaderTest mitkPointSetReaderTest - ${MITK_DATA_DIR}/PointSetReaderTestData.mps -) - -mitkAddCustomModuleTest(mitkImageTest_4DImageData mitkImageTest - ${MITK_DATA_DIR}/US4DCyl.nrrd -) - -mitkAddCustomModuleTest(mitkImageTest_2D+tImageData mitkImageTest - ${MITK_DATA_DIR}/Pic2DplusT.nrrd -) - -mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageTest - ${MITK_DATA_DIR}/Pic3D.nrrd -) - -mitkAddCustomModuleTest(mitkImageEqualTest mitkImageEqualTest) - -mitkAddCustomModuleTest(mitkImageTest_brainImage mitkImageTest - ${MITK_DATA_DIR}/brain.mhd -) - -mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageGeneratorTest - ${MITK_DATA_DIR}/Pic3D.nrrd -) - -mitkAddCustomModuleTest(mitkLevelWindowManagerTest mitkLevelWindowManagerTest - ${MITK_DATA_DIR}/Pic3D.nrrd -) - -mitkAddCustomModuleTest(mitkMultiComponentImageDataComparisonFilterTest mitkMultiComponentImageDataComparisonFilterTest - ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg -) - -mitkAddCustomModuleTest(mitkImageToItkTest mitkImageToItkTest - ${MITK_DATA_DIR}/Pic3D.nrrd -) - -mitkAddCustomModuleTest(mitkImageSliceSelectorTest mitkImageSliceSelectorTest - ${MITK_DATA_DIR}/Pic2DplusT.nrrd -) - - -if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING -mitkAddCustomModuleTest(mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2DTest - ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/rgbaImage640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice - ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3d640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2DColorTest #test for color property (=blue) Pic3D sagittal slice - ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dColorBlue640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2DLevelWindowTest #test for levelwindow property (=blood) #Pic3D sagittal slice - ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dLevelWindowBlood640x480REF.png #corresponding reference #screenshot -) -#mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dOpacity640x480 mitkImageVtkMapper2DOpacityTest #test for opacity (=0.5) Pic3D coronal slice -# ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage -# -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dOpacity640x480REF.png corresponding reference screenshot -#) -mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DSwivelTest #test for a randomly chosen Pic3D swivelled slice - ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dSwivel640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2DTest - ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAlone640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2DImageTest - ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/PointSetForPic3D.mps #input point set and image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Pic3DPointSetForPic3D640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2DGlyphTypeTest - ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneGlyphType640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 mitkPointSetVtkMapper2DTransformedPointsTest - ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneTransformedPoints640x480REF.png #corresponding reference screenshot -) -mitkAddCustomModuleTest(mitkSurfaceDepthSortingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthSortingTest - ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthSorting640x480REF.png -) -if(NOT APPLE) -mitkAddCustomModuleTest(mitkSurfaceDepthPeelingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthPeelingTest - ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthPeeling640x480REF.png #corresponding reference screenshot -) -endif() - -#Test reslice interpolation -#note: nearest mode is already tested by swivel test -mitkAddCustomModuleTest(ResliceInterpolationIsLinear mitkImageVtkMapper2DResliceInterpolationPropertyTest - 1 #linear - ${MITK_DATA_DIR}/Pic3D.nrrd - -V - ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefLinear.png #corresponding reference screenshot LINEAR -) - -mitkAddCustomModuleTest(ResliceInterpolationIsCubic mitkImageVtkMapper2DResliceInterpolationPropertyTest - 3 #cubic - ${MITK_DATA_DIR}/Pic3D.nrrd - -V - ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefCubic.png #corresponding reference screenshot CUBIC -) -#End test reslice interpolation - -# Testing of the rendering of binary images -#mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImage640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice -# ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage -# -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImage640x480REF.png #corresponding reference screenshot -#) -#mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImageWithRef640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice -# ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage -# -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImageWithRef640x480REF.png #corresponding reference screenshot -#) -# End of binary image tests - -mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTest_TextureProperty mitkSurfaceVtkMapper3DTest - ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom.vtp - ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom_RGBImage.nrrd - -V - ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedLiver640x480REF.png #corresponding reference screenshot -) - -mitkAddCustomModuleTest(mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DTransferFunctionTest - ${MITK_DATA_DIR}/Png2D-bw.png - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-TransferFunctionRGBImage640x480REF.png #corresponding reference screenshot -) - -mitkAddCustomModuleTest(mitkImageVtkMapper2DOpacityTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DOpacityTransferFunctionTest - ${MITK_DATA_DIR}/Png2D-bw.png - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-OpacityTransferFunctionRGBImage640x480REF.png #corresponding reference screenshot -) - -############################## DISABLED TESTS - -#Removed due to high rendering error. -#mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTexturedSphereTest_Football mitkSurfaceVtkMapper3DTexturedSphereTest -# ${MITK_DATA_DIR}/RenderingTestData/texture.jpg #input texture -# -V -# ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedSphere640x480REF.png corresponding reference screenshot -#) - -mitkAddCustomModuleTest(mitkImageVtkMapper2DLookupTableTest_Png2D-bw mitkImageVtkMapper2DLookupTableTest - ${MITK_DATA_DIR}/Png2D-bw.png - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-LookupTableRGBImage640x480REF.png #corresponding reference screenshot -) - -#mitkAddCustomModuleTest(mitkImageTest_color2DImage mitkImageTest -# ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg -#) - -#mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest -# ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz -#) -SET_PROPERTY(TEST mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw - # mitkImageVtkMapper2D_pic3dOpacity640x480 - mitkSurfaceVtkMapper2DTest mitkSurfaceVtkMapper3DTest_TextureProperty mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 #mitkSurfaceVtkMapper3DTexturedSphereTest_Football -PROPERTY RUN_SERIAL TRUE) - -endif() - -add_test(mitkPointSetLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps) -set_property(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core) - -add_test(mitkImageWriterTest_nrrdImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg) -add_test(mitkImageWriterTest_2DPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/Png2D-bw.png) -add_test(mitkImageWriterTest_rgbPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbImage.png) -add_test(mitkImageWriterTest_rgbaPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png) -set_property(TEST mitkImageWriterTest_nrrdImage PROPERTY LABELS MITK-Core) -set_property(TEST mitkImageWriterTest_2DPNGImage PROPERTY LABELS MITK-Core) -set_property(TEST mitkImageWriterTest_rgbPNGImage PROPERTY LABELS MITK-Core) -set_property(TEST mitkImageWriterTest_rgbaPNGImage PROPERTY LABELS MITK-Core) +if(TARGET ${TESTDRIVER}) + mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES ITK|ITKThresholding+ITKTestKernel VTK|vtkTestingRendering tinyxml) + + mitkAddCustomModuleTest(mitkVolumeCalculatorTest_Png2D-bw mitkVolumeCalculatorTest + ${MITK_DATA_DIR}/Png2D-bw.png + ${MITK_DATA_DIR}/Pic2DplusT.nrrd + ) + + mitkAddCustomModuleTest(mitkEventMapperTest_Test1And2 mitkEventMapperTest + ${MITK_DATA_DIR}/TestStateMachine1.xml + ${MITK_DATA_DIR}/TestStateMachine2.xml + ) + + mitkAddCustomModuleTest(mitkEventConfigTest_CreateObjectInDifferentWays mitkEventConfigTest + ${MITK_SOURCE_DIR}/Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml + ) + + mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest + ${MITK_DATA_DIR}/Pic3D.nrrd + ${MITK_DATA_DIR}/BallBinary30x30x30.nrrd + ) + + mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest + ${MITK_DATA_DIR}/US4DCyl.nrrd + ) + + mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest + ${MITK_DATA_DIR}/TestStateMachine1.xml + ${MITK_DATA_DIR}/TestStateMachine2.xml + ) + + mitkAddCustomModuleTest(mitkDicomSeriesReaderTest_CTImage mitkDicomSeriesReaderTest + ${MITK_DATA_DIR}/TinyCTAbdomen + ${MITK_DATA_DIR}/DICOMReader/Broken-Series + ) + + mitkAddCustomModuleTest(mitkPointSetReaderTest mitkPointSetReaderTest + ${MITK_DATA_DIR}/PointSetReaderTestData.mps + ) + + mitkAddCustomModuleTest(mitkImageTest_4DImageData mitkImageTest + ${MITK_DATA_DIR}/US4DCyl.nrrd + ) + + mitkAddCustomModuleTest(mitkImageTest_2D+tImageData mitkImageTest + ${MITK_DATA_DIR}/Pic2DplusT.nrrd + ) + + mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageTest + ${MITK_DATA_DIR}/Pic3D.nrrd + ) + + mitkAddCustomModuleTest(mitkImageEqualTest mitkImageEqualTest) + + mitkAddCustomModuleTest(mitkImageTest_brainImage mitkImageTest + ${MITK_DATA_DIR}/brain.mhd + ) + + mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageGeneratorTest + ${MITK_DATA_DIR}/Pic3D.nrrd + ) + + mitkAddCustomModuleTest(mitkLevelWindowManagerTest mitkLevelWindowManagerTest + ${MITK_DATA_DIR}/Pic3D.nrrd + ) + + mitkAddCustomModuleTest(mitkMultiComponentImageDataComparisonFilterTest mitkMultiComponentImageDataComparisonFilterTest + ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg + ) + + mitkAddCustomModuleTest(mitkImageToItkTest mitkImageToItkTest + ${MITK_DATA_DIR}/Pic3D.nrrd + ) + + mitkAddCustomModuleTest(mitkImageSliceSelectorTest mitkImageSliceSelectorTest + ${MITK_DATA_DIR}/Pic2DplusT.nrrd + ) + + if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING + mitkAddCustomModuleTest(mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2DTest + ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/rgbaImage640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice + ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3d640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2DColorTest #test for color property (=blue) Pic3D sagittal slice + ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dColorBlue640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2DLevelWindowTest #test for levelwindow property (=blood) #Pic3D sagittal slice + ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dLevelWindowBlood640x480REF.png #corresponding reference #screenshot + ) + #mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dOpacity640x480 mitkImageVtkMapper2DOpacityTest #test for opacity (=0.5) Pic3D coronal slice + # ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage + # -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dOpacity640x480REF.png corresponding reference screenshot + #) + mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DSwivelTest #test for a randomly chosen Pic3D swivelled slice + ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dSwivel640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2DTest + ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAlone640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2DImageTest + ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/PointSetForPic3D.mps #input point set and image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Pic3DPointSetForPic3D640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2DGlyphTypeTest + ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneGlyphType640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 mitkPointSetVtkMapper2DTransformedPointsTest + ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneTransformedPoints640x480REF.png #corresponding reference screenshot + ) + mitkAddCustomModuleTest(mitkSurfaceDepthSortingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthSortingTest + ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthSorting640x480REF.png + ) + if(NOT APPLE) + mitkAddCustomModuleTest(mitkSurfaceDepthPeelingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthPeelingTest + ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthPeeling640x480REF.png #corresponding reference screenshot + ) + endif() + + #Test reslice interpolation + #note: nearest mode is already tested by swivel test + mitkAddCustomModuleTest(ResliceInterpolationIsLinear mitkImageVtkMapper2DResliceInterpolationPropertyTest + 1 #linear + ${MITK_DATA_DIR}/Pic3D.nrrd + -V + ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefLinear.png #corresponding reference screenshot LINEAR + ) + + mitkAddCustomModuleTest(ResliceInterpolationIsCubic mitkImageVtkMapper2DResliceInterpolationPropertyTest + 3 #cubic + ${MITK_DATA_DIR}/Pic3D.nrrd + -V + ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefCubic.png #corresponding reference screenshot CUBIC + ) + #End test reslice interpolation + + # Testing of the rendering of binary images + #mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImage640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice + # ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage + # -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImage640x480REF.png #corresponding reference screenshot + #) + #mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImageWithRef640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice + # ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage + # -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImageWithRef640x480REF.png #corresponding reference screenshot + #) + # End of binary image tests + + mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTest_TextureProperty mitkSurfaceVtkMapper3DTest + ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom.vtp + ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom_RGBImage.nrrd + -V + ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedLiver640x480REF.png #corresponding reference screenshot + ) + + mitkAddCustomModuleTest(mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DTransferFunctionTest + ${MITK_DATA_DIR}/Png2D-bw.png + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-TransferFunctionRGBImage640x480REF.png #corresponding reference screenshot + ) + + mitkAddCustomModuleTest(mitkImageVtkMapper2DOpacityTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DOpacityTransferFunctionTest + ${MITK_DATA_DIR}/Png2D-bw.png + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-OpacityTransferFunctionRGBImage640x480REF.png #corresponding reference screenshot + ) + + ############################## DISABLED TESTS + + #Removed due to high rendering error. + #mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTexturedSphereTest_Football mitkSurfaceVtkMapper3DTexturedSphereTest + # ${MITK_DATA_DIR}/RenderingTestData/texture.jpg #input texture + # -V + # ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedSphere640x480REF.png corresponding reference screenshot + #) + + mitkAddCustomModuleTest(mitkImageVtkMapper2DLookupTableTest_Png2D-bw mitkImageVtkMapper2DLookupTableTest + ${MITK_DATA_DIR}/Png2D-bw.png + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-LookupTableRGBImage640x480REF.png #corresponding reference screenshot + ) + + #mitkAddCustomModuleTest(mitkImageTest_color2DImage mitkImageTest + # ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg + #) + + #mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest + # ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz + #) + SET_PROPERTY(TEST mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw + # mitkImageVtkMapper2D_pic3dOpacity640x480 + mitkSurfaceVtkMapper2DTest mitkSurfaceVtkMapper3DTest_TextureProperty mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 #mitkSurfaceVtkMapper3DTexturedSphereTest_Football + PROPERTY RUN_SERIAL TRUE) + + endif() + + add_test(mitkPointSetLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps) + set_property(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core) + + add_test(mitkImageWriterTest_nrrdImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg) + add_test(mitkImageWriterTest_2DPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/Png2D-bw.png) + add_test(mitkImageWriterTest_rgbPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbImage.png) + add_test(mitkImageWriterTest_rgbaPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png) + set_property(TEST mitkImageWriterTest_nrrdImage PROPERTY LABELS MITK-Core) + set_property(TEST mitkImageWriterTest_2DPNGImage PROPERTY LABELS MITK-Core) + set_property(TEST mitkImageWriterTest_rgbPNGImage PROPERTY LABELS MITK-Core) + set_property(TEST mitkImageWriterTest_rgbaPNGImage PROPERTY LABELS MITK-Core) endif() # TARGET ${TESTDRIVER} diff --git a/Modules/Overlays/Testing/CMakeLists.txt b/Modules/Overlays/Testing/CMakeLists.txt index bd1e56dae5..2567472bc1 100644 --- a/Modules/Overlays/Testing/CMakeLists.txt +++ b/Modules/Overlays/Testing/CMakeLists.txt @@ -1,39 +1,39 @@ -if(TARGET ${TESTDRIVER}) MITK_CREATE_MODULE_TESTS() -mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES VTK|vtkTestingRendering) +if(TARGET ${TESTDRIVER}) + mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES VTK|vtkTestingRendering) -if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING -mitkAddCustomModuleTest(mitkLabelOverlay3DRendering2DTest mitkLabelOverlay3DRendering2DTest #OverlayTest - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkLabelOverlay3DRendering2DTest.png #corresponding reference screenshot -) + if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING + mitkAddCustomModuleTest(mitkLabelOverlay3DRendering2DTest mitkLabelOverlay3DRendering2DTest #OverlayTest + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkLabelOverlay3DRendering2DTest.png #corresponding reference screenshot + ) -#mitkAddCustomModuleTest(mitkLabelOverlay3DRendering3DTest mitkLabelOverlay3DRendering3DTest #OverlayTest -# -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkLabelOverlay3DRendering3DTest.png #corresponding reference screenshot -#) + #mitkAddCustomModuleTest(mitkLabelOverlay3DRendering3DTest mitkLabelOverlay3DRendering3DTest #OverlayTest + # -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkLabelOverlay3DRendering3DTest.png #corresponding reference screenshot + #) -mitkAddCustomModuleTest(mitkTextOverlay2DRenderingTest_ball mitkTextOverlay2DRenderingTest #OverlayTest - ${MITK_DATA_DIR}/ball.stl #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay2DRenderingTest_ball.png #corresponding reference screenshot -) + mitkAddCustomModuleTest(mitkTextOverlay2DRenderingTest_ball mitkTextOverlay2DRenderingTest #OverlayTest + ${MITK_DATA_DIR}/ball.stl #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay2DRenderingTest_ball.png #corresponding reference screenshot + ) -#mitkAddCustomModuleTest(mitkTextOverlay2DLayouterRenderingTest_ball mitkTextOverlay2DLayouterRenderingTest #OverlayTest -# ${MITK_DATA_DIR}/ball.stl #input image to load in data storage -# -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay2DLayouterRenderingTest_ball.png #corresponding reference screenshot -#) + #mitkAddCustomModuleTest(mitkTextOverlay2DLayouterRenderingTest_ball mitkTextOverlay2DLayouterRenderingTest #OverlayTest + # ${MITK_DATA_DIR}/ball.stl #input image to load in data storage + # -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay2DLayouterRenderingTest_ball.png #corresponding reference screenshot + #) -mitkAddCustomModuleTest(mitkTextOverlay3DRendering2DTest_ball mitkTextOverlay3DRendering2DTest #OverlayTest - ${MITK_DATA_DIR}/ball.stl #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DRendering2DTest_ball.png #corresponding reference screenshot -) + mitkAddCustomModuleTest(mitkTextOverlay3DRendering2DTest_ball mitkTextOverlay3DRendering2DTest #OverlayTest + ${MITK_DATA_DIR}/ball.stl #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DRendering2DTest_ball.png #corresponding reference screenshot + ) -mitkAddCustomModuleTest(mitkTextOverlay3DRendering3DTest_ball mitkTextOverlay3DRendering3DTest #OverlayTest - ${MITK_DATA_DIR}/ball.stl #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DRendering3DTest_ball.png #corresponding reference screenshot -) + mitkAddCustomModuleTest(mitkTextOverlay3DRendering3DTest_ball mitkTextOverlay3DRendering3DTest #OverlayTest + ${MITK_DATA_DIR}/ball.stl #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DRendering3DTest_ball.png #corresponding reference screenshot + ) -mitkAddCustomModuleTest(mitkTextOverlay3DColorRenderingTest_ball mitkTextOverlay3DColorRenderingTest #OverlayTest - ${MITK_DATA_DIR}/ball.stl #input image to load in data storage - -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DColorRenderingTest_ball.png #corresponding reference screenshot -) -endif() + mitkAddCustomModuleTest(mitkTextOverlay3DColorRenderingTest_ball mitkTextOverlay3DColorRenderingTest #OverlayTest + ${MITK_DATA_DIR}/ball.stl #input image to load in data storage + -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/mitkTextOverlay3DColorRenderingTest_ball.png #corresponding reference screenshot + ) + endif() endif() # TARGET ${TESTDRIVER} \ No newline at end of file diff --git a/Modules/PlanarFigure/Testing/CMakeLists.txt b/Modules/PlanarFigure/Testing/CMakeLists.txt index 0003731d12..55f7454d12 100644 --- a/Modules/PlanarFigure/Testing/CMakeLists.txt +++ b/Modules/PlanarFigure/Testing/CMakeLists.txt @@ -1,155 +1,155 @@ -if(TARGET ${TESTDRIVER}) MITK_CREATE_MODULE_TESTS() -mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES VTK|vtkTestingRendering) - -set(testcaseBasename mitkViewportRenderingTest) - -# set verbose to 1 to get a list of all defined test cases during CMake configuration -set(verbose 0) - -# viewportTest(): -# -# 1. Sets up a scene with a DICOM image, several planar figures, an STL file -# 2. Modifies the viewport of the VTK renderer to only a part of the render window -# 3. Compares the rendering result against an expected version -# -# Parameters determine the size and position of the viewport and the render window -# The expected result is mitkViewportRenderingTest_${testPostfix}.png -# -function(viewportTest - testPostfix # postfix to uniquely identify the test case - rwWidth rwHeight # "rw" = render window - vpLeft vpBottom vpWidth vpHeight # "vp" = viewport - # list of images/files for visualization - ) - set(data ${ARGN}) # use all ADDITIONAL parameters after vpHeight as filenames - - # transform the input parameters in required test parameters - math(EXPR vpRight "${vpLeft} + ${vpWidth}") - math(EXPR vpTop "${vpBottom} + ${vpHeight}") - - #message(STATUS "Testing viewport of ${vpWidth}x${vpHeight} at ${vpLeft},${vpBottom} in render window of size ${rwWidth}x${rwHeight} ('${testPostfix}')") - - # add the actual test - mitkAddCustomModuleTest( - mitkViewportRenderingTest_${testPostfix} - mitkViewportRenderingTest - ${rwWidth} ${rwHeight} - ${vpLeft} ${vpBottom} - ${vpRight} ${vpTop} - ${data} - -V ${MITK_DATA_DIR}/RenderingTestData/viewport/mitkViewportRenderingTest_${testPostfix}.png #corresponding reference screenshot - ) - set_property(TEST mitkViewportRenderingTest_${testPostfix} - PROPERTY RUN_SERIAL TRUE) -endfunction() - -function(getFirstCharacter string charVar) - string(SUBSTRING ${string} 0 1 c) - set(${charVar} ${c} PARENT_SCOPE) -endfunction() - - -# The following lines loop over several variations of aspect ratios for -# - render window -# - a viewport within this render window -# - an input image (defines the input world geometry) -# --------------------------------------------------------------------- -# -# Render window -# - Square -# - Landscape -# - Portrait -# -# Viewport -# - Square -# - Landscape -# - Portrait -# -# World / Image -# - Square -# - Landscape -# - Portrait -# -if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING -foreach(renderWindowAspect Square Landscape Portrait) - foreach(viewportAspect Square Landscape Portrait) - foreach(worldAspect Square Landscape Portrait) - getFirstCharacter(${renderWindowAspect} renderWindowAspectSymbol) - getFirstCharacter(${viewportAspect} viewportAspectSymbol) - getFirstCharacter(${worldAspect} worldAspectSymbol) - - # construct test case name from various aspect ratios - set(testCaseShortname "r${renderWindowAspectSymbol}v${viewportAspectSymbol}w${worldAspectSymbol}") - - # construct test image name from aspect ratio - set(testImage ${MITK_DATA_DIR}/RenderingTestData/viewport/input_${worldAspect}/SCSFREN.dcm) # nice DICOM name encoding and gray value test image - set(testObjects - ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Line1.pf - ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Path1.pf - ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/FourPointAngle1.pf - ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Rectangle1.pf - ${MITK_DATA_DIR}/binary.stl - ) - - # render window size - if (renderWindowAspect STREQUAL Landscape) - set(renderWindowWidth 600) - else() - set(renderWindowWidth 500) - endif() - - if (renderWindowAspect STREQUAL Portrait) - set(renderWindowHeight 600) - else() - set(renderWindowHeight 500) - endif() - - # viewport size - if (viewportAspect STREQUAL Landscape) - set(viewportWidth 450) - else() - set(viewportWidth 300) - endif() - - if (viewportAspect STREQUAL Portrait) - set(viewportHeight 450) - else() - set(viewportHeight 300) - endif() - - # world size - if (worldAspect STREQUAL Portrait) - set(worldWidth 300) - set(worldHeight 420) - elseif (worldAspect STREQUAL Landscape) - set(worldWidth 420) - set(worldHeight 300) - else() - set(worldWidth 512) - set(worldHeight 512) - endif() - - # Summary - set(viewportX 30) - set(viewportY 45) - if (verbose) - message(STATUS "(${testCaseShortname}) " - "Render window ${renderWindowAspect} (${renderWindowWidth}x${renderWindowHeight}), " - "Viewport ${viewportAspect} (${viewportWidth}x${viewportHeight}+${viewportX}+${viewportY}), " - "World ${worldAspect} (${worldWidth}x${worldHeight})" - ) - endif() - - viewPortTest(${testCaseShortname} - ${renderWindowWidth} ${renderWindowHeight} - ${viewportX} ${viewportY} - ${viewportWidth} ${viewportHeight} - ${testImage} - ${testObjects}) - +if(TARGET ${TESTDRIVER}) + mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES VTK|vtkTestingRendering) + + set(testcaseBasename mitkViewportRenderingTest) + + # set verbose to 1 to get a list of all defined test cases during CMake configuration + set(verbose 0) + + # viewportTest(): + # + # 1. Sets up a scene with a DICOM image, several planar figures, an STL file + # 2. Modifies the viewport of the VTK renderer to only a part of the render window + # 3. Compares the rendering result against an expected version + # + # Parameters determine the size and position of the viewport and the render window + # The expected result is mitkViewportRenderingTest_${testPostfix}.png + # + function(viewportTest + testPostfix # postfix to uniquely identify the test case + rwWidth rwHeight # "rw" = render window + vpLeft vpBottom vpWidth vpHeight # "vp" = viewport + # list of images/files for visualization + ) + set(data ${ARGN}) # use all ADDITIONAL parameters after vpHeight as filenames + + # transform the input parameters in required test parameters + math(EXPR vpRight "${vpLeft} + ${vpWidth}") + math(EXPR vpTop "${vpBottom} + ${vpHeight}") + + #message(STATUS "Testing viewport of ${vpWidth}x${vpHeight} at ${vpLeft},${vpBottom} in render window of size ${rwWidth}x${rwHeight} ('${testPostfix}')") + + # add the actual test + mitkAddCustomModuleTest( + mitkViewportRenderingTest_${testPostfix} + mitkViewportRenderingTest + ${rwWidth} ${rwHeight} + ${vpLeft} ${vpBottom} + ${vpRight} ${vpTop} + ${data} + -V ${MITK_DATA_DIR}/RenderingTestData/viewport/mitkViewportRenderingTest_${testPostfix}.png #corresponding reference screenshot + ) + set_property(TEST mitkViewportRenderingTest_${testPostfix} + PROPERTY RUN_SERIAL TRUE) + endfunction() + + function(getFirstCharacter string charVar) + string(SUBSTRING ${string} 0 1 c) + set(${charVar} ${c} PARENT_SCOPE) + endfunction() + + + # The following lines loop over several variations of aspect ratios for + # - render window + # - a viewport within this render window + # - an input image (defines the input world geometry) + # --------------------------------------------------------------------- + # + # Render window + # - Square + # - Landscape + # - Portrait + # + # Viewport + # - Square + # - Landscape + # - Portrait + # + # World / Image + # - Square + # - Landscape + # - Portrait + # + if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING + foreach(renderWindowAspect Square Landscape Portrait) + foreach(viewportAspect Square Landscape Portrait) + foreach(worldAspect Square Landscape Portrait) + getFirstCharacter(${renderWindowAspect} renderWindowAspectSymbol) + getFirstCharacter(${viewportAspect} viewportAspectSymbol) + getFirstCharacter(${worldAspect} worldAspectSymbol) + + # construct test case name from various aspect ratios + set(testCaseShortname "r${renderWindowAspectSymbol}v${viewportAspectSymbol}w${worldAspectSymbol}") + + # construct test image name from aspect ratio + set(testImage ${MITK_DATA_DIR}/RenderingTestData/viewport/input_${worldAspect}/SCSFREN.dcm) # nice DICOM name encoding and gray value test image + set(testObjects + ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Line1.pf + ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Path1.pf + ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/FourPointAngle1.pf + ${MITK_DATA_DIR}/RenderingTestData/PlanarFigures/Rectangle1.pf + ${MITK_DATA_DIR}/binary.stl + ) + + # render window size + if (renderWindowAspect STREQUAL Landscape) + set(renderWindowWidth 600) + else() + set(renderWindowWidth 500) + endif() + + if (renderWindowAspect STREQUAL Portrait) + set(renderWindowHeight 600) + else() + set(renderWindowHeight 500) + endif() + + # viewport size + if (viewportAspect STREQUAL Landscape) + set(viewportWidth 450) + else() + set(viewportWidth 300) + endif() + + if (viewportAspect STREQUAL Portrait) + set(viewportHeight 450) + else() + set(viewportHeight 300) + endif() + + # world size + if (worldAspect STREQUAL Portrait) + set(worldWidth 300) + set(worldHeight 420) + elseif (worldAspect STREQUAL Landscape) + set(worldWidth 420) + set(worldHeight 300) + else() + set(worldWidth 512) + set(worldHeight 512) + endif() + + # Summary + set(viewportX 30) + set(viewportY 45) + if (verbose) + message(STATUS "(${testCaseShortname}) " + "Render window ${renderWindowAspect} (${renderWindowWidth}x${renderWindowHeight}), " + "Viewport ${viewportAspect} (${viewportWidth}x${viewportHeight}+${viewportX}+${viewportY}), " + "World ${worldAspect} (${worldWidth}x${worldHeight})" + ) + endif() + + viewPortTest(${testCaseShortname} + ${renderWindowWidth} ${renderWindowHeight} + ${viewportX} ${viewportY} + ${viewportWidth} ${viewportHeight} + ${testImage} + ${testObjects}) + + endforeach() endforeach() endforeach() -endforeach() -endif() # endif MITK_ENABLE_RENDERING_TESTING -endif() # endif TARGET ${TESTDRIVER} \ No newline at end of file + endif() # endif MITK_ENABLE_RENDERING_TESTING +endif() # endif TARGET ${TESTDRIVER} diff --git a/Modules/SceneSerialization/Testing/CMakeLists.txt b/Modules/SceneSerialization/Testing/CMakeLists.txt index 982904ff83..6296cc08b0 100644 --- a/Modules/SceneSerialization/Testing/CMakeLists.txt +++ b/Modules/SceneSerialization/Testing/CMakeLists.txt @@ -1,9 +1,8 @@ -if(TARGET ${TESTDRIVER}) MITK_CREATE_MODULE_TESTS(LABELS MITK-Modules) - -if(BUILD_TESTING AND MODULE_IS_ENABLED) - add_test(mitkSceneIOTest_Pic3D.nrrd_binary.stl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkSceneIOTest ${MITK_DATA_DIR}/Pic3D.nrrd - ${MITK_DATA_DIR}/binary.stl) - set_property(TEST mitkSceneIOTest_Pic3D.nrrd_binary.stl PROPERTY LABELS MITK-Modules) +if(TARGET ${TESTDRIVER}) + if(BUILD_TESTING AND MODULE_IS_ENABLED) + add_test(mitkSceneIOTest_Pic3D.nrrd_binary.stl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkSceneIOTest ${MITK_DATA_DIR}/Pic3D.nrrd + ${MITK_DATA_DIR}/binary.stl) + set_property(TEST mitkSceneIOTest_Pic3D.nrrd_binary.stl PROPERTY LABELS MITK-Modules) + endif() endif() -endif() # TARGET ${TESTDRIVER}