Organize Tests Source (#70)

* Organize test sources
* Add test config.hpp

Author: zfergus

.gitignore

@@ -260,6 +260,7 @@ python/bunny.obj
 IPCToolkitOptions.cmake
 
 src/ipc/config.hpp
+tests/src/tests/config.hpp
 
 docs/_doxygen
 

CMakeLists.txt

@@ -69,21 +69,9 @@ option(IPC_TOOLKIT_WITH_CUDA                  "Enable CUDA CCD"
 option(IPC_TOOLKIT_WITH_RATIONAL_INTERSECTION "Use rational edge-triangle intersection check" OFF)
 option(IPC_TOOLKIT_WITH_ROBIN_MAP             "Use Tessil's robin-map rather than std maps"    ON)
 option(IPC_TOOLKIT_WITH_ABSEIL                "Use Abseil's hash functions"                    ON)
-option(IPC_TOOLKIT_WITH_CODE_COVERAGE              "Enable coverage reporting"                     OFF)
+option(IPC_TOOLKIT_WITH_CODE_COVERAGE         "Enable coverage reporting"                     OFF)
 mark_as_advanced(IPC_TOOLKIT_WITH_CODE_COVERAGE)
 
-include(CMakeDependentOption)
-cmake_dependent_option(IPC_TOOLKIT_TEST_CCD_BENCHMARK "Enable CCD benchmark test" OFF "IPC_TOOLKIT_BUILD_TESTS" OFF)
-if(IPC_TOOLKIT_TEST_CCD_BENCHMARK)
-  mark_as_advanced(CLEAR IPC_TOOLKIT_CCD_BENCHMARK_DIR)
-  mark_as_advanced(CLEAR IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR)
-  set(IPC_TOOLKIT_CCD_BENCHMARK_DIR "" CACHE PATH "Path to the CCD benchmark directory")
-  set(IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR "" CACHE PATH "Path to the new CCD benchmark directory")
-else()
-  mark_as_advanced(FORCE IPC_TOOLKIT_CCD_BENCHMARK_DIR)
-  mark_as_advanced(FORCE IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR)
-endif()
-
 # Set default minimum C++ standard
 if(IPC_TOOLKIT_TOPLEVEL_PROJECT)
   set(CMAKE_CXX_STANDARD 17)
@@ -110,7 +98,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # IPC Toolkit Library
 ################################################################################
 
-# Add an empty library and fill in the list of sources in `src/CMakeLists.txt`.
+# Add an empty library and fill in the list of sources in `src/ipc/CMakeLists.txt`.
 add_library(ipc_toolkit)
 add_library(ipc::toolkit ALIAS ipc_toolkit)
 

src/ipc/distance/edge_edge_mollifier.cpp

@@ -41,19 +41,31 @@ Matrix12d edge_edge_cross_squarednorm_hessian(
 
 double edge_edge_mollifier(const double x, const double eps_x)
 {
-    const double x_div_eps_x = x / eps_x;
-    return (-x_div_eps_x + 2.0) * x_div_eps_x;
+    if (x < eps_x) {
+        const double x_div_eps_x = x / eps_x;
+        return (-x_div_eps_x + 2.0) * x_div_eps_x;
+    } else {
+        return 1.0;
+    }
 }
 
 double edge_edge_mollifier_gradient(const double x, const double eps_x)
 {
-    const double one_div_eps_x = 1.0 / eps_x;
-    return 2.0 * one_div_eps_x * (-one_div_eps_x * x + 1.0);
+    if (x < eps_x) {
+        const double one_div_eps_x = 1.0 / eps_x;
+        return 2.0 * one_div_eps_x * (-one_div_eps_x * x + 1.0);
+    } else {
+        return 0.0;
+    }
 }
 
 double edge_edge_mollifier_hessian(const double x, const double eps_x)
 {
-    return -2.0 / (eps_x * eps_x);
+    if (x < eps_x) {
+        return -2.0 / (eps_x * eps_x);
+    } else {
+        return 0.0;
+    }
 }
 
 double edge_edge_mollifier(

tests/CMakeLists.txt

@@ -2,73 +2,42 @@
 # Tests
 ################################################################################
 
-add_executable(ipc_toolkit_tests
-  main.cpp
-
-  # Test barrier and dertivatives
-  barrier/test_barrier.cpp
-
-  # Test candidates
-  candidates/test_candidates.cpp
-
-  # Test CCD
-  broad_phase/benchmark_broad_phase.cpp
-  broad_phase/brute_force_comparison.cpp
-  broad_phase/test_aabb.cpp
-  broad_phase/test_broad_phase.cpp
-  broad_phase/test_spatial_hash.cpp
-  broad_phase/test_voxel_size_heuristic.cpp
-  ccd/benchmark_ccd.cpp
-  ccd/collision_generator.cpp
-  ccd/test_ccd.cpp
-  ccd/test_ccd_benchmark.cpp
-  ccd/test_point_point_ccd.cpp
-  ccd/test_point_edge_ccd.cpp
-  ccd/test_point_triangle_ccd.cpp
-  ccd/test_edge_edge_ccd.cpp
-  ccd/test_ccd.cpp
-  test_cfl.cpp
-
-  # Test distances and dertivatives
-  distance/test_distance_type.cpp
-  distance/test_edge_edge.cpp
-  distance/test_line_line.cpp
-  distance/test_point_edge.cpp
-  distance/test_point_line.cpp
-  distance/test_point_plane.cpp
-  distance/test_point_point.cpp
-  distance/test_point_triangle.cpp
-
-  # Test collision constraints
-  collisions/test_constraints.cpp
-
-  # Test friction
-  friction/friction_data_generator.cpp
-  friction/test_closest_point.cpp
-  friction/test_force_jacobian.cpp
-  friction/test_friction.cpp
-  friction/test_normal_force_magnitude.cpp
-  friction/test_relative_velocity.cpp
-  friction/test_smooth_friction_mollifier.cpp
-  friction/test_tangent_basis.cpp
-
-  # Test general interface
-  test_ipc.cpp
-  test_collision_mesh.cpp
-
-  # Test intersection checks
-  test_has_intersections.cpp
-
-  # Tes utility functions
-  test_utils.cpp
-
-  # Utilities for tests
-  utils.cpp
-
-  benchmark_eigen.cpp
-)
-
-target_include_directories(ipc_toolkit_tests PUBLIC ".")
+include(CMakeDependentOption)
+cmake_dependent_option(IPC_TOOLKIT_TESTS_CCD_BENCHMARK "Enable CCD benchmark test" OFF "IPC_TOOLKIT_BUILD_TESTS" OFF)
+if(IPC_TOOLKIT_TESTS_CCD_BENCHMARK)
+  mark_as_advanced(CLEAR IPC_TOOLKIT_TESTS_CCD_BENCHMARK_DIR)
+  mark_as_advanced(CLEAR IPC_TOOLKIT_TESTS_NEW_CCD_BENCHMARK_DIR)
+  set(IPC_TOOLKIT_TESTS_CCD_BENCHMARK_DIR "" CACHE PATH "Path to the CCD benchmark directory")
+  set(IPC_TOOLKIT_TESTS_NEW_CCD_BENCHMARK_DIR "" CACHE PATH "Path to the new CCD benchmark directory")
+else()
+  mark_as_advanced(FORCE IPC_TOOLKIT_TESTS_CCD_BENCHMARK_DIR)
+  mark_as_advanced(FORCE IPC_TOOLKIT_TESTS_NEW_CCD_BENCHMARK_DIR)
+endif()
+
+### Configuration
+set(IPC_TOOLKIT_TESTS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests")
+set(IPC_TOOLKIT_TESTS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+
+### Data directory
+cmake_path(APPEND IPC_TOOLKIT_TESTS_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}" "data")
+
+################################################################################
+# IPC Toolkit Tests Executable
+################################################################################
+
+# Add an empty library and fill in the list of sources in `src/tests/CMakeLists.txt`.
+add_executable(ipc_toolkit_tests)
+
+# Fill in configuration options
+configure_file(
+  "${IPC_TOOLKIT_TESTS_SOURCE_DIR}/config.hpp.in"
+  "${IPC_TOOLKIT_TESTS_SOURCE_DIR}/config.hpp")
+
+# Add source and header files to ipc_toolkit_tests
+add_subdirectory("${IPC_TOOLKIT_TESTS_SOURCE_DIR}")
+
+# Public include directory for IPC Toolkit tests
+target_include_directories(ipc_toolkit_tests PUBLIC "${IPC_TOOLKIT_TESTS_INCLUDE_DIR}")
 
 ################################################################################
 # Required Libraries
@@ -85,17 +54,14 @@ target_link_libraries(ipc_toolkit_tests PUBLIC finitediff::finitediff)
 include(json)
 target_link_libraries(ipc_toolkit_tests PUBLIC nlohmann_json::nlohmann_json)
 
-if (IPC_TOOLKIT_TEST_CCD_BENCHMARK)
+if (IPC_TOOLKIT_TESTS_CCD_BENCHMARK)
   include(ccd_query_io)
   target_link_libraries(ipc_toolkit_tests PUBLIC ccd_io::ccd_io)
-  target_compile_definitions(ipc_toolkit_tests PRIVATE IPC_TOOLKIT_TEST_CCD_BENCHMARK)
   if(NOT (IPC_TOOLKIT_CCD_BENCHMARK_DIR STREQUAL ""))
     message(STATUS "Using CCD benchmark directory: ${IPC_TOOLKIT_CCD_BENCHMARK_DIR}")
-    target_compile_definitions(ipc_toolkit_tests PRIVATE IPC_TOOLKIT_CCD_BENCHMARK_DIR="${IPC_TOOLKIT_CCD_BENCHMARK_DIR}")
   endif()
   if(NOT (IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR STREQUAL ""))
     message(STATUS "Using new CCD benchmark directory: ${IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR}")
-    target_compile_definitions(ipc_toolkit_tests PRIVATE IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR="${IPC_TOOLKIT_CCD_NEW_BENCHMARK_DIR}")
   endif()
 endif()
 
@@ -114,13 +80,6 @@ target_link_libraries(ipc_toolkit_tests PRIVATE ipc::toolkit::warnings)
 
 target_compile_definitions(ipc_toolkit_tests PUBLIC CATCH_CONFIG_ENABLE_BENCHMARKING)
 
-# Test data directory definition
-if(WIN32)
-  target_compile_definitions(ipc_toolkit_tests PUBLIC TEST_DATA_DIR_CSTR="${CMAKE_CURRENT_SOURCE_DIR}\\\\data\\\\")
-else()
-  target_compile_definitions(ipc_toolkit_tests PUBLIC TEST_DATA_DIR_CSTR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
-endif()
-
 ################################################################################
 # Register tests
 ################################################################################
@@ -131,4 +90,4 @@ include(Catch)
 
 # Register tests
 set(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS ON)
-catch_discover_tests(ipc_toolkit_tests)
+catch_discover_tests(ipc_toolkit_tests)

tests/broad_phase/test_spatial_hash.cpp

@@ -0,0 +1,33 @@
+set(SOURCES
+  main.cpp
+  config.hpp
+
+  # Tests
+  test_cfl.cpp
+  test_collision_mesh.cpp
+  test_has_intersections.cpp
+  test_ipc.cpp
+  test_utils.cpp
+
+  # Benchmarks
+  benchmark_eigen.cpp
+
+  # Utilities
+  utils.cpp
+  utils.hpp
+)
+
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${SOURCES})
+target_sources(ipc_toolkit_tests PRIVATE ${SOURCES})
+
+################################################################################
+# Subfolders
+################################################################################
+
+add_subdirectory(barrier)
+add_subdirectory(broad_phase)
+add_subdirectory(candidates)
+add_subdirectory(ccd)
+add_subdirectory(collisions)
+add_subdirectory(distance)
+add_subdirectory(friction)

tests/src/tests/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(SOURCES
+  # Tests
+  test_barrier.cpp
+
+  # Benchmarks
+
+  # Utilities
+)
+
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${SOURCES})
+target_sources(ipc_toolkit_tests PRIVATE ${SOURCES})
+
+################################################################################
+# Subfolders
+################################################################################

tests/src/tests/barrier/CMakeLists.txt

@@ -1,10 +1,13 @@
-#include <Eigen/Core>
-#include <catch2/catch_all.hpp>
-
-#include <finitediff.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
+#include <catch2/generators/catch_generators_random.hpp>
+#include <catch2/generators/catch_generators_adapters.hpp>
 
 #include <ipc/barrier/barrier.hpp>
 
+#include <finitediff.hpp>
+
 namespace {
 double normalized_barrier(const double d, const double dhat)
 {

tests/barrier/test_barrier.cpp tests/src/tests/barrier/test_barrier.cpptests/barrier/test_barrier.cpp renamed to tests/src/tests/barrier/test_barrier.cpp

@@ -1,10 +1,9 @@
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
 
 #include <ipc/distance/point_point.hpp>
 #include <ipc/distance/line_line.hpp>
 #include <ipc/distance/point_triangle.hpp>
-#include <ipc/utils/eigen_ext.hpp>
-#include <ipc/utils/logger.hpp>
 
 #include <Eigen/Geometry>
 

tests/benchmark_eigen.cpp tests/src/tests/benchmark_eigen.cpptests/benchmark_eigen.cpp renamed to tests/src/tests/benchmark_eigen.cpp

@@ -0,0 +1,21 @@
+set(SOURCES
+  # Tests
+  test_aabb.cpp
+  test_broad_phase.cpp
+  test_spatial_hash.cpp
+  test_voxel_size_heuristic.cpp
+
+  # Benchmarks
+  benchmark_broad_phase.cpp
+
+  # Utilities
+  brute_force_comparison.cpp
+  brute_force_comparison.hpp
+)
+
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${SOURCES})
+target_sources(ipc_toolkit_tests PRIVATE ${SOURCES})
+
+################################################################################
+# Subfolders
+################################################################################