diff --git a/Modules/Remeshing/CMakeLists.txt b/Modules/Remeshing/CMakeLists.txt index 4e658c5ebe..499635ca66 100644 --- a/Modules/Remeshing/CMakeLists.txt +++ b/Modules/Remeshing/CMakeLists.txt @@ -1,7 +1,5 @@ mitk_create_module( DEPENDS PUBLIC MitkCore - PACKAGE_DEPENDS ACVD|Surface+VolumeProcessing + PACKAGE_DEPENDS ACVD|Surface WARNINGS_NO_ERRORS # ACVD's header files trigger some unused parameter errors ) - -add_subdirectory(Testing) diff --git a/Modules/Remeshing/Testing/CMakeLists.txt b/Modules/Remeshing/Testing/CMakeLists.txt deleted file mode 100644 index 7a1edabe1d..0000000000 --- a/Modules/Remeshing/Testing/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -if(MITK_USE_ACVD) - MITK_CREATE_MODULE_TESTS() - - mitkAddCustomModuleTest(mitkRemeshingTest mitkRemeshingTest ${MITK_DATA_DIR}/binary.stl 0 1228 1.0 10 0.0 1 0 0) -endif() diff --git a/Modules/Remeshing/Testing/files.cmake b/Modules/Remeshing/Testing/files.cmake deleted file mode 100644 index b41ec2ca0c..0000000000 --- a/Modules/Remeshing/Testing/files.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(MODULE_TESTS -) - -set(MODULE_CUSTOM_TESTS - mitkRemeshingTest.cpp -) diff --git a/Modules/Remeshing/Testing/mitkRemeshingTest.cpp b/Modules/Remeshing/Testing/mitkRemeshingTest.cpp deleted file mode 100644 index a4fa0343fd..0000000000 --- a/Modules/Remeshing/Testing/mitkRemeshingTest.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#include -#include -#include -#include -#include -#include -#include - -#define _MITK_TEST_FOR_EXCEPTION(STATEMENT, EXCEPTION, MESSAGE) \ - MITK_TEST_OUTPUT_NO_ENDL(<< MESSAGE) \ - try \ - { \ - STATEMENT; \ - MITK_TEST_OUTPUT(<< " [FAILED]") \ - mitk::TestManager::GetInstance()->TestFailed(); \ - } \ - catch (const EXCEPTION &e) \ - { \ - MITK_TEST_OUTPUT(<< "\n " << e.GetDescription() << " [PASSED]") \ - mitk::TestManager::GetInstance()->TestPassed(); \ - } - -template -static T lexical_cast(const std::string &string) -{ - std::istringstream sstream(string); - T value; - - sstream >> value; - - if (sstream.fail()) - { - MITK_ERROR << "Lexical cast failed for '" << string << "'!"; - exit(EXIT_FAILURE); - } - - return value; -} - -static void Remesh_SurfaceIsNull_ThrowsException() -{ - mitk::Surface::ConstPointer surface; - _MITK_TEST_FOR_EXCEPTION( - mitk::Remesh(surface, 0, 100, 0.0), mitk::Exception, "Remesh_SurfaceIsNull_ThrowsException") -} - -static void Remesh_PolyDataIsNull_ThrowsException() -{ - mitk::Surface::ConstPointer surface = mitk::Surface::New().GetPointer(); - _MITK_TEST_FOR_EXCEPTION( - mitk::Remesh(surface, 0, 100, 0.0), mitk::Exception, "Remesh_PolyDataIsNull_ThrowsException") -} - -static void Remesh_SurfaceDoesNotHaveDataAtTimeStep_ThrowsException() -{ - mitk::Surface::ConstPointer surface = mitk::Surface::New().GetPointer(); - _MITK_TEST_FOR_EXCEPTION(mitk::Remesh(surface, 1, 100, 0.0), - mitk::Exception, - "Remesh_SurfaceDoesNotHaveDataAtTimeStep_ThrowsException") -} - -static void Remesh_SurfaceHasNoPolygons_ThrowsException() -{ - mitk::Surface::Pointer surface = mitk::Surface::New(); - vtkSmartPointer polyData = vtkSmartPointer::New(); - surface->SetVtkPolyData(polyData); - _MITK_TEST_FOR_EXCEPTION(mitk::Remesh(surface.GetPointer(), 0, 100, 0.0), - mitk::Exception, - "Remesh_SurfaceHasNoPolygons_ThrowsException") -} - -static void Remesh_SurfaceIsValid_ReturnsRemeshedSurface(const std::string &filename, - unsigned int t, - int numVertices, - double gradation, - int subsampling, - double edgeSplitting, - int optimizationLevel, - bool forceManifold, - bool boundaryFixing) -{ - auto surface = mitk::IOUtil::Load(filename); - mitk::Surface::Pointer remeshedSurface = mitk::Remesh( - surface.GetPointer(), t, numVertices, gradation, subsampling, edgeSplitting, optimizationLevel, forceManifold, boundaryFixing); - MITK_TEST_CONDITION(remeshedSurface.IsNotNull() && remeshedSurface->GetVtkPolyData() != nullptr && - remeshedSurface->GetVtkPolyData()->GetNumberOfPolys() != 0, - "Remesh_SurfaceIsValid_ReturnsRemeshedSurface") -} - -int mitkRemeshingTest(int argc, char *argv[]) -{ - if (argc != 10) - { - MITK_ERROR << "Invalid argument count!\n" - << "Usage: mitkRemeshingTest \n" - << " \n" - << " \n" - << " See MITK API documentation of mitk::Remesh() for details."; - - return EXIT_FAILURE; - } - - const std::string filename = argv[1]; - const unsigned int t = lexical_cast(argv[2]); - const int numVertices = lexical_cast(argv[3]); - const double gradation = lexical_cast(argv[4]); - const int subsampling = lexical_cast(argv[5]); - const double edgeSplitting = lexical_cast(argv[6]); - const int optimizationLevel = lexical_cast(argv[7]); - const bool forceManifold = lexical_cast(argv[8]); - const bool boundaryFixing = lexical_cast(argv[9]); - - MITK_TEST_BEGIN("mitkRemeshingTest") - - vtkDebugLeaks::SetExitError(0); - - Remesh_SurfaceIsNull_ThrowsException(); - Remesh_PolyDataIsNull_ThrowsException(); - Remesh_SurfaceDoesNotHaveDataAtTimeStep_ThrowsException(); - Remesh_SurfaceHasNoPolygons_ThrowsException(); - - Remesh_SurfaceIsValid_ReturnsRemeshedSurface( - filename, t, numVertices, gradation, subsampling, edgeSplitting, optimizationLevel, forceManifold, boundaryFixing); - - MITK_TEST_END() -}