Merge pull request #177 from control-toolbox/176-general-up-compat-ctdirect

add CTDirect/CTParser tests

Author: ocots

test/Project.toml

@@ -1,15 +1,21 @@
 [deps]
+ADNLPModels = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
+CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
+CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 NLPModelsIpopt = "f4238b75-b362-5c4c-b852-0801c9a21d71"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
+ADNLPModels = "0.8"
 Aqua = "0.8"
 CTBase = "0.16"
+CTDirect = "0.15"
+CTParser = "0.4"
 JLD2 = "0.5"
 JSON3 = "1"
 NLPModelsIpopt = "0.10"

test/runtests.jl

@@ -35,24 +35,25 @@ end
 
 # test with CTDirect and CTParser: must be commented if new version of CTModels, that is breaking
 
-# using CTDirect
-# using NLPModelsIpopt
-# import CTParser: CTParser, @def
-# CTParser.prefix!(:CTModels); # code generated by @def is prefixed by CTModels (not by OptimalControl - the default)
+using CTDirect
+using NLPModelsIpopt
+using ADNLPModels
+import CTParser: CTParser, @def
+CTParser.prefix!(:CTModels); # code generated by @def is prefixed by CTModels (not by OptimalControl - the default)
 
-# #
-# include("solution_example_path_constraints.jl")
+#
+include("solution_example_path_constraints.jl")
 
-# @testset verbose = true showtiming = true "CTModels tests" begin
-#     for name in (
-#         :plot,
-#         :export_import,
-#     )
-#         @testset "$(name)" begin
-#             test_name = Symbol(:test_, name)
-#             println("testing: ", string(name))
-#             include("$(test_name).jl")
-#             @eval $test_name()
-#         end
-#     end
-# end
+@testset verbose = true showtiming = true "CTModels tests" begin
+    for name in (
+        :plot,
+        :export_import,
+    )
+        @testset "$(name)" begin
+            test_name = Symbol(:test_, name)
+            println("testing: ", string(name))
+            include("$(test_name).jl")
+            @eval $test_name()
+        end
+    end
+end