diff --git a/test/test_mathoptvrp.jl b/test/test_mathoptvrp.jl index 2a73b33..403005b 100644 --- a/test/test_mathoptvrp.jl +++ b/test/test_mathoptvrp.jl @@ -1,16 +1,9 @@ using JuMP using Test using Vroom +import MathOptInterface as MOI using MathOptVRP -# The wrapper has already stored routes per partition column on the -# inner `Vroom.Optimizer`, so `read_routes` just reads them back. -function _vroom_read_routes(model, _nodes) - return JuMP.unsafe_backend(model).routes -end - -@testset "MathOptVRP.test_vrp" begin - # Vroom only supports the VRP variant here, so we invoke that test - # directly rather than running `MathOptVRP.Tests.runtests`. - MathOptVRP.Tests.test_vrp(Vroom.Optimizer; read_routes = _vroom_read_routes) +@testset "$test" for test in [MathOptVRP.Tests.test_tsp, MathOptVRP.Tests.test_vrp] + test(Vroom.Optimizer) end