cvanaret · cvanaret · Nov 14, 2024 · Nov 14, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,18 +63,18 @@ file(GLOB UNO_SOURCE_FILES
 
 # unit test source files
 file(GLOB TESTS_UNO_SOURCE_FILES
-   unotest/unotest.cpp
-   unotest/CollectionAdapterTests.cpp
-   unotest/ConcatenationTests.cpp
-   unotest/COOSparseStorageTests.cpp
-   unotest/CSCSparseStorageTests.cpp
-   unotest/MatrixVectorProductTests.cpp
-   unotest/RangeTests.cpp
-   unotest/ScalarMultipleTests.cpp
-   unotest/SparseVectorTests.cpp
-   unotest/SumTests.cpp
-   unotest/VectorTests.cpp
-   unotest/VectorViewTests.cpp
+   unotest/unit_tests/unotest.cpp
+   unotest/unit_tests/CollectionAdapterTests.cpp
+   unotest/unit_tests/ConcatenationTests.cpp
+   unotest/unit_tests/COOSparseStorageTests.cpp
+   unotest/unit_tests/CSCSparseStorageTests.cpp
+   unotest/unit_tests/MatrixVectorProductTests.cpp
+   unotest/unit_tests/RangeTests.cpp
+   unotest/unit_tests/ScalarMultipleTests.cpp
+   unotest/unit_tests/SparseVectorTests.cpp
+   unotest/unit_tests/SumTests.cpp
+   unotest/unit_tests/VectorTests.cpp
+   unotest/unit_tests/VectorViewTests.cpp
 )
 
 #########################
@@ -110,7 +110,7 @@ else()
 endif()
 if(HSL OR MA57)
    list(APPEND UNO_SOURCE_FILES uno/solvers/MA57/MA57Solver.cpp)
-   list(APPEND TESTS_UNO_SOURCE_FILES unotest/MA57SolverTests.cpp)
+   list(APPEND TESTS_UNO_SOURCE_FILES unotest/functional_tests/MA57SolverTests.cpp)
 
    find_package(BLAS REQUIRED)
    list(APPEND LIBRARIES ${BLAS_LIBRARIES})
@@ -139,7 +139,7 @@ if(NOT HIGHS)
    message(WARNING "Optional library HiGHS was not found.")
 else()
    list(APPEND UNO_SOURCE_FILES uno/solvers/HiGHS/HiGHSSolver.cpp)
-   list(APPEND TESTS_UNO_SOURCE_FILES unotest/HiGHSSolverTests.cpp)
+   list(APPEND TESTS_UNO_SOURCE_FILES unotest/functional_tests/HiGHSSolverTests.cpp)
    link_to_uno(highs ${HIGHS})
    list(APPEND LIBRARIES highs::highs)
 endif()
@@ -150,7 +150,7 @@ if(NOT MUMPS_LIBRARY)
    message(WARNING "Optional library MUMPS was not found.")
 else()
    list(APPEND UNO_SOURCE_FILES uno/solvers/MUMPS/MUMPSSolver.cpp)
-   list(APPEND TESTS_UNO_SOURCE_FILES unotest/MUMPSSolverTests.cpp)
+   list(APPEND TESTS_UNO_SOURCE_FILES unotest/functional_tests/MUMPSSolverTests.cpp)
    list(APPEND LIBRARIES ${MUMPS_LIBRARY} ${MUMPS_COMMON_LIBRARY} ${MUMPS_PORD_LIBRARY})
 
    list(APPEND DIRECTORIES ${MUMPS_INCLUDE_DIR})

diff --git a/unotest/HiGHSSolverTests.cpp → ...est/functional_tests/HiGHSSolverTests.cpp b/unotest/HiGHSSolverTests.cpp → ...est/functional_tests/HiGHSSolverTests.cpp
@@ -52,6 +52,8 @@ TEST(HiGHSSolver, DocumentationLP) {
    highs_solver.solve_LP(number_variables, number_constraints, variables_lower_bounds, variables_upper_bounds, constraints_lower_bounds,
       constraints_upper_bounds, linear_objective, constraint_jacobian, initial_point, direction, warmstart_information);
 
+   ASSERT_EQ(direction.status, SubproblemStatus::OPTIMAL);
+
    const double tolerance = 1e-8;
    // check primals
    const std::vector<double> primals_reference{0.5, 2.25};
@@ -69,4 +71,4 @@ TEST(HiGHSSolver, DocumentationLP) {
       EXPECT_NEAR(direction.multipliers.lower_bounds[index], lower_bound_duals_reference[index], tolerance);
       EXPECT_NEAR(direction.multipliers.upper_bounds[index], upper_bound_duals_reference[index], tolerance);
    }
-}
+}
diff --git a/unotest/MA57SolverTests.cpp → unotest/functional_tests/MA57SolverTests.cpp b/unotest/MA57SolverTests.cpp → unotest/functional_tests/MA57SolverTests.cpp
diff --git a/unotest/MUMPSSolverTests.cpp → ...est/functional_tests/MUMPSSolverTests.cpp b/unotest/MUMPSSolverTests.cpp → ...est/functional_tests/MUMPSSolverTests.cpp
diff --git a/unotest/CollectionAdapterTests.cpp → ...est/unit_tests/CollectionAdapterTests.cpp b/unotest/CollectionAdapterTests.cpp → ...est/unit_tests/CollectionAdapterTests.cpp
diff --git a/unotest/ConcatenationTests.cpp → unotest/unit_tests/ConcatenationTests.cpp b/unotest/ConcatenationTests.cpp → unotest/unit_tests/ConcatenationTests.cpp
diff --git a/unotest/MatrixVectorProductTests.cpp → ...t/unit_tests/MatrixVectorProductTests.cpp b/unotest/MatrixVectorProductTests.cpp → ...t/unit_tests/MatrixVectorProductTests.cpp
diff --git a/unotest/RangeTests.cpp → unotest/unit_tests/RangeTests.cpp b/unotest/RangeTests.cpp → unotest/unit_tests/RangeTests.cpp
diff --git a/unotest/ScalarMultipleTests.cpp → unotest/unit_tests/ScalarMultipleTests.cpp b/unotest/ScalarMultipleTests.cpp → unotest/unit_tests/ScalarMultipleTests.cpp
diff --git a/unotest/SparseVectorTests.cpp → unotest/unit_tests/SparseVectorTests.cpp b/unotest/SparseVectorTests.cpp → unotest/unit_tests/SparseVectorTests.cpp
diff --git a/unotest/SumTests.cpp → unotest/unit_tests/SumTests.cpp b/unotest/SumTests.cpp → unotest/unit_tests/SumTests.cpp
diff --git a/unotest/VectorTests.cpp → unotest/unit_tests/VectorTests.cpp b/unotest/VectorTests.cpp → unotest/unit_tests/VectorTests.cpp
diff --git a/unotest/VectorViewTests.cpp → unotest/unit_tests/VectorViewTests.cpp b/unotest/VectorViewTests.cpp → unotest/unit_tests/VectorViewTests.cpp
diff --git a/unotest/unotest.cpp → unotest/unit_tests/unotest.cpp b/unotest/unotest.cpp → unotest/unit_tests/unotest.cpp