diff --git a/Modules/Core/CMakeLists.txt b/Modules/Core/CMakeLists.txt index 9e7d180f85..1fb91ebada 100644 --- a/Modules/Core/CMakeLists.txt +++ b/Modules/Core/CMakeLists.txt @@ -1,77 +1,77 @@ set(TOOL_CPPS "") # temporary suppress warnings in the following files until image accessors are fully integrated. set_source_files_properties( src/DataManagement/mitkImage.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS ) set_source_files_properties( src/Controllers/mitkSliceNavigationController.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS ) MITK_CREATE_MODULE( INCLUDE_DIRS PUBLIC ${MITK_BINARY_DIR} PRIVATE src/Algorithms src/Controllers src/DataManagement src/Interactions src/IO src/Rendering ${OPENGL_INCLUDE_DIR} DEPENDS PUBLIC mbilog CppMicroServices PACKAGE_DEPENDS PRIVATE tinyxml OpenGL # Remove public GDCM and ITKIOGDCM dependency after mitkDicomSeriesReader was removed PUBLIC GDCM ITK|ITKIOGDCM PUBLIC ITK|ITKTransform+ITKImageGrid+ITKImageFeature # We privately use/link all ITK modules in order to support all IO, Transform, etc. # factories from ITK which are registered "automatically" via a factory manager. PRIVATE ITK PUBLIC VTK|vtkFiltersTexture+vtkFiltersParallel+vtkImagingStencil+vtkImagingMath+vtkInteractionStyle+vtkRenderingOpenGL+vtkRenderingVolumeOpenGL+vtkRenderingFreeTypeOpenGL+vtkRenderingLabel+vtkInteractionWidgets+vtkIOGeometry+vtkIOXML WARNINGS_AS_ERRORS SUBPROJECTS MITK-Core # Do not automatically create CppMicroServices initialization code. # Because the VTK 6 "auto-init" functionality injects file-local static # initialization code in every cpp file which includes a VTK header, # static initialization order becomes an issue again. For the Mitk # core library, we need to ensure that the VTK static initialization stuff # happens before the CppMicroServices initialization, since the latter # might already use VTK code which needs to access VTK object factories. # Hence, CppMicroServices initialization code is placed manually within # the mitkCoreActivator.cpp file. NO_INIT ) if(NOT TARGET ${MODULE_TARGET}) message(SEND_ERROR "Core target ${MODULE_TARGET} does not exist") endif() function(_itk_create_factory_register_manager) # In MITK_ITK_Config.cmake, we do *not* include ITK_USE_FILE, which # prevents multiple registrations/unregistrations of ITK IO factories # during library loading/unloading (of MITK libraries). However, we need # "one" place where the IO factories are registered at # least once. This could be the application executable, but every executable would # need to take care of that itself. Instead, we allow the auto registration in the # Mitk Core library. set(NO_DIRECTORY_SCOPED_ITK_COMPILE_DEFINITION 1) find_package(ITK) include(${ITK_USE_FILE}) if(NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER) # We manually add the define which will be of target scope. MITK # patches ITK_USE_FILE to remove the directory scoped compile # definition since it would be propagated to other targets in the # same directory scope but these targets might want to *not* # use the ITK factory manager stuff. target_compile_definitions(${MODULE_TARGET} PRIVATE ITK_IO_FACTORY_REGISTER_MANAGER) endif() endfunction() _itk_create_factory_register_manager() # this is needed for libraries which link to Mitk and need # symbols from explicitly instantiated templates if(MINGW) get_target_property(_mitkCore_MINGW_linkflags ${MODULE_TARGET} LINK_FLAGS) if(NOT _mitkCore_MINGW_linkflags) set(_mitkCore_MINGW_linkflags "") endif(NOT _mitkCore_MINGW_linkflags) set_target_properties(${MODULE_TARGET} PROPERTIES LINK_FLAGS "${_mitkCore_MINGW_linkflags} -Wl,--export-all-symbols") endif(MINGW) if(MSVC_IDE OR MSVC_VERSION OR MINGW) target_link_libraries(${MODULE_TARGET} PRIVATE psapi.lib) endif(MSVC_IDE OR MSVC_VERSION OR MINGW) add_subdirectory(TestingHelper) -add_subdirectory(tests) +add_subdirectory(test) diff --git a/Modules/Core/tests/CMakeLists.txt b/Modules/Core/test/CMakeLists.txt similarity index 100% rename from Modules/Core/tests/CMakeLists.txt rename to Modules/Core/test/CMakeLists.txt diff --git a/Modules/Core/tests/DirectOverlayTest.cpp b/Modules/Core/test/DirectOverlayTest.cpp similarity index 100% rename from Modules/Core/tests/DirectOverlayTest.cpp rename to Modules/Core/test/DirectOverlayTest.cpp diff --git a/Modules/Core/tests/files.cmake b/Modules/Core/test/files.cmake similarity index 100% rename from Modules/Core/tests/files.cmake rename to Modules/Core/test/files.cmake diff --git a/Modules/Core/tests/mitkAbstractTransformGeometryTest.cpp b/Modules/Core/test/mitkAbstractTransformGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkAbstractTransformGeometryTest.cpp rename to Modules/Core/test/mitkAbstractTransformGeometryTest.cpp diff --git a/Modules/Core/tests/mitkAbstractTransformPlaneGeometryTest.cpp b/Modules/Core/test/mitkAbstractTransformPlaneGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkAbstractTransformPlaneGeometryTest.cpp rename to Modules/Core/test/mitkAbstractTransformPlaneGeometryTest.cpp diff --git a/Modules/Core/tests/mitkAccessByItkTest.cpp b/Modules/Core/test/mitkAccessByItkTest.cpp similarity index 100% rename from Modules/Core/tests/mitkAccessByItkTest.cpp rename to Modules/Core/test/mitkAccessByItkTest.cpp diff --git a/Modules/Core/tests/mitkActionTest.cpp b/Modules/Core/test/mitkActionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkActionTest.cpp rename to Modules/Core/test/mitkActionTest.cpp diff --git a/Modules/Core/tests/mitkAffineTransformBaseTest.cpp b/Modules/Core/test/mitkAffineTransformBaseTest.cpp similarity index 100% rename from Modules/Core/tests/mitkAffineTransformBaseTest.cpp rename to Modules/Core/test/mitkAffineTransformBaseTest.cpp diff --git a/Modules/Core/tests/mitkArrayTypeConversionTest.cpp b/Modules/Core/test/mitkArrayTypeConversionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkArrayTypeConversionTest.cpp rename to Modules/Core/test/mitkArrayTypeConversionTest.cpp diff --git a/Modules/Core/tests/mitkBaseDataTest.cpp b/Modules/Core/test/mitkBaseDataTest.cpp similarity index 100% rename from Modules/Core/tests/mitkBaseDataTest.cpp rename to Modules/Core/test/mitkBaseDataTest.cpp diff --git a/Modules/Core/tests/mitkBaseGeometryTest.cpp b/Modules/Core/test/mitkBaseGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkBaseGeometryTest.cpp rename to Modules/Core/test/mitkBaseGeometryTest.cpp diff --git a/Modules/Core/tests/mitkClippedSurfaceBoundsCalculatorTest.cpp b/Modules/Core/test/mitkClippedSurfaceBoundsCalculatorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkClippedSurfaceBoundsCalculatorTest.cpp rename to Modules/Core/test/mitkClippedSurfaceBoundsCalculatorTest.cpp diff --git a/Modules/Core/tests/mitkCoreObjectFactoryTest.cpp b/Modules/Core/test/mitkCoreObjectFactoryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkCoreObjectFactoryTest.cpp rename to Modules/Core/test/mitkCoreObjectFactoryTest.cpp diff --git a/Modules/Core/tests/mitkDICOMLocaleTest.cpp b/Modules/Core/test/mitkDICOMLocaleTest.cpp similarity index 100% rename from Modules/Core/tests/mitkDICOMLocaleTest.cpp rename to Modules/Core/test/mitkDICOMLocaleTest.cpp diff --git a/Modules/Core/tests/mitkDataNodeTest.cpp b/Modules/Core/test/mitkDataNodeTest.cpp similarity index 100% rename from Modules/Core/tests/mitkDataNodeTest.cpp rename to Modules/Core/test/mitkDataNodeTest.cpp diff --git a/Modules/Core/tests/mitkDataStorageTest.cpp b/Modules/Core/test/mitkDataStorageTest.cpp similarity index 100% rename from Modules/Core/tests/mitkDataStorageTest.cpp rename to Modules/Core/test/mitkDataStorageTest.cpp diff --git a/Modules/Core/tests/mitkDicomSeriesReaderTest.cpp b/Modules/Core/test/mitkDicomSeriesReaderTest.cpp similarity index 100% rename from Modules/Core/tests/mitkDicomSeriesReaderTest.cpp rename to Modules/Core/test/mitkDicomSeriesReaderTest.cpp diff --git a/Modules/Core/tests/mitkDispatcherTest.cpp b/Modules/Core/test/mitkDispatcherTest.cpp similarity index 100% rename from Modules/Core/tests/mitkDispatcherTest.cpp rename to Modules/Core/test/mitkDispatcherTest.cpp diff --git a/Modules/Core/tests/mitkEnumerationPropertyTest.cpp b/Modules/Core/test/mitkEnumerationPropertyTest.cpp similarity index 100% rename from Modules/Core/tests/mitkEnumerationPropertyTest.cpp rename to Modules/Core/test/mitkEnumerationPropertyTest.cpp diff --git a/Modules/Core/tests/mitkEqualTest.cpp b/Modules/Core/test/mitkEqualTest.cpp similarity index 100% rename from Modules/Core/tests/mitkEqualTest.cpp rename to Modules/Core/test/mitkEqualTest.cpp diff --git a/Modules/Core/tests/mitkEventConfigTest.cpp b/Modules/Core/test/mitkEventConfigTest.cpp similarity index 100% rename from Modules/Core/tests/mitkEventConfigTest.cpp rename to Modules/Core/test/mitkEventConfigTest.cpp diff --git a/Modules/Core/tests/mitkEventMapperTest.cpp b/Modules/Core/test/mitkEventMapperTest.cpp similarity index 100% rename from Modules/Core/tests/mitkEventMapperTest.cpp rename to Modules/Core/test/mitkEventMapperTest.cpp diff --git a/Modules/Core/tests/mitkEventTest.cpp b/Modules/Core/test/mitkEventTest.cpp similarity index 100% rename from Modules/Core/tests/mitkEventTest.cpp rename to Modules/Core/test/mitkEventTest.cpp diff --git a/Modules/Core/tests/mitkExceptionTest.cpp b/Modules/Core/test/mitkExceptionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkExceptionTest.cpp rename to Modules/Core/test/mitkExceptionTest.cpp diff --git a/Modules/Core/tests/mitkExtractSliceFilterTest.cpp b/Modules/Core/test/mitkExtractSliceFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkExtractSliceFilterTest.cpp rename to Modules/Core/test/mitkExtractSliceFilterTest.cpp diff --git a/Modules/Core/tests/mitkFileReaderRegistryTest.cpp b/Modules/Core/test/mitkFileReaderRegistryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkFileReaderRegistryTest.cpp rename to Modules/Core/test/mitkFileReaderRegistryTest.cpp diff --git a/Modules/Core/tests/mitkFileWriterRegistryTest.cpp b/Modules/Core/test/mitkFileWriterRegistryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkFileWriterRegistryTest.cpp rename to Modules/Core/test/mitkFileWriterRegistryTest.cpp diff --git a/Modules/Core/tests/mitkFocusManagerTest.cpp b/Modules/Core/test/mitkFocusManagerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkFocusManagerTest.cpp rename to Modules/Core/test/mitkFocusManagerTest.cpp diff --git a/Modules/Core/tests/mitkGenericPropertyTest.cpp b/Modules/Core/test/mitkGenericPropertyTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGenericPropertyTest.cpp rename to Modules/Core/test/mitkGenericPropertyTest.cpp diff --git a/Modules/Core/tests/mitkGeometry3DEqualTest.cpp b/Modules/Core/test/mitkGeometry3DEqualTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGeometry3DEqualTest.cpp rename to Modules/Core/test/mitkGeometry3DEqualTest.cpp diff --git a/Modules/Core/tests/mitkGeometry3DTest.cpp b/Modules/Core/test/mitkGeometry3DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGeometry3DTest.cpp rename to Modules/Core/test/mitkGeometry3DTest.cpp diff --git a/Modules/Core/tests/mitkGeometryDataToSurfaceFilterTest.cpp b/Modules/Core/test/mitkGeometryDataToSurfaceFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGeometryDataToSurfaceFilterTest.cpp rename to Modules/Core/test/mitkGeometryDataToSurfaceFilterTest.cpp diff --git a/Modules/Core/tests/mitkGlobalInteractionTest.cpp b/Modules/Core/test/mitkGlobalInteractionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGlobalInteractionTest.cpp rename to Modules/Core/test/mitkGlobalInteractionTest.cpp diff --git a/Modules/Core/tests/mitkGrabItkImageMemoryTest.cpp b/Modules/Core/test/mitkGrabItkImageMemoryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkGrabItkImageMemoryTest.cpp rename to Modules/Core/test/mitkGrabItkImageMemoryTest.cpp diff --git a/Modules/Core/tests/mitkIOUtilTest.cpp b/Modules/Core/test/mitkIOUtilTest.cpp similarity index 100% rename from Modules/Core/tests/mitkIOUtilTest.cpp rename to Modules/Core/test/mitkIOUtilTest.cpp diff --git a/Modules/Core/tests/mitkITKThreadingTest.cpp b/Modules/Core/test/mitkITKThreadingTest.cpp similarity index 100% rename from Modules/Core/tests/mitkITKThreadingTest.cpp rename to Modules/Core/test/mitkITKThreadingTest.cpp diff --git a/Modules/Core/tests/mitkImageAccessorTest.cpp b/Modules/Core/test/mitkImageAccessorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageAccessorTest.cpp rename to Modules/Core/test/mitkImageAccessorTest.cpp diff --git a/Modules/Core/tests/mitkImageCastTest.cpp b/Modules/Core/test/mitkImageCastTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageCastTest.cpp rename to Modules/Core/test/mitkImageCastTest.cpp diff --git a/Modules/Core/tests/mitkImageDataItemTest.cpp b/Modules/Core/test/mitkImageDataItemTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageDataItemTest.cpp rename to Modules/Core/test/mitkImageDataItemTest.cpp diff --git a/Modules/Core/tests/mitkImageDimensionConverterTest.cpp b/Modules/Core/test/mitkImageDimensionConverterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageDimensionConverterTest.cpp rename to Modules/Core/test/mitkImageDimensionConverterTest.cpp diff --git a/Modules/Core/tests/mitkImageEqualTest.cpp b/Modules/Core/test/mitkImageEqualTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageEqualTest.cpp rename to Modules/Core/test/mitkImageEqualTest.cpp diff --git a/Modules/Core/tests/mitkImageGeneratorTest.cpp b/Modules/Core/test/mitkImageGeneratorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageGeneratorTest.cpp rename to Modules/Core/test/mitkImageGeneratorTest.cpp diff --git a/Modules/Core/tests/mitkImageSliceSelectorTest.cpp b/Modules/Core/test/mitkImageSliceSelectorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageSliceSelectorTest.cpp rename to Modules/Core/test/mitkImageSliceSelectorTest.cpp diff --git a/Modules/Core/tests/mitkImageTest.cpp b/Modules/Core/test/mitkImageTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageTest.cpp rename to Modules/Core/test/mitkImageTest.cpp diff --git a/Modules/Core/tests/mitkImageTimeSelectorTest.cpp b/Modules/Core/test/mitkImageTimeSelectorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageTimeSelectorTest.cpp rename to Modules/Core/test/mitkImageTimeSelectorTest.cpp diff --git a/Modules/Core/tests/mitkImageToItkTest.cpp b/Modules/Core/test/mitkImageToItkTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageToItkTest.cpp rename to Modules/Core/test/mitkImageToItkTest.cpp diff --git a/Modules/Core/tests/mitkImageToSurfaceFilterTest.cpp b/Modules/Core/test/mitkImageToSurfaceFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageToSurfaceFilterTest.cpp rename to Modules/Core/test/mitkImageToSurfaceFilterTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DColorTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DColorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DColorTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DColorTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DLevelWindowTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DLevelWindowTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DLevelWindowTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DLevelWindowTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DLookupTableTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DLookupTableTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DLookupTableTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DLookupTableTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DOpacityTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DOpacityTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DOpacityTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DOpacityTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DSwivelTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DSwivelTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DSwivelTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DSwivelTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DTest.cpp diff --git a/Modules/Core/tests/mitkImageVtkMapper2DTransferFunctionTest.cpp b/Modules/Core/test/mitkImageVtkMapper2DTransferFunctionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageVtkMapper2DTransferFunctionTest.cpp rename to Modules/Core/test/mitkImageVtkMapper2DTransferFunctionTest.cpp diff --git a/Modules/Core/tests/mitkImageWriterTest.cpp b/Modules/Core/test/mitkImageWriterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImageWriterTest.cpp rename to Modules/Core/test/mitkImageWriterTest.cpp diff --git a/Modules/Core/tests/mitkImportItkImageTest.cpp b/Modules/Core/test/mitkImportItkImageTest.cpp similarity index 100% rename from Modules/Core/tests/mitkImportItkImageTest.cpp rename to Modules/Core/test/mitkImportItkImageTest.cpp diff --git a/Modules/Core/tests/mitkInstantiateAccessFunctionTest.cpp b/Modules/Core/test/mitkInstantiateAccessFunctionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkInstantiateAccessFunctionTest.cpp rename to Modules/Core/test/mitkInstantiateAccessFunctionTest.cpp diff --git a/Modules/Core/tests/mitkInteractionEventTest.cpp b/Modules/Core/test/mitkInteractionEventTest.cpp similarity index 100% rename from Modules/Core/tests/mitkInteractionEventTest.cpp rename to Modules/Core/test/mitkInteractionEventTest.cpp diff --git a/Modules/Core/tests/mitkInteractorTest.cpp b/Modules/Core/test/mitkInteractorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkInteractorTest.cpp rename to Modules/Core/test/mitkInteractorTest.cpp diff --git a/Modules/Core/tests/mitkLevelWindowManagerTest.cpp b/Modules/Core/test/mitkLevelWindowManagerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLevelWindowManagerTest.cpp rename to Modules/Core/test/mitkLevelWindowManagerTest.cpp diff --git a/Modules/Core/tests/mitkLevelWindowTest.cpp b/Modules/Core/test/mitkLevelWindowTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLevelWindowTest.cpp rename to Modules/Core/test/mitkLevelWindowTest.cpp diff --git a/Modules/Core/tests/mitkLineTest.cpp b/Modules/Core/test/mitkLineTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLineTest.cpp rename to Modules/Core/test/mitkLineTest.cpp diff --git a/Modules/Core/tests/mitkLogTest.cpp b/Modules/Core/test/mitkLogTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLogTest.cpp rename to Modules/Core/test/mitkLogTest.cpp diff --git a/Modules/Core/tests/mitkLoggingAdapterTest.cpp b/Modules/Core/test/mitkLoggingAdapterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLoggingAdapterTest.cpp rename to Modules/Core/test/mitkLoggingAdapterTest.cpp diff --git a/Modules/Core/tests/mitkLookupTableTest.cpp b/Modules/Core/test/mitkLookupTableTest.cpp similarity index 100% rename from Modules/Core/tests/mitkLookupTableTest.cpp rename to Modules/Core/test/mitkLookupTableTest.cpp diff --git a/Modules/Core/tests/mitkMaterialTest.cpp b/Modules/Core/test/mitkMaterialTest.cpp similarity index 100% rename from Modules/Core/tests/mitkMaterialTest.cpp rename to Modules/Core/test/mitkMaterialTest.cpp diff --git a/Modules/Core/tests/mitkMatrixTypeConversionTest.cpp b/Modules/Core/test/mitkMatrixTypeConversionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkMatrixTypeConversionTest.cpp rename to Modules/Core/test/mitkMatrixTypeConversionTest.cpp diff --git a/Modules/Core/tests/mitkMessageTest.cpp b/Modules/Core/test/mitkMessageTest.cpp similarity index 100% rename from Modules/Core/tests/mitkMessageTest.cpp rename to Modules/Core/test/mitkMessageTest.cpp diff --git a/Modules/Core/tests/mitkMultiComponentImageDataComparisonFilterTest.cpp b/Modules/Core/test/mitkMultiComponentImageDataComparisonFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkMultiComponentImageDataComparisonFilterTest.cpp rename to Modules/Core/test/mitkMultiComponentImageDataComparisonFilterTest.cpp diff --git a/Modules/Core/tests/mitkNodeDependentPointSetInteractorTest.cpp b/Modules/Core/test/mitkNodeDependentPointSetInteractorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkNodeDependentPointSetInteractorTest.cpp rename to Modules/Core/test/mitkNodeDependentPointSetInteractorTest.cpp diff --git a/Modules/Core/tests/mitkNodePredicateSourceTest.cpp b/Modules/Core/test/mitkNodePredicateSourceTest.cpp similarity index 100% rename from Modules/Core/tests/mitkNodePredicateSourceTest.cpp rename to Modules/Core/test/mitkNodePredicateSourceTest.cpp diff --git a/Modules/Core/tests/mitkPixelTypeTest.cpp b/Modules/Core/test/mitkPixelTypeTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPixelTypeTest.cpp rename to Modules/Core/test/mitkPixelTypeTest.cpp diff --git a/Modules/Core/tests/mitkPlaneGeometryTest.cpp b/Modules/Core/test/mitkPlaneGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPlaneGeometryTest.cpp rename to Modules/Core/test/mitkPlaneGeometryTest.cpp diff --git a/Modules/Core/tests/mitkPlanePositionManagerTest.cpp b/Modules/Core/test/mitkPlanePositionManagerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPlanePositionManagerTest.cpp rename to Modules/Core/test/mitkPlanePositionManagerTest.cpp diff --git a/Modules/Core/tests/mitkPointSetDataInteractorTest.cpp b/Modules/Core/test/mitkPointSetDataInteractorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetDataInteractorTest.cpp rename to Modules/Core/test/mitkPointSetDataInteractorTest.cpp diff --git a/Modules/Core/tests/mitkPointSetEqualTest.cpp b/Modules/Core/test/mitkPointSetEqualTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetEqualTest.cpp rename to Modules/Core/test/mitkPointSetEqualTest.cpp diff --git a/Modules/Core/tests/mitkPointSetFileIOTest.cpp b/Modules/Core/test/mitkPointSetFileIOTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetFileIOTest.cpp rename to Modules/Core/test/mitkPointSetFileIOTest.cpp diff --git a/Modules/Core/tests/mitkPointSetInteractorTest.cpp b/Modules/Core/test/mitkPointSetInteractorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetInteractorTest.cpp rename to Modules/Core/test/mitkPointSetInteractorTest.cpp diff --git a/Modules/Core/tests/mitkPointSetLocaleTest.cpp b/Modules/Core/test/mitkPointSetLocaleTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetLocaleTest.cpp rename to Modules/Core/test/mitkPointSetLocaleTest.cpp diff --git a/Modules/Core/tests/mitkPointSetOnEmptyTest.cpp b/Modules/Core/test/mitkPointSetOnEmptyTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetOnEmptyTest.cpp rename to Modules/Core/test/mitkPointSetOnEmptyTest.cpp diff --git a/Modules/Core/tests/mitkPointSetPointOperationsTest.cpp b/Modules/Core/test/mitkPointSetPointOperationsTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetPointOperationsTest.cpp rename to Modules/Core/test/mitkPointSetPointOperationsTest.cpp diff --git a/Modules/Core/tests/mitkPointSetReaderTest.cpp b/Modules/Core/test/mitkPointSetReaderTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetReaderTest.cpp rename to Modules/Core/test/mitkPointSetReaderTest.cpp diff --git a/Modules/Core/tests/mitkPointSetTest.cpp b/Modules/Core/test/mitkPointSetTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetTest.cpp rename to Modules/Core/test/mitkPointSetTest.cpp diff --git a/Modules/Core/tests/mitkPointSetVtkMapper2DGlyphTypeTest.cpp b/Modules/Core/test/mitkPointSetVtkMapper2DGlyphTypeTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetVtkMapper2DGlyphTypeTest.cpp rename to Modules/Core/test/mitkPointSetVtkMapper2DGlyphTypeTest.cpp diff --git a/Modules/Core/tests/mitkPointSetVtkMapper2DImageTest.cpp b/Modules/Core/test/mitkPointSetVtkMapper2DImageTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetVtkMapper2DImageTest.cpp rename to Modules/Core/test/mitkPointSetVtkMapper2DImageTest.cpp diff --git a/Modules/Core/tests/mitkPointSetVtkMapper2DTest.cpp b/Modules/Core/test/mitkPointSetVtkMapper2DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetVtkMapper2DTest.cpp rename to Modules/Core/test/mitkPointSetVtkMapper2DTest.cpp diff --git a/Modules/Core/tests/mitkPointSetVtkMapper2DTransformedPointsTest.cpp b/Modules/Core/test/mitkPointSetVtkMapper2DTransformedPointsTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetVtkMapper2DTransformedPointsTest.cpp rename to Modules/Core/test/mitkPointSetVtkMapper2DTransformedPointsTest.cpp diff --git a/Modules/Core/tests/mitkPointSetWriterTest.cpp b/Modules/Core/test/mitkPointSetWriterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointSetWriterTest.cpp rename to Modules/Core/test/mitkPointSetWriterTest.cpp diff --git a/Modules/Core/tests/mitkPointTypeConversionTest.cpp b/Modules/Core/test/mitkPointTypeConversionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPointTypeConversionTest.cpp rename to Modules/Core/test/mitkPointTypeConversionTest.cpp diff --git a/Modules/Core/tests/mitkProgressBarTest.cpp b/Modules/Core/test/mitkProgressBarTest.cpp similarity index 100% rename from Modules/Core/tests/mitkProgressBarTest.cpp rename to Modules/Core/test/mitkProgressBarTest.cpp diff --git a/Modules/Core/tests/mitkPropertyAliasesTest.cpp b/Modules/Core/test/mitkPropertyAliasesTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyAliasesTest.cpp rename to Modules/Core/test/mitkPropertyAliasesTest.cpp diff --git a/Modules/Core/tests/mitkPropertyDescriptionsTest.cpp b/Modules/Core/test/mitkPropertyDescriptionsTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyDescriptionsTest.cpp rename to Modules/Core/test/mitkPropertyDescriptionsTest.cpp diff --git a/Modules/Core/tests/mitkPropertyExtensionsTest.cpp b/Modules/Core/test/mitkPropertyExtensionsTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyExtensionsTest.cpp rename to Modules/Core/test/mitkPropertyExtensionsTest.cpp diff --git a/Modules/Core/tests/mitkPropertyFiltersTest.cpp b/Modules/Core/test/mitkPropertyFiltersTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyFiltersTest.cpp rename to Modules/Core/test/mitkPropertyFiltersTest.cpp diff --git a/Modules/Core/tests/mitkPropertyListTest.cpp b/Modules/Core/test/mitkPropertyListTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyListTest.cpp rename to Modules/Core/test/mitkPropertyListTest.cpp diff --git a/Modules/Core/tests/mitkPropertyTest.cpp b/Modules/Core/test/mitkPropertyTest.cpp similarity index 100% rename from Modules/Core/tests/mitkPropertyTest.cpp rename to Modules/Core/test/mitkPropertyTest.cpp diff --git a/Modules/Core/tests/mitkProportionalTimeGeometryTest.cpp b/Modules/Core/test/mitkProportionalTimeGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkProportionalTimeGeometryTest.cpp rename to Modules/Core/test/mitkProportionalTimeGeometryTest.cpp diff --git a/Modules/Core/tests/mitkRawImageFileReaderTest.cpp b/Modules/Core/test/mitkRawImageFileReaderTest.cpp similarity index 100% rename from Modules/Core/tests/mitkRawImageFileReaderTest.cpp rename to Modules/Core/test/mitkRawImageFileReaderTest.cpp diff --git a/Modules/Core/tests/mitkRegistrationBaseTest.cpp b/Modules/Core/test/mitkRegistrationBaseTest.cpp similarity index 100% rename from Modules/Core/tests/mitkRegistrationBaseTest.cpp rename to Modules/Core/test/mitkRegistrationBaseTest.cpp diff --git a/Modules/Core/tests/mitkRenderingManagerTest.cpp b/Modules/Core/test/mitkRenderingManagerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkRenderingManagerTest.cpp rename to Modules/Core/test/mitkRenderingManagerTest.cpp diff --git a/Modules/Core/tests/mitkSTLFileReaderTest.cpp b/Modules/Core/test/mitkSTLFileReaderTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSTLFileReaderTest.cpp rename to Modules/Core/test/mitkSTLFileReaderTest.cpp diff --git a/Modules/Core/tests/mitkShaderRepositoryTest.cpp b/Modules/Core/test/mitkShaderRepositoryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkShaderRepositoryTest.cpp rename to Modules/Core/test/mitkShaderRepositoryTest.cpp diff --git a/Modules/Core/tests/mitkSliceNavigationControllerTest.cpp b/Modules/Core/test/mitkSliceNavigationControllerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSliceNavigationControllerTest.cpp rename to Modules/Core/test/mitkSliceNavigationControllerTest.cpp diff --git a/Modules/Core/tests/mitkSlicedGeometry3DTest.cpp b/Modules/Core/test/mitkSlicedGeometry3DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSlicedGeometry3DTest.cpp rename to Modules/Core/test/mitkSlicedGeometry3DTest.cpp diff --git a/Modules/Core/tests/mitkStateMachineContainerTest.cpp b/Modules/Core/test/mitkStateMachineContainerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkStateMachineContainerTest.cpp rename to Modules/Core/test/mitkStateMachineContainerTest.cpp diff --git a/Modules/Core/tests/mitkStateMachineFactoryTest.cpp b/Modules/Core/test/mitkStateMachineFactoryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkStateMachineFactoryTest.cpp rename to Modules/Core/test/mitkStateMachineFactoryTest.cpp diff --git a/Modules/Core/tests/mitkStateMachineTest.cpp b/Modules/Core/test/mitkStateMachineTest.cpp similarity index 100% rename from Modules/Core/tests/mitkStateMachineTest.cpp rename to Modules/Core/test/mitkStateMachineTest.cpp diff --git a/Modules/Core/tests/mitkStateTest.cpp b/Modules/Core/test/mitkStateTest.cpp similarity index 100% rename from Modules/Core/tests/mitkStateTest.cpp rename to Modules/Core/test/mitkStateTest.cpp diff --git a/Modules/Core/tests/mitkStepperTest.cpp b/Modules/Core/test/mitkStepperTest.cpp similarity index 100% rename from Modules/Core/tests/mitkStepperTest.cpp rename to Modules/Core/test/mitkStepperTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceDepthPeelingTest.cpp b/Modules/Core/test/mitkSurfaceDepthPeelingTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceDepthPeelingTest.cpp rename to Modules/Core/test/mitkSurfaceDepthPeelingTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceDepthSortingTest.cpp b/Modules/Core/test/mitkSurfaceDepthSortingTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceDepthSortingTest.cpp rename to Modules/Core/test/mitkSurfaceDepthSortingTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceEqualTest.cpp b/Modules/Core/test/mitkSurfaceEqualTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceEqualTest.cpp rename to Modules/Core/test/mitkSurfaceEqualTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceTest.cpp b/Modules/Core/test/mitkSurfaceTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceTest.cpp rename to Modules/Core/test/mitkSurfaceTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceToImageFilterTest.cpp b/Modules/Core/test/mitkSurfaceToImageFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceToImageFilterTest.cpp rename to Modules/Core/test/mitkSurfaceToImageFilterTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceToSurfaceFilterTest.cpp b/Modules/Core/test/mitkSurfaceToSurfaceFilterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceToSurfaceFilterTest.cpp rename to Modules/Core/test/mitkSurfaceToSurfaceFilterTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceVtkMapper2DTest.cpp b/Modules/Core/test/mitkSurfaceVtkMapper2DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceVtkMapper2DTest.cpp rename to Modules/Core/test/mitkSurfaceVtkMapper2DTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceVtkMapper3DTest.cpp b/Modules/Core/test/mitkSurfaceVtkMapper3DTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceVtkMapper3DTest.cpp rename to Modules/Core/test/mitkSurfaceVtkMapper3DTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp b/Modules/Core/test/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp rename to Modules/Core/test/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp diff --git a/Modules/Core/tests/mitkSurfaceVtkWriterTest.cpp b/Modules/Core/test/mitkSurfaceVtkWriterTest.cpp similarity index 100% rename from Modules/Core/tests/mitkSurfaceVtkWriterTest.cpp rename to Modules/Core/test/mitkSurfaceVtkWriterTest.cpp diff --git a/Modules/Core/tests/mitkTestUtilSharedLibrary.cpp b/Modules/Core/test/mitkTestUtilSharedLibrary.cpp similarity index 100% rename from Modules/Core/tests/mitkTestUtilSharedLibrary.cpp rename to Modules/Core/test/mitkTestUtilSharedLibrary.cpp diff --git a/Modules/Core/tests/mitkTimeGeometryTest.cpp b/Modules/Core/test/mitkTimeGeometryTest.cpp similarity index 100% rename from Modules/Core/tests/mitkTimeGeometryTest.cpp rename to Modules/Core/test/mitkTimeGeometryTest.cpp diff --git a/Modules/Core/tests/mitkTinyXMLTest.cpp b/Modules/Core/test/mitkTinyXMLTest.cpp similarity index 100% rename from Modules/Core/tests/mitkTinyXMLTest.cpp rename to Modules/Core/test/mitkTinyXMLTest.cpp diff --git a/Modules/Core/tests/mitkTransferFunctionTest.cpp b/Modules/Core/test/mitkTransferFunctionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkTransferFunctionTest.cpp rename to Modules/Core/test/mitkTransferFunctionTest.cpp diff --git a/Modules/Core/tests/mitkTransitionTest.cpp b/Modules/Core/test/mitkTransitionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkTransitionTest.cpp rename to Modules/Core/test/mitkTransitionTest.cpp diff --git a/Modules/Core/tests/mitkUIDGeneratorTest.cpp b/Modules/Core/test/mitkUIDGeneratorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkUIDGeneratorTest.cpp rename to Modules/Core/test/mitkUIDGeneratorTest.cpp diff --git a/Modules/Core/tests/mitkUndoControllerTest.cpp b/Modules/Core/test/mitkUndoControllerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkUndoControllerTest.cpp rename to Modules/Core/test/mitkUndoControllerTest.cpp diff --git a/Modules/Core/tests/mitkVTKRenderWindowSizeTest.cpp b/Modules/Core/test/mitkVTKRenderWindowSizeTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVTKRenderWindowSizeTest.cpp rename to Modules/Core/test/mitkVTKRenderWindowSizeTest.cpp diff --git a/Modules/Core/tests/mitkVectorTest.cpp b/Modules/Core/test/mitkVectorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVectorTest.cpp rename to Modules/Core/test/mitkVectorTest.cpp diff --git a/Modules/Core/tests/mitkVectorTypeConversionTest.cpp b/Modules/Core/test/mitkVectorTypeConversionTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVectorTypeConversionTest.cpp rename to Modules/Core/test/mitkVectorTypeConversionTest.cpp diff --git a/Modules/Core/tests/mitkVerboseLimitedLinearUndoTest.cpp b/Modules/Core/test/mitkVerboseLimitedLinearUndoTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVerboseLimitedLinearUndoTest.cpp rename to Modules/Core/test/mitkVerboseLimitedLinearUndoTest.cpp diff --git a/Modules/Core/tests/mitkVolumeCalculatorTest.cpp b/Modules/Core/test/mitkVolumeCalculatorTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVolumeCalculatorTest.cpp rename to Modules/Core/test/mitkVolumeCalculatorTest.cpp diff --git a/Modules/Core/tests/mitkVtkPropRendererTest.cpp b/Modules/Core/test/mitkVtkPropRendererTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVtkPropRendererTest.cpp rename to Modules/Core/test/mitkVtkPropRendererTest.cpp diff --git a/Modules/Core/tests/mitkVtkWidgetRenderingTest.cpp b/Modules/Core/test/mitkVtkWidgetRenderingTest.cpp similarity index 100% rename from Modules/Core/tests/mitkVtkWidgetRenderingTest.cpp rename to Modules/Core/test/mitkVtkWidgetRenderingTest.cpp diff --git a/Modules/Core/tests/mitkWeakPointerTest.cpp b/Modules/Core/test/mitkWeakPointerTest.cpp similarity index 100% rename from Modules/Core/tests/mitkWeakPointerTest.cpp rename to Modules/Core/test/mitkWeakPointerTest.cpp diff --git a/Modules/Core/tests/resources/Interactions/AddAndRemovePoints.xml b/Modules/Core/test/resources/Interactions/AddAndRemovePoints.xml similarity index 100% rename from Modules/Core/tests/resources/Interactions/AddAndRemovePoints.xml rename to Modules/Core/test/resources/Interactions/AddAndRemovePoints.xml diff --git a/Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml b/Modules/Core/test/resources/Interactions/StatemachineConfigTest.xml similarity index 100% rename from Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml rename to Modules/Core/test/resources/Interactions/StatemachineConfigTest.xml diff --git a/Modules/Core/tests/resources/Interactions/StatemachineTest.xml b/Modules/Core/test/resources/Interactions/StatemachineTest.xml similarity index 100% rename from Modules/Core/tests/resources/Interactions/StatemachineTest.xml rename to Modules/Core/test/resources/Interactions/StatemachineTest.xml diff --git a/Modules/Core/tests/resources/Interactions/globalConfig.xml b/Modules/Core/test/resources/Interactions/globalConfig.xml similarity index 100% rename from Modules/Core/tests/resources/Interactions/globalConfig.xml rename to Modules/Core/test/resources/Interactions/globalConfig.xml diff --git a/Modules/Core/tests/vtkMitkThickSlicesFilterTest.cpp b/Modules/Core/test/vtkMitkThickSlicesFilterTest.cpp similarity index 100% rename from Modules/Core/tests/vtkMitkThickSlicesFilterTest.cpp rename to Modules/Core/test/vtkMitkThickSlicesFilterTest.cpp