Merge pull request #72 from control-toolbox/70-dev-update-compat

fix tests

Author: ocots

docs/src/list_of_problems.md

@@ -38,11 +38,11 @@ The table below summarizes the names and status of the each problem:
 | insurance                     | ✅        | ✅    |
 | jackson                       | ✅        | ✅    |
 | moonlander                    | ✅        | 🟠    |
-| quadrotor                     | 🟠        | 🟠🟠    |
+| quadrotor                     | 🟠        | 🟠    |
 | robbins                       | ✅        | ✅    |
 | robot                         | ✅        | ✅    |
 | rocket                        | ✅        | ✅    |
-| space_shuttle                 | ✅        | 🟠🟠    |
+| space_shuttle                 | ✅        | 🟠    |
 | steering                      | ✅        | ✅    |
 | truck_trailer                 | 🟠        | 🟠    |
 | vanderpol                     | ✅        | ✅    |
@@ -63,6 +63,5 @@ sb = "yes"
 The symbols in the table means:
 
 - ✅ locally solved
-- 🟠 locally infeasible
-- 🟠🟠 maximum of iterations
+- 🟠 locally infeasible or maximum of iterations
 - ❌ error during execution

test/runtests.jl

@@ -10,8 +10,8 @@ using Test
 #
 @testset verbose = true showtiming = true "OptimalControlProblems tests" begin
     for name in (
-        #:aqua, 
-        #:JuMP, 
+        :aqua, 
+        :JuMP, 
         :OptimalControl,
         )
         @testset "$(name)" begin

test/test_JuMP.jl

@@ -32,7 +32,7 @@ function test_JuMP()
             optimize!(model)
             # Test that the solver found an optimal solution
             if f == :truck_trailer || f == :quadrotor
-                @test termination_status(model) == MOI.LOCALLY_INFEASIBLE
+                @test (termination_status(model) == MOI.LOCALLY_INFEASIBLE) || (termination_status(model) == MOI.ITERATION_LIMIT)
             else
                 @test termination_status(model) == MOI.LOCALLY_SOLVED
             end

test/test_OptimalControl.jl

@@ -31,11 +31,10 @@ function test_OptimalControl()
             )
             # Test that the solver found an optimal solution
             if  f == :moonlander    ||
-                f == :truck_trailer
-                @test sol.status == :infeasible
-            elseif f == :quadrotor ||
+                f == :truck_trailer ||
+                f == :quadrotor     ||
                 f == :space_shuttle
-                @test sol.status == :max_iter
+                @test (sol.status == :infeasible) || (sol.status == :max_iter)
             else
                 @test sol.status == :first_order
             end