Update Solvers tests

blegat · blegat · commit b2f865b0ef3a · 2023-03-23T12:14:20.000+01:00
diff --git a/test/Solvers/Manifest.toml b/test/Solvers/Manifest.toml
diff --git a/test/Solvers/Project.toml b/test/Solvers/Project.toml
@@ -2,6 +2,7 @@
 CDCS = "4fe2ecd4-b952-581a-b4b6-a532675a646e"
 COSMO = "1e616198-aa4e-51ec-90a2-23f7fbd31d8d"
 CSDP = "0a46da34-8e4b-519e-b418-48813639ff34"
+DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
 ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199"
 GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
@@ -14,7 +15,6 @@ PolyJuMP = "ddf597a6-d67e-5340-b84c-e37d84115374"
 ProxSDP = "65e78d25-6039-50a4-9445-38022e3d2eb3"
 SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13"
 SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc"
-SDPAFamily = "bfe18334-aefd-11e9-1109-4bf2b15a5b91"
 SDPNAL = "f7a9608b-7678-5329-8a05-97541ebc462c"
 SDPT3 = "e33b2407-87ff-50a0-8b27-f0fe7855237d"
 SeDuMi = "a895aaad-f784-5544-9392-bb281339c1b2"
diff --git a/test/Solvers/cosmo_tests.jl b/test/Solvers/cosmo_tests.jl
@@ -1,7 +1,7 @@
 include("solver_preamble.jl")
 using COSMO
 # sosdemo9: 33000 < max_iter < 34000
-factory = with_optimizer(COSMO.Optimizer, verbose = false, max_iter = 34000)
+factory = optimizer_with_attributes(COSMO.Optimizer, "verbose" => false, "max_iter" => 34000)
 config = MOI.Test.Config(atol = 1e-3, rtol = 1e-3)
 @testset "Linear" begin
     Tests.linear_test(factory, config, [
diff --git a/test/Solvers/ecos_tests.jl b/test/Solvers/ecos_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import ECOS
-factory = with_optimizer(ECOS.Optimizer, verbose = false)
+factory = optimizer_with_attributes(ECOS.Optimizer, "verbose" => false)
 config = MOI.Test.Config(atol = 1e-5, rtol = 1e-5)
 @testset "Linear" begin
     Tests.linear_test(factory, config)
diff --git a/test/Solvers/mosek_tests.jl b/test/Solvers/mosek_tests.jl
@@ -3,7 +3,7 @@ using MosekTools
 # It cannot be used in Direct mode yet as it gets:
 # MathOptInterface.DeleteNotAllowed{MathOptInterface.ConstraintIndex{MathOptInterface.VectorOfVariables,MathOptInterface.RotatedSecondOrderCone}}
 # for `sdsos_bivariate_quadratic`
-factory = with_optimizer(Mosek.Optimizer, QUIET = true)
+factory = optimizer_with_attributes(Mosek.Optimizer, "QUIET" => true)
 config = MOI.Test.Config(atol = 1e-5, rtol = 1e-5)
 @testset "Linear" begin
     Tests.linear_test(factory, config)
diff --git a/test/Solvers/proxsdp_tests.jl b/test/Solvers/proxsdp_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import ProxSDP
-factory = with_optimizer(ProxSDP.Optimizer, log_verbose = false)
+factory = optimizer_with_attributes(ProxSDP.Optimizer, "log_verbose" => false)
 config = MOI.Test.Config(atol = 2e-2, rtol = 2e-2)
 @testset "Linear" begin
     Tests.linear_test(
diff --git a/test/Solvers/scs_tests.jl b/test/Solvers/scs_tests.jl
@@ -1,18 +1,13 @@
 include("solver_preamble.jl")
 import SCS
-factory = with_optimizer(SCS.Optimizer, verbose = 0)
+factory = optimizer_with_attributes(SCS.Optimizer, "verbose" => 0)
 config = MOI.Test.Config(atol = 5e-4, rtol = 5e-4)
 @testset "Linear" begin
     Tests.linear_test(factory, config)
 end
 @testset "SOC" begin
-    Tests.soc_test(factory, config, ["sdsos_options_pricing"])
+    Tests.soc_test(factory, config)
 end
 @testset "SDP" begin
-    Tests.sd_test(factory, config, [
-        "sos_options_pricing",
-        # Expression: termination_status(model) == MOI.INFEASIBLE
-        # Evaluated: MathOptInterface.OPTIMAL == MathOptInterface.INFEASIBLE
-        "sos_horn",
-    ])
+    Tests.sd_test(factory, config)
 end
diff --git a/test/Solvers/sdpa_tests.jl b/test/Solvers/sdpa_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import SDPA
-factory = with_optimizer(SDPA.Optimizer)
+factory = optimizer_with_attributes(SDPA.Optimizer)
 config = MOI.Test.Config(atol = 1e-5, rtol = 1e-5)
 @testset "Linear" begin
     Tests.linear_test(
diff --git a/test/Solvers/sdpafamily_tests.jl b/test/Solvers/sdpafamily_tests.jl
@@ -1,9 +1,9 @@
 include("solver_preamble.jl")
 import SDPAFamily
-factory = with_optimizer(
+factory = optimizer_with_attributes(
     SDPAFamily.Optimizer{Float64},
-    params = (gammaStar = 0.8, maxIteration = 200),
-    presolve = true,
+    "params" => (gammaStar = 0.8, maxIteration = 200),
+    "presolve" => true,
 )
 config = MOI.Test.Config(atol = 1e-5, rtol = 1e-5)
 @testset "Linear" begin
diff --git a/test/Solvers/sdpnal_tests.jl b/test/Solvers/sdpnal_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import SDPNAL
-factory = with_optimizer(SDPNAL.Optimizer, printlevel = 0, tol = 1e-4)
+factory = optimizer_with_attributes(SDPNAL.Optimizer, "printlevel" => 0, "tol" => 1e-4)
 config = MOI.Test.Config(atol = 5e-3, rtol = 5e-3)
 @testset "Linear" begin
     Tests.linear_test(factory, config, [
diff --git a/test/Solvers/sdpt3_tests.jl b/test/Solvers/sdpt3_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import SDPT3
-factory = with_optimizer(SDPT3.Optimizer, printlevel = 0)
+factory = optimizer_with_attributes(SDPT3.Optimizer, printlevel = 0)
 config = MOI.Test.Config(atol = 1e-4, rtol = 1e-4)
 @testset "Linear" begin
     Tests.linear_test(factory, config)
diff --git a/test/Solvers/sedumi_tests.jl b/test/Solvers/sedumi_tests.jl
@@ -1,6 +1,6 @@
 include("solver_preamble.jl")
 import SeDuMi
-factory = with_optimizer(SeDuMi.Optimizer, fid = 0)
+factory = optimizer_with_attributes(SeDuMi.Optimizer, "fid" => 0)
 config = MOI.Test.Config(atol = 1e-4, rtol = 1e-4)
 @testset "Linear" begin
     Tests.linear_test(factory, config)
diff --git a/test/Solvers/solver_tests.jl b/test/Solvers/solver_tests.jl
@@ -2,7 +2,7 @@ import Pkg
 using Test
 
 function solver_test(name::Symbol)
-    if string(name) in keys(Pkg.installed())
+    if any(dep -> dep.name == string(name), values(Pkg.dependencies()))
         ok = false
         try
             @eval import $name
@@ -16,7 +16,9 @@ function solver_test(name::Symbol)
             end
         end
     else
-        @warn("The solver $name is not installed, run `] add $name`.")
+        @warn(
+            "The solver $name is not part of the dependencies, run `] add $name`."
+        )
     end
 end
 
diff --git a/test/Tests/utilities.jl b/test/Tests/utilities.jl
@@ -13,7 +13,7 @@ end
 #const SOSPolynomial{T, OT<:MOI.ModelLike} = MOI.Bridges.Constraint.SingleBridgeOptimizer{SumOfSquares.SOSPolynomialBridge{T}, OT}
 
 #function _cheat_model(factory::OptimizerFactory)
-#    return Model(with_optimizer(() -> SOSPolynomial{Float64}(factory())))
+#    return Model(optimizer_with_attributes(() -> SOSPolynomial{Float64}(factory())))
 #end
 
 #"""
