Merge pull request #133 from nikalra/master

Updated tests to be C++ compliant
osqp · Apr 30, 2019 · c60bb3c · c60bb3c
2 parents 7b33ad2 + f9ced43
commit c60bb3c
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 54 deletions.
diff --git a/tests/basic_qp/test_basic_qp.h b/tests/basic_qp/test_basic_qp.h
@@ -6,7 +6,7 @@
 #include "basic_qp/data.h"
 
 
-static char* test_basic_qp_solve()
+static const char* test_basic_qp_solve()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -187,7 +187,7 @@ static char* test_basic_qp_solve_pardiso()
 }
 #endif
 
-static char* test_basic_qp_update()
+static const char* test_basic_qp_update()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -296,7 +296,7 @@ static char* test_basic_qp_update()
   return 0;
 }
 
-static char* test_basic_qp_check_termination()
+static const char* test_basic_qp_check_termination()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -369,7 +369,7 @@ static char* test_basic_qp_check_termination()
   return 0;
 }
 
-static char* test_basic_qp_update_rho()
+static const char* test_basic_qp_update_rho()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -497,7 +497,7 @@ static char* test_basic_qp_update_rho()
   return 0;
 }
 
-static char* test_basic_qp_time_limit()
+static const char* test_basic_qp_time_limit()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -558,7 +558,7 @@ static char* test_basic_qp_time_limit()
   return 0;
 }
 
-static char* test_basic_qp()
+static const char* test_basic_qp()
 {
   mu_run_test(test_basic_qp_solve);
 #ifdef ENABLE_MKL_PARDISO

diff --git a/tests/basic_qp2/test_basic_qp2.h b/tests/basic_qp2/test_basic_qp2.h
@@ -5,7 +5,7 @@
 #include "basic_qp2/data.h"
 
 
-static char* test_basic_qp2_solve()
+static const char* test_basic_qp2_solve()
 {
   /* local variables */
   c_int exitflag = 0; // No errors
@@ -145,7 +145,7 @@ static char* test_basic_qp2_solve_pardiso()
 }
 #endif
 
-static char* test_basic_qp2_update()
+static const char* test_basic_qp2_update()
 {
   /* local variables */
   c_int exitflag = 0; // No errors
@@ -221,7 +221,7 @@ static char* test_basic_qp2_update()
   return 0;
 }
 
-static char* test_basic_qp2()
+static const char* test_basic_qp2()
 {
   mu_run_test(test_basic_qp2_solve);
 #ifdef ENABLE_MKL_PARDISO

diff --git a/tests/lin_alg/test_lin_alg.h b/tests/lin_alg/test_lin_alg.h
@@ -4,7 +4,7 @@
 
 #include "lin_alg/data.h"
 
-static char* test_constr_sparse_mat() {
+static const char* test_constr_sparse_mat() {
   c_float *Adns; // Conversion to dense matrix
 
   lin_alg_sols_data *data = generate_problem_lin_alg_sols_data();
@@ -25,7 +25,7 @@ static char* test_constr_sparse_mat() {
   return 0;
 }
 
-static char* test_vec_operations() {
+static const char* test_vec_operations() {
   c_float  norm_inf, vecprod; // normInf;
   c_float *ew_reciprocal;
   c_float *add_scaled;
@@ -112,7 +112,7 @@ static char* test_vec_operations() {
   return 0;
 }
 
-static char* test_mat_operations() {
+static const char* test_mat_operations() {
   csc *Ad, *dA; // Matrices used for tests
   // csc *A_ewsq, *A_ewabs;     // Matrices used for tests
   c_int exitflag = 0;
@@ -170,7 +170,7 @@ static char* test_mat_operations() {
   return 0;
 }
 
-static char* test_mat_vec_multiplication() {
+static const char* test_mat_vec_multiplication() {
   c_float *Ax, *ATy, *Px, *Ax_cum, *ATy_cum, *Px_cum;
 
   lin_alg_sols_data *data = generate_problem_lin_alg_sols_data();
@@ -255,7 +255,7 @@ static char* test_mat_vec_multiplication() {
   return 0;
 }
 
-static char* test_extract_upper_triangular() {
+static const char* test_extract_upper_triangular() {
   c_float *inf_norm_cols_test;
   lin_alg_sols_data *data = generate_problem_lin_alg_sols_data();
 
@@ -285,7 +285,7 @@ static char* test_extract_upper_triangular() {
   return 0;
 }
 
-static char* test_quad_form_upper_triang() {
+static const char* test_quad_form_upper_triang() {
   c_float quad_form_t;
 
   lin_alg_sols_data *data = generate_problem_lin_alg_sols_data();
@@ -303,7 +303,7 @@ static char* test_quad_form_upper_triang() {
   return 0;
 }
 
-static char* test_lin_alg()
+static const char* test_lin_alg()
 {
   mu_run_test(test_constr_sparse_mat);
   mu_run_test(test_vec_operations);

diff --git a/tests/minunit.h b/tests/minunit.h
@@ -6,7 +6,7 @@
 #define mu_assert(message, test) \
   do { if (!(test)) return message; } while (0)
 #define mu_run_test(test)                   \
-  do { char *message = test(); tests_run++; \
+  do { const char *message = test(); tests_run++; \
        if (message) return message; } while (0)
 extern int tests_run;
 

diff --git a/tests/non_cvx/test_non_cvx.h b/tests/non_cvx/test_non_cvx.h
@@ -5,7 +5,7 @@
 #include "non_cvx/data.h"
 
 
-static char* test_non_cvx_solve()
+static const char* test_non_cvx_solve()
 {
   /* local variables */
   c_int exitflag = 0; // No errors
@@ -53,7 +53,7 @@ static char* test_non_cvx_solve()
 
   // Compare objective values
   mu_assert("Non Convex test solve: Error in objective value!",
-	    work->info->obj_val == OSQP_NAN);
+            work->info->obj_val == OSQP_NAN);
 
   // Clean workspace
   osqp_cleanup(work);
@@ -66,7 +66,7 @@ static char* test_non_cvx_solve()
   return 0;
 }
 
-static char* test_non_cvx()
+static const char* test_non_cvx()
 {
   mu_run_test(test_non_cvx_solve);
 

diff --git a/tests/osqp_tester.c b/tests/osqp_tester.c
@@ -24,7 +24,7 @@
 int tests_run = 0;
 
 
-static char* all_tests() {
+static const char* all_tests() {
   mu_run_test(test_lin_alg);
   mu_run_test(test_solve_linsys);
   mu_run_test(test_basic_qp);
@@ -38,7 +38,7 @@ static char* all_tests() {
 }
 
 int main(void) {
-  char *result = all_tests();
+  const char *result = all_tests();
 
   if (result != 0) {
     printf("%s\n", result);

diff --git a/tests/primal_dual_infeasibility/test_primal_dual_infeasibility.h b/tests/primal_dual_infeasibility/test_primal_dual_infeasibility.h
@@ -6,7 +6,7 @@
 #include "primal_dual_infeasibility/data.h"
 
 
-static char* test_optimal()
+static const char* test_optimal()
 {
   // Structures
   OSQPWorkspace *work;    // Workspace
@@ -18,7 +18,7 @@ static char* test_optimal()
   data = generate_problem_primal_dual_infeasibility_sols_data();
 
   // Populate problem data
-  problem    = c_malloc(sizeof(OSQPData));
+  problem    = (OSQPData*) c_malloc(sizeof(OSQPData));
   problem->P = data->P;
   problem->q = data->q;
   problem->A = data->A12;
@@ -74,7 +74,7 @@ static char* test_optimal()
   return 0;
 }
 
-static char* test_prim_infeas()
+static const char* test_prim_infeas()
 {
   // Structures
   OSQPWorkspace *work;    // Workspace
@@ -86,7 +86,7 @@ static char* test_prim_infeas()
   data = generate_problem_primal_dual_infeasibility_sols_data();
 
   // Populate problem data
-  problem    = c_malloc(sizeof(OSQPData));
+  problem    = (OSQPData*) c_malloc(sizeof(OSQPData));
   problem->P = data->P;
   problem->q = data->q;
   problem->A = data->A12;
@@ -126,7 +126,7 @@ static char* test_prim_infeas()
   return 0;
 }
 
-static char* test_dual_infeas()
+static const char* test_dual_infeas()
 {
   // Structures
   OSQPWorkspace *work;    // Workspace
@@ -138,7 +138,7 @@ static char* test_dual_infeas()
   data = generate_problem_primal_dual_infeasibility_sols_data();
 
   // Populate problem data
-  problem    = c_malloc(sizeof(OSQPData));
+  problem    = (OSQPData*) c_malloc(sizeof(OSQPData));
   problem->P = data->P;
   problem->q = data->q;
   problem->A = data->A34;
@@ -178,7 +178,7 @@ static char* test_dual_infeas()
   return 0;
 }
 
-static char* test_primal_dual_infeas()
+static const char* test_primal_dual_infeas()
 {
   // Structures
   OSQPWorkspace *work;    // Workspace
@@ -190,7 +190,7 @@ static char* test_primal_dual_infeas()
   data = generate_problem_primal_dual_infeasibility_sols_data();
 
   // Populate problem data
-  problem    = c_malloc(sizeof(OSQPData));
+  problem    = (OSQPData*) c_malloc(sizeof(OSQPData));
   problem->P = data->P;
   problem->q = data->q;
   problem->A = data->A34;
@@ -231,7 +231,7 @@ static char* test_primal_dual_infeas()
   return 0;
 }
 
-static char* test_primal_dual_infeasibility()
+static const char* test_primal_dual_infeasibility()
 {
   mu_run_test(test_optimal);
   mu_run_test(test_prim_infeas);

diff --git a/tests/primal_infeasibility/test_primal_infeasibility.h b/tests/primal_infeasibility/test_primal_infeasibility.h
@@ -6,7 +6,7 @@
 #include "primal_infeasibility/data.h"
 
 
-static char* test_primal_infeasible_qp_solve()
+static const char* test_primal_infeasible_qp_solve()
 {
   // Problem settings
   OSQPSettings *settings = (OSQPSettings *)c_malloc(sizeof(OSQPSettings));
@@ -58,7 +58,7 @@ static char* test_primal_infeasible_qp_solve()
   return 0;
 }
 
-static char* test_primal_infeasibility()
+static const char* test_primal_infeasibility()
 {
   mu_run_test(test_primal_infeasible_qp_solve);
 

diff --git a/tests/solve_linsys/test_solve_linsys.h b/tests/solve_linsys/test_solve_linsys.h
@@ -9,7 +9,7 @@
 #include "solve_linsys/data.h"
 
 
-static char* test_solveKKT() {
+static const char* test_solveKKT() {
   c_int m, exitflag = 0;
   c_float *rho_vec;
   LinSysSolver *p;  // Private structure to form KKT factorization
@@ -22,7 +22,7 @@ static char* test_solveKKT() {
 
   // Set rho_vec
   m       = data->test_solve_KKT_A->m;
-  rho_vec = c_calloc(m, sizeof(c_float));
+  rho_vec = (c_float*) c_calloc(m, sizeof(c_float));
   vec_add_scalar(rho_vec, settings->rho, m);
 
   // Form and factorize KKT matrix
@@ -112,7 +112,7 @@ static char* test_solveKKT_pardiso() {
 }
 #endif
 
-static char* test_solve_linsys()
+static const char* test_solve_linsys()
 {
   mu_run_test(test_solveKKT);
 #ifdef ENABLE_MKL_PARDISO

diff --git a/tests/unconstrained/test_unconstrained.h b/tests/unconstrained/test_unconstrained.h
@@ -5,7 +5,7 @@
 #include "unconstrained/data.h"
 
 
-static char* test_unconstrained_solve()
+static const char* test_unconstrained_solve()
 {
   /* local variables */
   c_int exitflag = 0; // No errors
@@ -62,7 +62,7 @@ static char* test_unconstrained_solve()
   return 0;
 }
 
-static char* test_unconstrained()
+static const char* test_unconstrained()
 {
   mu_run_test(test_unconstrained_solve);