Fix tests

BlueBrain · May 17, 2023 · e36f81d · e36f81d
1 parent 7549893
commit e36f81d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -56,8 +56,7 @@ jobs:
           restore-keys: |
             cov-${{github.ref}}-
             cov-
-      - name: Build and Test for Coverage
-        id: codecov
+      - name: Build for Coverage
         shell: bash
         working-directory: ${{runner.workspace}}/nmodl
         run:  |
@@ -71,13 +70,18 @@ jobs:
           ccache -s
           cmake --build .
           ccache -s
+        env:
+          CCACHE_DIR: ${{runner.workspace}}/ccache
+      - name: Test for Coverage
+        id: codecov
+        shell: bash
+        working-directory: ${{runner.workspace}}/nmodl
+        run:  |
           (cd ..;  lcov --capture  --initial --directory . --no-external --output-file build/coverage-base.info --exclude "*/ext/*")
           ctest --output-on-failure
           (cd ..; lcov --capture  --directory . --no-external --output-file build/coverage-run.info --exclude "*/ext/*")
           lcov --add-tracefile coverage-base.info --add-tracefile coverage-run.info --output-file coverage.info
           lcov --list coverage.info
-        env:
-          CCACHE_DIR: ${{runner.workspace}}/ccache
       - uses: codecov/codecov-action@v3
         with:
           files: ./build/coverage.info

diff --git a/test/unit/newton/newton.cpp b/test/unit/newton/newton.cpp
@@ -7,7 +7,7 @@
 
 #include "nmodl.hpp"
 
-#include <catch2/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <cmath>
@@ -35,7 +35,7 @@ SCENARIO("Non-linear system to solve with Newton Numerical Diff Solver", "[numer
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE_THAT(X[0], Catch::WithinRel(1.0, 0.01));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(1.0, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -56,7 +56,7 @@ SCENARIO("Non-linear system to solve with Newton Numerical Diff Solver", "[numer
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE_THAT(X[0], Catch::WithinRel(2.19943987001206, 0.01));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(2.19943987001206, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -223,7 +223,7 @@ SCENARIO("Non-linear system to solve with Newton Solver", "[analytic][solver]")
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE_THAT(X[0], Catch::WithinRel(1.0, 0.01));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(1.0, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }
@@ -247,7 +247,7 @@ SCENARIO("Non-linear system to solve with Newton Solver", "[analytic][solver]")
             CAPTURE(iter_newton);
             CAPTURE(X);
             REQUIRE(iter_newton > 0);
-            REQUIRE_THAT(X[0], Catch::WithinRel(2.19943987001206, 0.01));
+            REQUIRE_THAT(X[0], Catch::Matchers::WithinRel(2.19943987001206, 0.01));
             REQUIRE(F.norm() < max_error_norm);
         }
     }