up test export

Author: ocots

test/test_export_import.jl

@@ -6,70 +6,76 @@ function remove_if_exists(filename::String)
 end
 
 function test_export_import()
-    try
-        #
-        ocp, sol = solution_example()
 
-        # JSON
-        CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
-        sol_reloaded = CTModels.import_ocp_solution(
-            ocp; filename="solution_test", format=:JSON
-        )
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    #
+    ocp, sol = solution_example()
 
-        # JLD
-        CTModels.export_ocp_solution(sol; filename="solution_test") # default is :JLD)
-        sol_reloaded = CTModels.import_ocp_solution(
-            ocp; filename="solution_test", format=:JLD
-        )
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    # JSON
+    CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
+    sol_reloaded = CTModels.import_ocp_solution(
+        ocp; filename="solution_test", format=:JSON
+    )
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
 
-        #
-        ocp, sol = solution_example(; fun=true)
+    # JLD
+    CTModels.export_ocp_solution(sol; filename="solution_test") # default is :JLD)
+    sol_reloaded = CTModels.import_ocp_solution(
+        ocp; filename="solution_test", format=:JLD
+    )
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
 
-        # JSON
-        CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
-        sol_reloaded = CTModels.import_ocp_solution(
-            ocp; filename="solution_test", format=:JSON
-        )
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    #
+    ocp, sol = solution_example(; fun=true)
 
-        # JLD
-        CTModels.export_ocp_solution(sol; filename="solution_test", format=:JLD)
-        sol_reloaded = CTModels.import_ocp_solution(
-            ocp; filename="solution_test", format=:JLD
-        )
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    # JSON
+    CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
+    sol_reloaded = CTModels.import_ocp_solution(
+        ocp; filename="solution_test", format=:JSON
+    )
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
 
-        # --------------------------------------------------------------------------------------
-        # Other problem
-        ocp = @def begin
-            t ∈ [0, 1], time
-            x ∈ R², state
-            u ∈ R, control
-            x₂(t) ≤ 1.2
-            x(0) == [-1, 0]
-            x(1) == [0, 0]
-            ẋ(t) == [x₂(t), u(t)]
-            ∫(0.5u(t)^2) → min
-        end;
+    # JLD
+    CTModels.export_ocp_solution(sol; filename="solution_test", format=:JLD)
+    sol_reloaded = CTModels.import_ocp_solution(
+        ocp; filename="solution_test", format=:JLD
+    )
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
 
-        sol = CTDirect.solve(ocp)
+    # --------------------------------------------------------------------------------------
+    # Other problem
+    ocp = @def begin
+        t ∈ [0, 1], time
+        x ∈ R², state
+        u ∈ R, control
+        x₂(t) ≤ 1.2
+        x(0) == [-1, 0]
+        x(1) == [0, 0]
+        ẋ(t) == [x₂(t), u(t)]
+        ∫(0.5u(t)^2) → min
+    end;
 
-        # JLD
-        CTModels.export_ocp_solution(sol; filename="solution_test")
-        sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test")
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    sol = CTDirect.solve(ocp)
 
-        # JSON
-        CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
-        sol_reloaded = CTModels.import_ocp_solution(
-            ocp; filename="solution_test", format=:JSON
-        )
-        @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    # JLD
+    CTModels.export_ocp_solution(sol; filename="solution_test")
+    sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test")
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
+
+    # JSON
+    CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
+    sol_reloaded = CTModels.import_ocp_solution(
+        ocp; filename="solution_test", format=:JSON
+    )
+    @test sol.objective ≈ sol_reloaded.objective atol=1e-8
+    @test CTModels.objective(sol) ≈ CTModels.objective(sol_reloaded) atol=1e-8
+
+    # Cleanup
+    remove_if_exists("solution_test.jld2")
+    remove_if_exists("solution_test.json")
 
-    finally
-        remove_if_exists("solution_test.jld2")
-        remove_if_exists("solution_test.json")
-    end
 end