Merge branch 'fix/minorFixesNewVTKModules' into 'master'

[refact] minor fixes new vtk modules + add testing unit

See merge request !396

LidarPlugin/Plugin/CMakeLists.txt

@@ -12,13 +12,14 @@ vtk_module_scan(
 #--------------------------------------
 # Create plugin
 #--------------------------------------
-paraview_add_plugin(LidarPlugin 
+paraview_add_plugin(LidarPlugin
   VERSION "2.0"
   MODULES ${lidarplugin_modules}
   MODULE_FILES ${lidarplugin_module_files}
   MODULE_ARGS
     LICENSE_DESTINATION "${LV_INSTALL_INCLUDE_DIR}" #wip Temporary fix
-    TEST_DIRECTORY_NAME "NONE" # Do not let vtk_module build the default 'Testing' subdir, it complexifies paths
+    TEST_DIRECTORY_NAME "None" # Deactivate testing - incompatible with LidarPlugin
+    TEST_INPUT_DATA_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Testing/Data"
 )
 
 #-----------------------------------------------------------------------------

LidarPlugin/Plugin/LidarCore/Common/Core/Testing/CMakeLists.txt

+add_subdirectory(Cxx)

LidarPlugin/Plugin/LidarCore/Common/Core/Testing/Cxx/CMakeLists.txt

+vtk_add_test_cxx(lvCommonCoreCxxTests tests
+  NO_VALID NO_OUTPUT
+  TestBoundingBox.cxx
+  # TestVtkEigenTools.cxx
+  )
+
+vtk_test_cxx_executable(lvCommonCoreCxxTests tests)

LidarPlugin/Plugin/LidarCore/Testing/TestBoundingBox.cxx → LidarPlugin/Plugin/LidarCore/Common/Core/Testing/Cxx/TestBoundingBox.cxx

@@ -25,7 +25,7 @@
 #include <vtkMath.h>
 
 // LOCAL
-#include "Common/BoundingBox.h"
+#include "BoundingBox.h"
 #include "vtkEigenTools.h"
 
 //-----------------------------------------------------------------------------

LidarPlugin/Plugin/LidarCore/Common/Core/vtk.module

@@ -13,3 +13,5 @@ PRIVATE_DEPENDS
   Boost::system
   VTK::RenderingCore      # For vtkCustomTransformInterpolator
   YAML::yamlcpp
+TEST_DEPENDS
+  LidarView::TestingCore

LidarPlugin/Plugin/LidarCore/Filters/Calibration/Testing/CMakeLists.txt

+add_subdirectory(Cxx)

LidarPlugin/Plugin/LidarCore/Filters/Calibration/Testing/Cxx/CMakeLists.txt

+vtk_add_test_cxx(lvFiltersCalibrationCxxTests tests
+  NO_VALID NO_OUTPUT
+  TestCameraCalibration.cxx
+  TestCarGeometricCalibration-LaDoua.cxx
+  TestCarGeometricCalibration-MM.cxx
+  TestGeometricCalibration-LaDoua.cxx
+  TestGeometricCalibration-MM.cxx
+#   TestScaleCalibration-MM.cxx
+  )
+
+vtk_test_cxx_executable(lvFiltersCalibrationCxxTests tests)

LidarPlugin/Plugin/LidarCore/Filters/Calibration/vtk.module

@@ -8,9 +8,12 @@ DEPENDS
   Eigen3::Eigen
   VTK::CommonExecutionModel
 PRIVATE_DEPENDS
+  Boost::system
   Ceres::ceres
   LidarView::CommonCeres
   LidarView::CommonCore
   VTK::CommonCore
   VTK::CommonDataModel
   VTK::CommonMath
+TEST_DEPENDS
+  LidarView::IOCore

LidarPlugin/Plugin/LidarCore/Filters/CameraOpenCV/Testing/CMakeLists.txt

+add_subdirectory(Cxx)

LidarPlugin/Plugin/LidarCore/Filters/CameraOpenCV/Testing/Cxx/CMakeLists.txt

+vtk_add_test_cxx(lvFiltersCameraOpenCVCxxTests tests
+  NO_VALID NO_OUTPUT
+  TestMIDHOG.cxx)
+
+vtk_test_cxx_executable(lvFiltersCameraOpenCVCxxTests tests)

LidarPlugin/Plugin/LidarCore/Filters/CameraOpenCV/vtk.module

@@ -15,3 +15,6 @@ PRIVATE_DEPENDS
   Boost::filesystem
   LidarView::CommonOpenCV
   LidarView::CommonPCL
+TEST_DEPENDS
+  LidarView::FiltersCalibration
+  VTK::IOXML

LidarPlugin/Plugin/LidarCore/Filters/Processing/Testing/CMakeLists.txt

+add_subdirectory(Cxx)