From 74d7dbe996d00301635cf701559f60ba20bbd426 Mon Sep 17 00:00:00 2001
From: Nicolas Cornu <nicolas.cornu@epfl.ch>
Date: Fri, 19 May 2023 15:25:16 +0200
Subject: [PATCH] Update Catch 2 to a v3 version (#973)

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@
 # =============================================================================
 option(NMODL_ENABLE_PYTHON_BINDINGS "Enable pybind11 based python bindings" ON)
 option(NMODL_ENABLE_LEGACY_UNITS "Use original faraday, R, etc. instead of 2019 nist constants" OFF)
+option(NMODL_ENABLE_TESTS "Enable build of tests" ON)
 if(NMODL_ENABLE_LEGACY_UNITS)
   add_definitions(-DUSE_LEGACY_UNITS)
 endif()
@@ -105,13 +106,6 @@
 # =============================================================================
 set(NMODL_3RDPARTY_DIR ext)
 include(${HPC_CODING_CONVENTIONS_DIR}/cpp/cmake/3rdparty.cmake)
-cpp_cc_git_submodule(catch2 BUILD PACKAGE Catch2 REQUIRED)
-if(NMODL_3RDPARTY_USE_CATCH2)
-  # If we're using the submodule then make sure the Catch.cmake helper can be found. In newer
-  # versions of Catch2, and with hpc-coding-conventions#130, this should just work...
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ext/catch2/contrib")
-endif()
-include(Catch)
 # If we're being built as a submodule of CoreNEURON then CoreNEURON may have already found/loaded a
 # CLI11 submodule.
 if(NOT TARGET CLI11::CLI11)
@@ -212,7 +206,14 @@
                                  --track-origins=yes \
                                  --show-possibly-lost=no")
 # do not enable tests if nmodl is used as submodule
-if(NOT NMODL_AS_SUBPROJECT)
+if(NOT NMODL_AS_SUBPROJECT AND NMODL_ENABLE_TESTS)
+  cpp_cc_git_submodule(catch2 BUILD PACKAGE Catch2 REQUIRED)
+  if(NMODL_3RDPARTY_USE_CATCH2)
+    # If we're using the submodule then make sure the Catch.cmake helper can be found. In newer
+    # versions of Catch2, and with hpc-coding-conventions#130, this should just work...
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ext/catch2/extras")
+  endif()
+  include(Catch)
   include(CTest)
   add_subdirectory(test/unit)
   add_subdirectory(test/integration)
@@ -278,6 +279,7 @@
 message(STATUS "Flex                | ${FLEX_EXECUTABLE}")
 message(STATUS "Bison               | ${BISON_EXECUTABLE}")
 message(STATUS "Python              | ${PYTHON_EXECUTABLE}")
+message(STATUS "  Linked against    | ${LINK_AGAINST_PYTHON}")
 message(STATUS "--------------+--------------------------------------------------------------")
 message(STATUS " See documentation : https://github.com/BlueBrain/nmodl/")
 message(STATUS "--------------+--------------------------------------------------------------")
--- a/setup.py
+++ b/setup.py
@@ -107,6 +107,7 @@
 cmake_args = ["-DPYTHON_EXECUTABLE=" + sys.executable]
 if "bdist_wheel" in sys.argv:
     cmake_args.append("-DLINK_AGAINST_PYTHON=FALSE")
+    cmake_args.append("-DNMODL_ENABLE_TESTS=FALSE")
 
 # For CI, we want to build separate wheel
 package_name = "NMODL"
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -71,41 +71,41 @@
   codegen/main.cpp codegen/codegen_helper.cpp codegen/codegen_utils.cpp
   codegen/codegen_cpp_visitor.cpp codegen/transform.cpp codegen/codegen_compatibility_visitor.cpp)
 
-target_link_libraries(testmodtoken lexer util)
-target_link_libraries(testlexer lexer util)
+target_link_libraries(testmodtoken PRIVATE lexer util)
+target_link_libraries(testlexer PRIVATE lexer util)
 target_link_libraries(
   testparser
-  visitor
-  symtab
-  lexer
-  util
-  test_util
-  printer
-  ${NMODL_WRAPPER_LIBS})
+  PRIVATE visitor
+          symtab
+          lexer
+          util
+          test_util
+          printer
+          ${NMODL_WRAPPER_LIBS})
 target_link_libraries(
   testvisitor
-  visitor
-  symtab
-  lexer
-  util
-  test_util
-  printer
-  codegen
-  ${NMODL_WRAPPER_LIBS})
+  PRIVATE visitor
+          symtab
+          lexer
+          util
+          test_util
+          printer
+          codegen
+          ${NMODL_WRAPPER_LIBS})
 target_link_libraries(
   testcodegen
-  codegen
-  visitor
-  symtab
-  lexer
-  util
-  test_util
-  printer
-  ${NMODL_WRAPPER_LIBS})
-target_link_libraries(testprinter printer util)
-target_link_libraries(testsymtab symtab lexer util)
-target_link_libraries(testunitlexer lexer util)
-target_link_libraries(testunitparser lexer test_util config)
+  PRIVATE codegen
+          visitor
+          symtab
+          lexer
+          util
+          test_util
+          printer
+          ${NMODL_WRAPPER_LIBS})
+target_link_libraries(testprinter PRIVATE printer util)
+target_link_libraries(testsymtab PRIVATE symtab lexer util)
+target_link_libraries(testunitlexer PRIVATE lexer util)
+target_link_libraries(testunitparser PRIVATE lexer test_util config)
 
 # =============================================================================
 # Use catch_discover instead of add_test for granular test result reporting.
@@ -118,6 +118,22 @@
        "NMODL_WRAPLIB=${PROJECT_BINARY_DIR}/lib/nmodl/libpywrapper${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif()
 
+# Without main from Catch2
+target_link_libraries(testcodegen PRIVATE Catch2::Catch2)
+target_link_libraries(testvisitor PRIVATE Catch2::Catch2)
+
+# With main from Catch2
+target_link_libraries(testmodtoken PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testlexer PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testparser PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testprinter PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testsymtab PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testnewton PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testcrout PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testfast_math PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testunitlexer PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(testunitparser PRIVATE Catch2::Catch2WithMain)
+
 foreach(
   test_name
   testcodegen
@@ -133,7 +149,6 @@
   testunitlexer
   testunitparser)
 
-  target_link_libraries(${test_name} Catch2::Catch2)
   cpp_cc_configure_sanitizers(TARGET ${test_name})
   set(env ${test_env})
   list(APPEND env ${${test_name}_env})
--- a/test/unit/codegen/codegen_compatibility_visitor.cpp
+++ b/test/unit/codegen/codegen_compatibility_visitor.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "codegen/codegen_compatibility_visitor.hpp"
@@ -14,7 +15,7 @@
 #include "visitors/perf_visitor.hpp"
 #include "visitors/symtab_visitor.hpp"
 
-using Catch::Matchers::Contains;  // ContainsSubstring in newer Catch2
+using Catch::Matchers::ContainsSubstring;
 
 using namespace nmodl;
 using namespace visitor;
--- a/test/unit/codegen/codegen_cpp_visitor.cpp
+++ b/test/unit/codegen/codegen_cpp_visitor.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "codegen/codegen_acc_visitor.hpp"
@@ -21,7 +22,7 @@
 #include "visitors/sympy_solver_visitor.hpp"
 #include "visitors/symtab_visitor.hpp"
 
-using Catch::Matchers::Contains;  // ContainsSubstring in newer Catch2
+using Catch::Matchers::ContainsSubstring;
 
 using namespace nmodl;
 using namespace visitor;
@@ -148,7 +149,7 @@
             )";
             auto const expected = reindent_text(generated_code);
             auto const result = get_instance_var_setup_function(nmodl_text);
-            REQUIRE_THAT(result, Contains(expected));
+            REQUIRE_THAT(result, ContainsSubstring(expected));
         }
     }
 
@@ -197,7 +198,7 @@
 
             auto const expected = reindent_text(generated_code);
             auto const result = get_instance_var_setup_function(nmodl_text);
-            REQUIRE_THAT(result, Contains(expected));
+            REQUIRE_THAT(result, ContainsSubstring(expected));
         }
     }
 
@@ -282,7 +283,7 @@
 
             auto const expected = reindent_text(generated_code);
             auto const result = get_instance_var_setup_function(nmodl_text);
-            REQUIRE_THAT(result, Contains(expected));
+            REQUIRE_THAT(result, ContainsSubstring(expected));
         }
     }
 }
@@ -358,9 +359,10 @@
         )";
         THEN("The instance struct should contain these variables") {
             auto const generated = get_instance_structure(nmodl_text);
-            REQUIRE_THAT(generated, Contains("double* celsius{&coreneuron::celsius}"));
-            REQUIRE_THAT(generated, Contains("double* pi{&coreneuron::pi}"));
-            REQUIRE_THAT(generated, Contains("int* secondorder{&coreneuron::secondorder}"));
+            REQUIRE_THAT(generated, ContainsSubstring("double* celsius{&coreneuron::celsius}"));
+            REQUIRE_THAT(generated, ContainsSubstring("double* pi{&coreneuron::pi}"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("int* secondorder{&coreneuron::secondorder}"));
         }
     }
     GIVEN("A MOD file that implicitly uses global variables") {
@@ -375,7 +377,7 @@
         )";
         THEN("The instance struct should contain celsius for the implicit 5th argument") {
             auto const generated = get_instance_structure(nmodl_text);
-            REQUIRE_THAT(generated, Contains("celsius"));
+            REQUIRE_THAT(generated, ContainsSubstring("celsius"));
         }
     }
     GIVEN("A MOD file that does not touch celsius, secondorder or pi") {
@@ -386,9 +388,9 @@
         )";
         THEN("The instance struct should not contain those variables") {
             auto const generated = get_instance_structure(nmodl_text);
-            REQUIRE_THAT(generated, !Contains("celsius"));
-            REQUIRE_THAT(generated, !Contains("pi"));
-            REQUIRE_THAT(generated, !Contains("secondorder"));
+            REQUIRE_THAT(generated, !ContainsSubstring("celsius"));
+            REQUIRE_THAT(generated, !ContainsSubstring("pi"));
+            REQUIRE_THAT(generated, !ContainsSubstring("secondorder"));
         }
     }
 }
@@ -430,19 +432,25 @@
         )";
         THEN("Array and global variables should be correctly generated") {
             auto const generated = get_cpp_code(nmodl_text);
-            REQUIRE_THAT(generated, Contains("double t_inf[2][201]{};"));
-            REQUIRE_THAT(generated, Contains("double t_tau[201]{};"));
+            REQUIRE_THAT(generated, ContainsSubstring("double t_inf[2][201]{};"));
+            REQUIRE_THAT(generated, ContainsSubstring("double t_tau[201]{};"));
 
-            REQUIRE_THAT(generated, Contains("inst->global->t_inf[0][i] = (inst->inf+id*2)[0];"));
-            REQUIRE_THAT(generated, Contains("inst->global->t_inf[1][i] = (inst->inf+id*2)[1];"));
-            REQUIRE_THAT(generated, Contains("inst->global->t_tau[i] = inst->global->tau;"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("inst->global->t_inf[0][i] = (inst->inf+id*2)[0];"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("inst->global->t_inf[1][i] = (inst->inf+id*2)[1];"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("inst->global->t_tau[i] = inst->global->tau;"));
 
             REQUIRE_THAT(generated,
-                         Contains("(inst->inf+id*2)[0] = inst->global->t_inf[0][index];"));
+                         ContainsSubstring("(inst->inf+id*2)[0] = inst->global->t_inf[0][index];"));
 
-            REQUIRE_THAT(generated, Contains("(inst->inf+id*2)[0] = inst->global->t_inf[0][i]"));
-            REQUIRE_THAT(generated, Contains("(inst->inf+id*2)[1] = inst->global->t_inf[1][i]"));
-            REQUIRE_THAT(generated, Contains("inst->global->tau = inst->global->t_tau[i]"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("(inst->inf+id*2)[0] = inst->global->t_inf[0][i]"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("(inst->inf+id*2)[1] = inst->global->t_inf[1][i]"));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("inst->global->tau = inst->global->t_tau[i]"));
         }
     }
     GIVEN("A MOD file with two table statements") {
@@ -499,8 +507,8 @@
             // BEFORE BREAKPOINT
             {
                 REQUIRE_THAT(generated,
-                             Contains("hoc_reg_ba(mech_type, nrn_before_after_0_ba1, "
-                                      "BAType::Before + BAType::Breakpoint);"));
+                             ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_0_ba1, "
+                                               "BAType::Before + BAType::Breakpoint);"));
                 // in case of PROTECT, there should not be simd or ivdep pragma
                 std::string generated_code = R"(
 
@@ -517,13 +525,13 @@
             }
         })";
                 auto const expected = generated_code;
-                REQUIRE_THAT(generated, Contains(expected));
+                REQUIRE_THAT(generated, ContainsSubstring(expected));
             }
             // AFTER SOLVE
             {
                 REQUIRE_THAT(generated,
-                             Contains("hoc_reg_ba(mech_type, nrn_before_after_1_ba1, BAType::After "
-                                      "+ BAType::Solve);"));
+                             ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_1_ba1, "
+                                               "BAType::After + BAType::Solve);"));
                 // in case of MUTEXLOCK/MUTEXUNLOCK, there should not be simd or ivdep pragma
                 std::string generated_code = R"(
 
@@ -542,13 +550,13 @@
             }
         })";
                 auto const expected = generated_code;
-                REQUIRE_THAT(generated, Contains(expected));
+                REQUIRE_THAT(generated, ContainsSubstring(expected));
             }
             // BEFORE INITIAL
             {
                 REQUIRE_THAT(generated,
-                             Contains("hoc_reg_ba(mech_type, nrn_before_after_2_ba1, "
-                                      "BAType::Before + BAType::Initial);"));
+                             ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_2_ba1, "
+                                               "BAType::Before + BAType::Initial);"));
                 std::string generated_code = R"(
         #pragma ivdep
         #pragma omp simd
@@ -564,13 +572,13 @@
             }
         })";
                 auto const expected = generated_code;
-                REQUIRE_THAT(generated, Contains(expected));
+                REQUIRE_THAT(generated, ContainsSubstring(expected));
             }
             // AFTER INITIAL
             {
                 REQUIRE_THAT(generated,
-                             Contains("hoc_reg_ba(mech_type, nrn_before_after_3_ba1, BAType::After "
-                                      "+ BAType::Initial);"));
+                             ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_3_ba1, "
+                                               "BAType::After + BAType::Initial);"));
                 std::string generated_code = R"(
         #pragma ivdep
         #pragma omp simd
@@ -586,13 +594,13 @@
             }
         })";
                 auto const expected = generated_code;
-                REQUIRE_THAT(generated, Contains(expected));
+                REQUIRE_THAT(generated, ContainsSubstring(expected));
             }
             // BEFORE STEP
             {
                 REQUIRE_THAT(generated,
-                             Contains("hoc_reg_ba(mech_type, nrn_before_after_4_ba1, "
-                                      "BAType::Before + BAType::Step);"));
+                             ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_4_ba1, "
+                                               "BAType::Before + BAType::Step);"));
                 std::string generated_code = R"(
         #pragma ivdep
         #pragma omp simd
@@ -608,7 +616,7 @@
             }
         })";
                 auto const expected = generated_code;
-                REQUIRE_THAT(generated, Contains(expected));
+                REQUIRE_THAT(generated, ContainsSubstring(expected));
             }
         }
     }
@@ -626,17 +634,17 @@
         THEN("They should be all registered") {
             auto const generated = get_cpp_code(nmodl_text);
             REQUIRE_THAT(generated,
-                         Contains("hoc_reg_ba(mech_type, nrn_before_after_0_ba1, BAType::Before + "
-                                  "BAType::Step);"));
+                         ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_0_ba1, "
+                                           "BAType::Before + BAType::Step);"));
             REQUIRE_THAT(generated,
-                         Contains("hoc_reg_ba(mech_type, nrn_before_after_1_ba1, BAType::After + "
-                                  "BAType::Solve);"));
+                         ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_1_ba1, "
+                                           "BAType::After + BAType::Solve);"));
             REQUIRE_THAT(generated,
-                         Contains("hoc_reg_ba(mech_type, nrn_before_after_2_ba1, BAType::Before + "
-                                  "BAType::Step);"));
+                         ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_2_ba1, "
+                                           "BAType::Before + BAType::Step);"));
             REQUIRE_THAT(generated,
-                         Contains("hoc_reg_ba(mech_type, nrn_before_after_3_ba1, BAType::After + "
-                                  "BAType::Solve);"));
+                         ContainsSubstring("hoc_reg_ba(mech_type, nrn_before_after_3_ba1, "
+                                           "BAType::After + BAType::Solve);"));
         }
     }
 }
@@ -669,7 +677,8 @@
         double kB{1.38065e-23};
         double q10Fluo{1.67};
     };)";
-            REQUIRE_THAT(generated, Contains(reindent_text(stringutils::trim(expected_code))));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring(reindent_text(stringutils::trim(expected_code))));
         }
     }
 }
@@ -683,12 +692,14 @@
         )";
         THEN("Code should be generated correctly") {
             auto const generated = get_cpp_code(nmodl_text);
-            REQUIRE_THAT(generated, Contains("double ttt_glia("));
-            REQUIRE_THAT(generated, Contains("double table_ttt_glia("));
-            REQUIRE_THAT(generated, Contains("hoc_spec_table(&inst->global->_ptable_ttt, 1"));
-            REQUIRE_THAT(generated, Contains("double uuu_glia("));
-            REQUIRE_THAT(generated, Contains("double table_uuu_glia("));
-            REQUIRE_THAT(generated, Contains("hoc_func_table(inst->global->_ptable_uuu, 2"));
+            REQUIRE_THAT(generated, ContainsSubstring("double ttt_glia("));
+            REQUIRE_THAT(generated, ContainsSubstring("double table_ttt_glia("));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("hoc_spec_table(&inst->global->_ptable_ttt, 1"));
+            REQUIRE_THAT(generated, ContainsSubstring("double uuu_glia("));
+            REQUIRE_THAT(generated, ContainsSubstring("double table_uuu_glia("));
+            REQUIRE_THAT(generated,
+                         ContainsSubstring("hoc_func_table(inst->global->_ptable_uuu, 2"));
         }
     }
 }
@@ -730,7 +741,7 @@
         for (int a = 1; a <= 10; a += 2) {
             b = b + 1.0;
         })";
-            REQUIRE_THAT(generated, Contains(expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code));
         }
     }
 }
@@ -760,7 +771,7 @@
             foo_(nt);
             &tqitem;
             pnodecount+id;)";
-            REQUIRE_THAT(generated, Contains(expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code));
         }
     }
 }
@@ -798,7 +809,7 @@
             nsb->_nsb_flag[i] = flag;
         }
     })";
-            REQUIRE_THAT(generated, Contains(cpu_net_send_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(cpu_net_send_expected_code));
             auto const gpu_generated = get_cpp_code(nmodl_text, true);
             std::string gpu_net_send_expected_code =
                 R"(static inline void net_send_buffering(const NrnThread* nt, NetSendBuffer_t* nsb, int type, int vdata_index, int weight_index, int point_index, double t, double flag) {
@@ -819,7 +830,7 @@
             nsb->_nsb_flag[i] = flag;
         }
     })";
-            REQUIRE_THAT(gpu_generated, Contains(gpu_net_send_expected_code));
+            REQUIRE_THAT(gpu_generated, ContainsSubstring(gpu_net_send_expected_code));
             std::string net_receive_kernel_expected_code =
                 R"(static inline void net_receive_kernel_(double t, Point_process* pnt, _Instance* inst, NrnThread* nt, Memb_list* ml, int weight_index, double flag) {
         int tid = pnt->_tid;
@@ -842,7 +853,7 @@
             }
         }
     })";
-            REQUIRE_THAT(generated, Contains(net_receive_kernel_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(net_receive_kernel_expected_code));
             std::string net_receive_expected_code =
                 R"(static void net_receive_(Point_process* pnt, int weight_index, double flag) {
         NrnThread* nt = nrn_threads + pnt->_tid;
@@ -858,7 +869,7 @@
         nrb->_nrb_flag[id] = flag;
         nrb->_cnt++;
     })";
-            REQUIRE_THAT(generated, Contains(net_receive_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(net_receive_expected_code));
             std::string net_buf_receive_expected_code = R"(void net_buf_receive_(NrnThread* nt) {
         Memb_list* ml = get_memb_list(nt);
         if (!ml) {
@@ -899,15 +910,15 @@
         }
         nsb->_cnt = 0;
     })";
-            REQUIRE_THAT(generated, Contains(net_buf_receive_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(net_buf_receive_expected_code));
             std::string net_init_expected_code =
                 R"(static void net_init(Point_process* pnt, int weight_index, double flag) {
         // do nothing
     })";
-            REQUIRE_THAT(generated, Contains(net_init_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(net_init_expected_code));
             std::string set_pnt_receive_expected_code =
                 "set_pnt_receive(mech_type, net_receive_, net_init, num_net_receive_args());";
-            REQUIRE_THAT(generated, Contains(set_pnt_receive_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(set_pnt_receive_expected_code));
         }
     }
     GIVEN("A mod file with an INITIAL inside NET_RECEIVE") {
@@ -938,7 +949,7 @@
         a = 1.0;
         auto& nsb = ml->_net_send_buffer;
     })";
-            REQUIRE_THAT(generated, Contains(expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code));
         }
     }
 
@@ -955,7 +966,7 @@
             std::string expected_code(
                 "net_send_buffering(nt, ml->_net_send_buffer, 0, inst->tqitem[0*pnodecount+id], "
                 "weight_index, point_process, nt->_t+5.0, 1.0);");
-            REQUIRE_THAT(generated, Contains(expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code));
         }
     }
 
@@ -970,7 +981,7 @@
             std::string expected_code(
                 "net_send_buffering(nt, ml->_net_send_buffer, 0, inst->tqitem[0*pnodecount+id], 0, "
                 "point_process, nt->_t+5.0, 1.0);");
-            REQUIRE_THAT(generated, Contains(expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code));
         }
     }
 
@@ -1009,9 +1020,9 @@
 
         }
     })";
-            REQUIRE_THAT(generated, Contains(net_receive_kernel_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(net_receive_kernel_expected_code));
             std::string registration_expected_code = "add_nrn_fornetcons(mech_type, 0);";
-            REQUIRE_THAT(generated, Contains(registration_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(registration_expected_code));
         }
     }
     GIVEN("A mod file with a net_move outside NET_RECEIVE") {
@@ -1063,7 +1074,7 @@
             }
         };
     })";
-            REQUIRE_THAT(generated, Contains(newton_state_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(newton_state_expected_code));
             std::string state_expected_code =
                 R"(int state_(int id, int pnodecount, double* data, Datum* indexes, ThreadDatum* thread, NrnThread* nt, Memb_list* ml, double v) {
         auto* const inst = static_cast<_Instance*>(ml->instance);
@@ -1077,7 +1088,7 @@
         int reset = nrn_newton_thread(static_cast<NewtonSpace*>(*newtonspace1(thread)), 1, slist2, _newton_state_{}, dlist2, id, pnodecount, data, indexes, thread, nt, ml, v);
         return reset;
     })";
-            REQUIRE_THAT(generated, Contains(state_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(state_expected_code));
         }
     }
 }
@@ -1112,7 +1123,7 @@
             inst->Dn[id] = (2.0 + inst->m[id] - inf) * inst->n[id];
             inst->m[id] = inst->m[id] + nt->_dt * inst->Dm[id];
             inst->n[id] = inst->n[id] + nt->_dt * inst->Dn[id];)";
-            REQUIRE_THAT(generated, Contains(nrn_state_expected_code));
+            REQUIRE_THAT(generated, ContainsSubstring(nrn_state_expected_code));
         }
     }
 }
@@ -1154,8 +1165,8 @@
             std::string expected_code_proc = R"(#pragma omp atomic update
         inst->foo[id] = inst->foo[id] - 21.0;)";
 
-            REQUIRE_THAT(generated, Contains(expected_code_initial));
-            REQUIRE_THAT(generated, Contains(expected_code_proc));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code_initial));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_code_proc));
         }
     }
 }
--- a/test/unit/codegen/codegen_helper.cpp
+++ b/test/unit/codegen/codegen_helper.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "codegen/codegen_helper_visitor.hpp"
--- a/test/unit/codegen/codegen_utils.cpp
+++ b/test/unit/codegen/codegen_utils.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "codegen/codegen_cpp_visitor.hpp"
 #include "codegen/codegen_utils.hpp"
--- a/test/unit/codegen/main.cpp
+++ b/test/unit/codegen/main.cpp
@@ -5,9 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_RUNNER
-
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "pybind/pyembed.hpp"
 #include "utils/logger.hpp"
--- a/test/unit/codegen/transform.cpp
+++ b/test/unit/codegen/transform.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "codegen/codegen_transform_visitor.hpp"
--- a/test/unit/crout/crout.cpp
+++ b/test/unit/crout/crout.cpp
@@ -5,11 +5,9 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include "nmodl.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <chrono>
 #include <iostream>
--- a/test/unit/lexer/tokens.cpp
+++ b/test/unit/lexer/tokens.cpp
@@ -5,11 +5,9 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "lexer/modtoken.hpp"
 #include "lexer/nmodl_lexer.hpp"
--- a/test/unit/modtoken/modtoken.cpp
+++ b/test/unit/modtoken/modtoken.cpp
@@ -5,12 +5,10 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <memory.h>
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "lexer/modtoken.hpp"
 #include "lexer/nmodl_lexer.hpp"
--- a/test/unit/newton/newton.cpp
+++ b/test/unit/newton/newton.cpp
@@ -5,11 +5,10 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include "nmodl.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 #include <cmath>
 
@@ -36,7 +35,7 @@
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE(X[0] == Approx(1.0));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(1.0, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -57,7 +56,7 @@
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE(X[0] == Approx(2.19943987001206));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(2.19943987001206, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -224,7 +223,7 @@
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE(X[0] == Approx(1.0));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(1.0, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -248,7 +247,7 @@
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE(X[0] == Approx(2.19943987001206));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(2.19943987001206, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
--- a/test/unit/parser/parser.cpp
+++ b/test/unit/parser/parser.cpp
@@ -5,12 +5,11 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <string>
 #include <utility>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "lexer/modtoken.hpp"
@@ -34,8 +33,8 @@
 }
 
 
-SCENARIO("NMODL can accept \\r as return char for one line comment", "[parser]") {
-    GIVEN("A comment defined with \\r as return char") {
+SCENARIO("NMODL can accept CR as return char for one line comment", "[parser]") {
+    GIVEN("A comment defined with CR as return char") {
         WHEN("parsing") {
             THEN("success") {
                 REQUIRE(is_valid_construct(R"(: see you next line
@@ -64,7 +63,7 @@
         WHEN("DEFINE SIX 6 DEFINE NSTEP SIX") {
             THEN("parser throws an error") {
                 REQUIRE_THROWS_WITH(is_valid_construct("DEFINE SIX 6 DEFINE NSTEP SIX"),
-                                    Catch::Contains("unexpected INVALID_TOKEN"));
+                                    Catch::Matchers::ContainsSubstring("unexpected INVALID_TOKEN"));
             }
         }
     }
@@ -73,7 +72,7 @@
         WHEN("DEFINE NSTEP 6.0") {
             THEN("parser throws an exception") {
                 REQUIRE_THROWS_WITH(is_valid_construct("DEFINE NSTEP 6.0"),
-                                    Catch::Contains("unexpected REAL"));
+                                    Catch::Matchers::ContainsSubstring("unexpected REAL"));
             }
         }
     }
@@ -82,7 +81,7 @@
         WHEN("DEFINE NSTEP") {
             THEN("parser throws an exception") {
                 REQUIRE_THROWS_WITH(is_valid_construct("DEFINE NSTEP"),
-                                    Catch::Contains("expecting INTEGER"));
+                                    Catch::Matchers::ContainsSubstring("expecting INTEGER"));
             }
         }
     }
@@ -91,7 +90,7 @@
         WHEN("DEFINE NSTEP SIX") {
             THEN("parser throws an exception") {
                 REQUIRE_THROWS_WITH(is_valid_construct("DEFINE NSTEP SIX"),
-                                    Catch::Contains("expecting INTEGER"));
+                                    Catch::Matchers::ContainsSubstring("expecting INTEGER"));
             }
         }
     }
@@ -100,7 +99,7 @@
         WHEN("DEFINE 6") {
             THEN("parser throws an exception") {
                 REQUIRE_THROWS_WITH(is_valid_construct("DEFINE 6"),
-                                    Catch::Contains("expecting NAME"));
+                                    Catch::Matchers::ContainsSubstring("expecting NAME"));
             }
         }
     }
@@ -162,18 +161,20 @@
 
 SCENARIO("Check that the parser doesn't crash when passing invalid INCLUDE constructs") {
     GIVEN("An empty filename") {
-        REQUIRE_THROWS_WITH(is_valid_construct("INCLUDE \"\""), Catch::Contains("empty filename"));
+        REQUIRE_THROWS_WITH(is_valid_construct("INCLUDE \"\""),
+                            Catch::Matchers::ContainsSubstring("empty filename"));
     }
 
     GIVEN("An missing included file") {
         REQUIRE_THROWS_WITH(is_valid_construct("INCLUDE \"unknown.file\""),
-                            Catch::Contains("can not open file : \"unknown.file\""));
+                            Catch::Matchers::ContainsSubstring(
+                                "can not open file : \"unknown.file\""));
     }
 
     GIVEN("An invalid included file") {
         TempFile included("included.file", nmodl_invalid_constructs.at("title_1").input);
         REQUIRE_THROWS_WITH(is_valid_construct("INCLUDE \"included.file\""),
-                            Catch::Contains("unexpected End of file"));
+                            Catch::Matchers::ContainsSubstring("unexpected End of file"));
     }
 }
 
@@ -188,9 +189,9 @@
     GIVEN("Incomplete CURIE information statement") {
         THEN("parser throws an error") {
             REQUIRE_THROWS_WITH(is_valid_construct("NEURON { REPRESENTS }"),
-                                Catch::Contains("Lexer Error"));
+                                Catch::Matchers::ContainsSubstring("Lexer Error"));
             REQUIRE_THROWS_WITH(is_valid_construct("NEURON { REPRESENTS NCIT}"),
-                                Catch::Contains("Lexer Error"));
+                                Catch::Matchers::ContainsSubstring("Lexer Error"));
         }
     }
 }
--- a/test/unit/printer/printer.cpp
+++ b/test/unit/printer/printer.cpp
@@ -5,11 +5,10 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
+#include <sstream>
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "printer/json_printer.hpp"
 
--- a/test/unit/symtab/symbol_table.cpp
+++ b/test/unit/symtab/symbol_table.cpp
@@ -5,12 +5,11 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <memory>
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/float.hpp"
 #include "ast/program.hpp"
@@ -63,9 +62,9 @@
             NmodlType result = prop1 | prop2 | prop3;
             result |= NmodlType::write_ion_var;
             THEN("to_string returns all added properties") {
-                REQUIRE_THAT(to_string(result), Catch::Contains("local"));
-                REQUIRE_THAT(to_string(result), Catch::Contains("global"));
-                REQUIRE_THAT(to_string(result), Catch::Contains("write_ion"));
+                REQUIRE_THAT(to_string(result), Catch::Matchers::ContainsSubstring("local"));
+                REQUIRE_THAT(to_string(result), Catch::Matchers::ContainsSubstring("global"));
+                REQUIRE_THAT(to_string(result), Catch::Matchers::ContainsSubstring("write_ion"));
             }
             WHEN("checked for property") {
                 THEN("has all added properties") {
@@ -173,9 +172,10 @@
         WHEN("checked methods and member variables") {
             THEN("all members are initialized") {
                 REQUIRE(table->under_global_scope());
-                REQUIRE_THAT(table->name(), Catch::Contains("Na"));
-                REQUIRE_THAT(table->get_parent_table_name(), Catch::Contains("None"));
-                REQUIRE_THAT(table->position(), Catch::Contains("UNKNOWN"));
+                REQUIRE_THAT(table->name(), Catch::Matchers::ContainsSubstring("Na"));
+                REQUIRE_THAT(table->get_parent_table_name(),
+                             Catch::Matchers::ContainsSubstring("None"));
+                REQUIRE_THAT(table->position(), Catch::Matchers::ContainsSubstring("UNKNOWN"));
             }
         }
         WHEN("insert symbol") {
@@ -189,7 +189,8 @@
             }
             WHEN("re-inserting the same symbol") {
                 THEN("throws an exception") {
-                    REQUIRE_THROWS_WITH(table->insert(symbol), Catch::Contains("re-insert"));
+                    REQUIRE_THROWS_WITH(table->insert(symbol),
+                                        Catch::Matchers::ContainsSubstring("re-insert"));
                 }
             }
             WHEN("inserting another symbol") {
@@ -295,19 +296,21 @@
 
         WHEN("trying to exit scope without entering") {
             THEN("throws an exception") {
-                REQUIRE_THROWS_WITH(mod_symtab.leave_scope(), Catch::Contains("without entering"));
+                REQUIRE_THROWS_WITH(mod_symtab.leave_scope(),
+                                    Catch::Matchers::ContainsSubstring("without entering"));
             }
         }
         WHEN("trying to enter scope without valid node") {
             THEN("throws an exception") {
                 REQUIRE_THROWS_WITH(mod_symtab.enter_scope("scope", nullptr, true, old_symtab),
-                                    Catch::Contains("empty node"));
+                                    Catch::Matchers::ContainsSubstring("empty node"));
             }
         }
         WHEN("trying to insert without entering scope") {
             THEN("throws an exception") {
                 auto symbol = std::make_shared<Symbol>("alpha");
-                REQUIRE_THROWS_WITH(mod_symtab.insert(symbol), Catch::Contains("Can not insert"));
+                REQUIRE_THROWS_WITH(mod_symtab.insert(symbol),
+                                    Catch::Matchers::ContainsSubstring("Can not insert"));
             }
         }
         WHEN("enter scope multipel times") {
@@ -335,7 +338,8 @@
             mod_symtab.insert(symbol1);
             mod_symtab.insert(symbol2);
             THEN("throws an exception") {
-                REQUIRE_THROWS_WITH(mod_symtab.insert(symbol3), Catch::Contains("Re-declaration"));
+                REQUIRE_THROWS_WITH(mod_symtab.insert(symbol3),
+                                    Catch::Matchers::ContainsSubstring("Re-declaration"));
             }
         }
         WHEN("added same symbol in children scope") {
--- a/test/unit/units/lexer.cpp
+++ b/test/unit/units/lexer.cpp
@@ -5,11 +5,9 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "lexer/unit_lexer.hpp"
 #include "parser/unit_driver.hpp"
--- a/test/unit/units/parser.cpp
+++ b/test/unit/units/parser.cpp
@@ -5,12 +5,11 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_MAIN
-
 #include <string>
 #include <utility>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "config/config.h"
 #include "parser/diffeq_driver.hpp"
@@ -22,7 +21,7 @@
 //=============================================================================
 
 using namespace nmodl::test_utils;
-using Catch::Matchers::Contains;
+using Catch::Matchers::ContainsSubstring;
 
 // Driver is defined as global to store all the units inserted to it and to be
 // able to define complex units based on base units
@@ -154,7 +153,7 @@
             THEN("parser multiply the number by the factor") {
                 std::string parsed_unit{};
                 REQUIRE_NOTHROW(parsed_unit = parse_string("pew 1 1/milli"));
-                REQUIRE_THAT(parsed_unit, Contains("pew 0.001: 0 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_unit, ContainsSubstring("pew 0.001: 0 0 0 0 0 0 0 0 0 0"));
             }
         }
     }
@@ -192,20 +191,24 @@
                 R2      8314 mV-coul/degC
                 )";
                 std::string parsed_units = parse_string(reindent_text(units_definitions));
-                REQUIRE_THAT(parsed_units, Contains("mV 0.001: 2 1 -2 -1 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("mM 1: -3 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("mA 0.001: 0 0 -1 1 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("KTOMV 8.53e-05: 2 1 -2 -1 0 0 0 0 0 -1"));
-                REQUIRE_THAT(parsed_units, Contains("B 26: -1 0 0 -1 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("dummy1 0.025: -2 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("dummy2 0.025: -2 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("dummy3 0.025: -2 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("dummy4 -0.025: -2 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("dummy5 0.025: 0 0 0 0 0 0 0 0 0 0"));
-                REQUIRE_THAT(parsed_units, Contains("newR 8.31446: 2 1 -2 0 0 0 0 0 0 -1"));
-                REQUIRE_THAT(parsed_units, Contains("R1 8.314: 2 1 -2 0 0 0 0 0 0 -1"));
-                REQUIRE_THAT(parsed_units, Contains("R2 8.314: 2 1 -2 0 0 0 0 0 0 -1"));
-                REQUIRE_THAT(parsed_units, Contains("m kg sec coul candela dollar bit erlang K"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("mV 0.001: 2 1 -2 -1 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("mM 1: -3 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("mA 0.001: 0 0 -1 1 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units,
+                             ContainsSubstring("KTOMV 8.53e-05: 2 1 -2 -1 0 0 0 0 0 -1"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("B 26: -1 0 0 -1 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("dummy1 0.025: -2 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("dummy2 0.025: -2 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("dummy3 0.025: -2 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units,
+                             ContainsSubstring("dummy4 -0.025: -2 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("dummy5 0.025: 0 0 0 0 0 0 0 0 0 0"));
+                REQUIRE_THAT(parsed_units,
+                             ContainsSubstring("newR 8.31446: 2 1 -2 0 0 0 0 0 0 -1"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("R1 8.314: 2 1 -2 0 0 0 0 0 0 -1"));
+                REQUIRE_THAT(parsed_units, ContainsSubstring("R2 8.314: 2 1 -2 0 0 0 0 0 0 -1"));
+                REQUIRE_THAT(parsed_units,
+                             ContainsSubstring("m kg sec coul candela dollar bit erlang K"));
             }
         }
     }
--- a/test/unit/visitor/after_cvode_to_cnexp.cpp
+++ b/test/unit/visitor/after_cvode_to_cnexp.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/constant_folder.cpp
+++ b/test/unit/visitor/constant_folder.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/defuse_analyze.cpp
+++ b/test/unit/visitor/defuse_analyze.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/binary_expression.hpp"
 #include "ast/program.hpp"
--- a/test/unit/visitor/global_to_range.cpp
+++ b/test/unit/visitor/global_to_range.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/implicit_argument.cpp
+++ b/test/unit/visitor/implicit_argument.cpp
@@ -11,12 +11,13 @@
 #include "visitors/symtab_visitor.hpp"
 #include "visitors/visitor_utils.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 using namespace nmodl;
 using nmodl::test_utils::reindent_text;
 
-using Catch::Matchers::Contains;  // ContainsSubstring in newer Catch2
+using Catch::Matchers::ContainsSubstring;  // ContainsSubstring in newer Catch2
 
 //=============================================================================
 // Implicit visitor tests
@@ -46,15 +47,15 @@
         )";
         auto const modified_nmodl = generate_mod_after_implicit_argument_visitor(nmodl_text);
         THEN("at_time should have nt as its first argument") {
-            REQUIRE_THAT(modified_nmodl, Contains("at_time(nt, foo)"));
-            REQUIRE_THAT(modified_nmodl, Contains("at_time(nt, a+b)"));
-            REQUIRE_THAT(modified_nmodl, Contains("at_time(nt, flop)"));
+            REQUIRE_THAT(modified_nmodl, ContainsSubstring("at_time(nt, foo)"));
+            REQUIRE_THAT(modified_nmodl, ContainsSubstring("at_time(nt, a+b)"));
+            REQUIRE_THAT(modified_nmodl, ContainsSubstring("at_time(nt, flop)"));
         }
         THEN("nrn_ghk should have a temperature as its last argument") {
             REQUIRE_THAT(modified_nmodl,
-                         Contains("nrn_ghk(-50(mV), .001(mM), 10(mM), 2, celsius)"));
+                         ContainsSubstring("nrn_ghk(-50(mV), .001(mM), 10(mM), 2, celsius)"));
             REQUIRE_THAT(modified_nmodl,
-                         Contains("nrn_ghk(-50(mV), .001(mM), 10(mM), 2, -273.15)"));
+                         ContainsSubstring("nrn_ghk(-50(mV), .001(mM), 10(mM), 2, -273.15)"));
         }
     }
 }
--- a/test/unit/visitor/inline.cpp
+++ b/test/unit/visitor/inline.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/json.cpp
+++ b/test/unit/visitor/json.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/kinetic_block.cpp
+++ b/test/unit/visitor/kinetic_block.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/local_to_assigned.cpp
+++ b/test/unit/visitor/local_to_assigned.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/localize.cpp
+++ b/test/unit/visitor/localize.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/lookup.cpp
+++ b/test/unit/visitor/lookup.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/loop_unroll.cpp
+++ b/test/unit/visitor/loop_unroll.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/main.cpp
+++ b/test/unit/visitor/main.cpp
@@ -5,9 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#define CATCH_CONFIG_RUNNER
-
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "pybind/pyembed.hpp"
 #include "utils/logger.hpp"
--- a/test/unit/visitor/misc.cpp
+++ b/test/unit/visitor/misc.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/neuron_solve.cpp
+++ b/test/unit/visitor/neuron_solve.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/nmodl.cpp
+++ b/test/unit/visitor/nmodl.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/node_index.cpp
+++ b/test/unit/visitor/node_index.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/perf.cpp
+++ b/test/unit/visitor/perf.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
@@ -152,7 +153,8 @@
         WHEN("Perf visitor pass runs before symtab visitor") {
             PerfVisitor v;
             THEN("exception is thrown") {
-                REQUIRE_THROWS_WITH(v.visit_program(*ast), Catch::Contains("table not setup"));
+                REQUIRE_THROWS_WITH(v.visit_program(*ast),
+                                    Catch::Matchers::ContainsSubstring("table not setup"));
             }
         }
     }
--- a/test/unit/visitor/rename.cpp
+++ b/test/unit/visitor/rename.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/semantic_analysis.cpp
+++ b/test/unit/visitor/semantic_analysis.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/solve_block.cpp
+++ b/test/unit/visitor/solve_block.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/steadystate.cpp
+++ b/test/unit/visitor/steadystate.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/sympy_conductance.cpp
+++ b/test/unit/visitor/sympy_conductance.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/sympy_solver.cpp
+++ b/test/unit/visitor/sympy_solver.cpp
@@ -5,7 +5,8 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "ast/program.hpp"
 #include "codegen/codegen_cpp_visitor.hpp"
@@ -29,7 +30,7 @@
 using namespace test;
 using namespace test_utils;
 
-using Catch::Matchers::Contains;  // ContainsSubstring in newer Catch2
+using Catch::Matchers::ContainsSubstring;  // ContainsSubstring in newer Catch2
 
 using nmodl::test_utils::reindent_text;
 
@@ -818,8 +819,9 @@
             "equations") {
             REQUIRE_THROWS_WITH(
                 run_sympy_solver_visitor(nmodl_text, false, false, AstNodeType::DERIVATIVE_BLOCK),
-                Catch::Matchers::Contains("State variable assignment(s) interleaved in system of "
-                                          "equations/differential equations") &&
+                Catch::Matchers::ContainsSubstring(
+                    "State variable assignment(s) interleaved in system of "
+                    "equations/differential equations") &&
                     Catch::Matchers::StartsWith("SympyReplaceSolutionsVisitor"));
         }
     }
@@ -2412,12 +2414,12 @@
             std::string expected_functor_cacum_2_usage =
                 R"(functor_cacum_2 newton_functor(nt, inst, id, pnodecount, v, indexes, data, thread);)";
 
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_0_definition));
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_1_definition));
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_2_definition));
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_0_usage));
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_1_usage));
-            REQUIRE_THAT(generated, Contains(expected_functor_cacum_2_usage));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_0_definition));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_1_definition));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_2_definition));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_0_usage));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_1_usage));
+            REQUIRE_THAT(generated, ContainsSubstring(expected_functor_cacum_2_usage));
         }
     }
 }
--- a/test/unit/visitor/units.cpp
+++ b/test/unit/visitor/units.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <fmt/format.h>
 
 #include "ast/double.hpp"
--- a/test/unit/visitor/var_usage.cpp
+++ b/test/unit/visitor/var_usage.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/visitor/verbatim.cpp
+++ b/test/unit/visitor/verbatim.cpp
@@ -5,7 +5,7 @@
  * Lesser General Public License. See top-level LICENSE file for details.
  *************************************************************************/
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "ast/program.hpp"
 #include "parser/nmodl_driver.hpp"
--- a/test/unit/fast_math/fast_math.cpp
+++ b/test/unit/fast_math/fast_math.cpp
@@ -9,7 +9,7 @@
 
 #include "codegen/fast_math.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace nmodl {
 namespace fast_math {