From a1b4189b4ca9e0f1d6bc2d6e8982c8896421453c Mon Sep 17 00:00:00 2001
From: Paul Baksic <paul.baksic@outlook.fr>
Date: Fri, 31 Jan 2025 14:59:23 +0100
Subject: [PATCH] Squashed commit of the following:

commit f42f8350804b5a4dff660334a86b68e619f041df
Merge: 8b4514f 32ab0f4
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Wed Jan 22 10:06:13 2025 +0100

    Merge pull request #150 from alxbilger/test

    Fix tests compilation with respect to SOFA

commit 8b4514fd779a2ab5f480d2e8c06aa2344071fc95
Merge: b482378 09d07e3
Author: Olivier Roussel <olivier.roussel@inria.fr>
Date:   Mon Jan 20 17:08:57 2025 +0100

    Merge pull request #151 from olivier-roussel/remove-python2

    Remove deprecated python2.7 support

commit 09d07e3936eafbc2d457bcb86258b06d686d4004
Author: Olivier Roussel <olivier.roussel@inria.fr>
Date:   Mon Jan 20 15:34:00 2025 +0100

    Remove deprecated python2.7 support

commit 32ab0f4e7bddcdaa6832a3bd5491491686579315
Author: Alex Bilger <alexbilger0@gmail.com>
Date:   Thu Jan 16 09:34:18 2025 +0100

    Fix tests compilation with respect to SOFA
---
 CMakeLists.txt                                        | 2 --
 ModelOrderReduction_test/ModelOrderReduction_test.cpp | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8e08496..0083f8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,8 +97,6 @@ if (CollisionOBBCapsule_FOUND)
 endif()
 
 # Config files and install rules for pythons scripts
-sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "python")
-
 find_file(SofaPython3Tools NAMES "SofaPython3/lib/cmake/SofaPython3/SofaPython3Tools.cmake")
 if(SofaPython3Tools)
     message("-- Found SofaPython3Tools.")
diff --git a/ModelOrderReduction_test/ModelOrderReduction_test.cpp b/ModelOrderReduction_test/ModelOrderReduction_test.cpp
index c6a4a2cd..8fa1d03a 100644
--- a/ModelOrderReduction_test/ModelOrderReduction_test.cpp
+++ b/ModelOrderReduction_test/ModelOrderReduction_test.cpp
@@ -24,7 +24,7 @@ namespace sofa {
         simulation::Simulation* simulation;
 
         /// Create the context for the scene
-        void SetUp()
+        void doSetUp() override
         {
             root = simulation::getSimulation()->createNewGraph("root");
         }
@@ -37,7 +37,7 @@ namespace sofa {
         }
 
         /// Unload the scene
-        void TearDown()
+        void doTearDown() override
         {
             if (root != nullptr)
             {