diff --git a/docs/src/manual/implementing.md b/docs/src/manual/implementing.md index 336eca9654..293180e478 100644 --- a/docs/src/manual/implementing.md +++ b/docs/src/manual/implementing.md @@ -165,7 +165,7 @@ Project.toml The best way to implement an interface to MathOptInterface is via [test-driven development](https://en.wikipedia.org/wiki/Test-driven_development). -The [`MOI.Test` submodule](@ref test_module) contains a large test suite to help +The [`MOI.DeprecatedTest` submodule](@ref test_module) contains a large test suite to help check that you have implemented things correctly. Follow the guide [How to test a solver](@ref) to set up the tests for your diff --git a/docs/src/submodules/Test/overview.md b/docs/src/submodules/Test/overview.md index c6938f9880..d325260c6d 100644 --- a/docs/src/submodules/Test/overview.md +++ b/docs/src/submodules/Test/overview.md @@ -43,7 +43,7 @@ const OPTIMIZER = MOI.instantiate(OPTIMIZER_CONSTRUCTOR) const BRIDGED = MOI.instantiate( OPTIMIZER_CONSTRUCTOR, with_bridge_type = Float64 ) -const CONFIG = MOI.Test.Config( +const CONFIG = MOI.DeprecatedTest.Config( # Modify tolerances as necessary. atol = 1e-6, rtol = 1e-6, @@ -68,9 +68,9 @@ function test_supports_incremental_interface() end function test_unittest() - # Test all the functions included in dictionary `MOI.Test.unittests`, + # Test all the functions included in dictionary `MOI.DeprecatedTest.unittests`, # except functions "number_threads" and "solve_qcp_edge_cases." - MOI.Test.unittest( + MOI.DeprecatedTest.unittest( BRIDGED, CONFIG, ["number_threads", "solve_qcp_edge_cases"] @@ -78,51 +78,51 @@ function test_unittest() end function test_modification() - MOI.Test.modificationtest(BRIDGED, CONFIG) + MOI.DeprecatedTest.modificationtest(BRIDGED, CONFIG) end function test_contlinear() - MOI.Test.contlineartest(BRIDGED, CONFIG) + MOI.DeprecatedTest.contlineartest(BRIDGED, CONFIG) end function test_contquadratictest() - MOI.Test.contquadratictest(OPTIMIZER, CONFIG) + MOI.DeprecatedTest.contquadratictest(OPTIMIZER, CONFIG) end function test_contconic() - MOI.Test.contlineartest(BRIDGED, CONFIG) + MOI.DeprecatedTest.contlineartest(BRIDGED, CONFIG) end function test_intconic() - MOI.Test.intconictest(BRIDGED, CONFIG) + MOI.DeprecatedTest.intconictest(BRIDGED, CONFIG) end function test_default_objective_test() - MOI.Test.default_objective_test(OPTIMIZER) + MOI.DeprecatedTest.default_objective_test(OPTIMIZER) end function test_default_status_test() - MOI.Test.default_status_test(OPTIMIZER) + MOI.DeprecatedTest.default_status_test(OPTIMIZER) end function test_nametest() - MOI.Test.nametest(OPTIMIZER) + MOI.DeprecatedTest.nametest(OPTIMIZER) end function test_validtest() - MOI.Test.validtest(OPTIMIZER) + MOI.DeprecatedTest.validtest(OPTIMIZER) end function test_emptytest() - MOI.Test.emptytest(OPTIMIZER) + MOI.DeprecatedTest.emptytest(OPTIMIZER) end function test_orderedindicestest() - MOI.Test.orderedindicestest(OPTIMIZER) + MOI.DeprecatedTest.orderedindicestest(OPTIMIZER) end function test_scalar_function_constant_not_zero() - MOI.Test.scalar_function_constant_not_zero(OPTIMIZER) + MOI.DeprecatedTest.scalar_function_constant_not_zero(OPTIMIZER) end # This function runs all functions in this module starting with `test_`. @@ -141,14 +141,14 @@ end # module TestFooBar TestFooBar.runtests() ``` -Test functions like `MOI.Test.unittest` and `MOI.Test.modificationtest` are -wrappers around corresponding dictionaries `MOI.Test.unittests` and -`MOI.Test.modificationtests`. Exclude tests by passing a vector of strings +Test functions like `MOI.DeprecatedTest.unittest` and `MOI.DeprecatedTest.modificationtest` are +wrappers around corresponding dictionaries `MOI.DeprecatedTest.unittests` and +`MOI.DeprecatedTest.modificationtests`. Exclude tests by passing a vector of strings corresponding to the test keys you want to exclude as the third positional argument to the test function. !!! tip - Print a list of all keys using `println.(keys(MOI.Test.unittests))` + Print a list of all keys using `println.(keys(MOI.DeprecatedTest.unittests))` The optimizer `BRIDGED` constructed with [`instantiate`](@ref) automatically bridges constraints that are not supported by `OPTIMIZER` @@ -162,7 +162,7 @@ To test that a specific problem can be solved without bridges, a specific test can be added with `OPTIMIZER` instead of `BRIDGED`. For example: ```julia function test_interval_constraints() - MOI.Test.linear10test(OPTIMIZER, CONFIG) + MOI.DeprecatedTest.linear10test(OPTIMIZER, CONFIG) end ``` checks that `OPTIMIZER` implements support for @@ -176,7 +176,7 @@ To give an example, ECOS errored calling [`optimize!`](@ref) twice in a row. We could add a test to ECOS.jl, but that would only stop us from re-introducing the bug to ECOS.jl in the future. -Instead, if we add a test to `MOI.Test`, then all solvers will also check that +Instead, if we add a test to `MOI.DeprecatedTest`, then all solvers will also check that they handle a double optimize call! For this test, we care about correctness, rather than performance. therefore, we @@ -217,7 +217,7 @@ To resolve this issue, follow these steps (tested on Julia v1.5): ``` 2. Add a test for the test you just wrote. (We test the tests!) a. Add the name of the test (`"solve_twice"`) to the end of the array in - `MOI.Test.unittest(...)` ([link](https://github.com/jump-dev/MathOptInterface.jl/blob/7543afe4b5151cf36bbd18181c1bb5c83266ae2f/test/Test/unit.jl#L51-L52)). + `MOI.DeprecatedTest.unittest(...)` ([link](https://github.com/jump-dev/MathOptInterface.jl/blob/7543afe4b5151cf36bbd18181c1bb5c83266ae2f/test/Test/unit.jl#L51-L52)). b. Add a test for the test towards the end of the "Unit Tests" test set ([link](https://github.com/jump-dev/MathOptInterface.jl/blob/7543afe4b5151cf36bbd18181c1bb5c83266ae2f/test/Test/unit.jl#L394)). The test should look something like @@ -235,7 +235,7 @@ To resolve this issue, follow these steps (tested on Julia v1.5): (MOI.FEASIBLE_POINT, [1.0]), ) ) - MOI.Test.solve_twice(mock, config) + MOI.DeprecatedTest.solve_twice(mock, config) end ``` In the above `mock` is a `MOI.Utilities.MockOptimizer` that is defined diff --git a/src/Test/Test.jl b/src/DeprecatedTest/DeprecatedTest.jl similarity index 93% rename from src/Test/Test.jl rename to src/DeprecatedTest/DeprecatedTest.jl index b88ad44263..ba5800e699 100644 --- a/src/Test/Test.jl +++ b/src/DeprecatedTest/DeprecatedTest.jl @@ -1,4 +1,4 @@ -module Test +module DeprecatedTest using MathOptInterface const MOI = MathOptInterface diff --git a/src/Test/UnitTests/attributes.jl b/src/DeprecatedTest/UnitTests/attributes.jl similarity index 100% rename from src/Test/UnitTests/attributes.jl rename to src/DeprecatedTest/UnitTests/attributes.jl diff --git a/src/Test/UnitTests/basic_constraint_tests.jl b/src/DeprecatedTest/UnitTests/basic_constraint_tests.jl similarity index 100% rename from src/Test/UnitTests/basic_constraint_tests.jl rename to src/DeprecatedTest/UnitTests/basic_constraint_tests.jl diff --git a/src/Test/UnitTests/constraints.jl b/src/DeprecatedTest/UnitTests/constraints.jl similarity index 99% rename from src/Test/UnitTests/constraints.jl rename to src/DeprecatedTest/UnitTests/constraints.jl index e3c5abbafe..9715771817 100644 --- a/src/Test/UnitTests/constraints.jl +++ b/src/DeprecatedTest/UnitTests/constraints.jl @@ -540,7 +540,7 @@ function solve_start_soc(model::MOI.ModelLike, config::Config{T}) where {T} end if config.solve MOI.optimize!(model) - MOI.Test.test_model_solution( + test_model_solution( model, config; objective_value = o, diff --git a/src/Test/UnitTests/modifications.jl b/src/DeprecatedTest/UnitTests/modifications.jl similarity index 100% rename from src/Test/UnitTests/modifications.jl rename to src/DeprecatedTest/UnitTests/modifications.jl diff --git a/src/Test/UnitTests/objectives.jl b/src/DeprecatedTest/UnitTests/objectives.jl similarity index 100% rename from src/Test/UnitTests/objectives.jl rename to src/DeprecatedTest/UnitTests/objectives.jl diff --git a/src/Test/UnitTests/solve.jl b/src/DeprecatedTest/UnitTests/solve.jl similarity index 100% rename from src/Test/UnitTests/solve.jl rename to src/DeprecatedTest/UnitTests/solve.jl diff --git a/src/Test/UnitTests/unit_tests.jl b/src/DeprecatedTest/UnitTests/unit_tests.jl similarity index 100% rename from src/Test/UnitTests/unit_tests.jl rename to src/DeprecatedTest/UnitTests/unit_tests.jl diff --git a/src/Test/UnitTests/variables.jl b/src/DeprecatedTest/UnitTests/variables.jl similarity index 100% rename from src/Test/UnitTests/variables.jl rename to src/DeprecatedTest/UnitTests/variables.jl diff --git a/src/Test/config.jl b/src/DeprecatedTest/config.jl similarity index 98% rename from src/Test/config.jl rename to src/DeprecatedTest/config.jl index 01a8d8e358..84d0cfdfb6 100644 --- a/src/Test/config.jl +++ b/src/DeprecatedTest/config.jl @@ -107,7 +107,7 @@ macro moitestset(setname, subsets = false) :( function $testname( model::$MOI.ModelLike, - config::$MOI.Test.Config, + config::$MOI.DeprecatedTest.Config, exclude::Vector{String} = String[], ) for (name, f) in $testdict diff --git a/src/Test/contconic.jl b/src/DeprecatedTest/contconic.jl similarity index 100% rename from src/Test/contconic.jl rename to src/DeprecatedTest/contconic.jl diff --git a/src/Test/contlinear.jl b/src/DeprecatedTest/contlinear.jl similarity index 100% rename from src/Test/contlinear.jl rename to src/DeprecatedTest/contlinear.jl diff --git a/src/Test/contquadratic.jl b/src/DeprecatedTest/contquadratic.jl similarity index 100% rename from src/Test/contquadratic.jl rename to src/DeprecatedTest/contquadratic.jl diff --git a/src/Test/intconic.jl b/src/DeprecatedTest/intconic.jl similarity index 100% rename from src/Test/intconic.jl rename to src/DeprecatedTest/intconic.jl diff --git a/src/Test/intlinear.jl b/src/DeprecatedTest/intlinear.jl similarity index 100% rename from src/Test/intlinear.jl rename to src/DeprecatedTest/intlinear.jl diff --git a/src/Test/modellike.jl b/src/DeprecatedTest/modellike.jl similarity index 100% rename from src/Test/modellike.jl rename to src/DeprecatedTest/modellike.jl diff --git a/src/Test/nlp.jl b/src/DeprecatedTest/nlp.jl similarity index 100% rename from src/Test/nlp.jl rename to src/DeprecatedTest/nlp.jl diff --git a/src/MathOptInterface.jl b/src/MathOptInterface.jl index 45376fc7e8..5e0c71f3b5 100644 --- a/src/MathOptInterface.jl +++ b/src/MathOptInterface.jl @@ -175,12 +175,13 @@ end # submodules include("Utilities/Utilities.jl") # MOI.Utilities -include("Test/Test.jl") # MOI.Test +# include("Test/Test.jl") # MOI.Test include("Bridges/Bridges.jl") # MOI.Bridges include("Benchmarks/Benchmarks.jl") include("FileFormats/FileFormats.jl") include("instantiate.jl") include("deprecate.jl") +include("DeprecatedTest/DeprecatedTest.jl") end diff --git a/src/Utilities/Utilities.jl b/src/Utilities/Utilities.jl index ae55e56cb4..59136f9889 100644 --- a/src/Utilities/Utilities.jl +++ b/src/Utilities/Utilities.jl @@ -28,7 +28,7 @@ end function replace_acronym(s::AbstractString) s = replace(s, "MathOptInterface.Utilities" => "MOIU") s = replace(s, "MathOptInterface.Bridges" => "MOIB") - s = replace(s, "MathOptInterface.Test" => "MOIT") + s = replace(s, "MathOptInterface.DeprecatedTest" => "MOIT") s = replace(s, "MathOptInterface" => "MOI") return s end diff --git a/test/Bridges/Constraint/bridge.jl b/test/Bridges/Constraint/bridge.jl index 15a6e14d95..0592293240 100644 --- a/test/Bridges/Constraint/bridge.jl +++ b/test/Bridges/Constraint/bridge.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/det.jl b/test/Bridges/Constraint/det.jl index 0f5c1c690d..4c20f33997 100644 --- a/test/Bridges/Constraint/det.jl +++ b/test/Bridges/Constraint/det.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/flip_sign.jl b/test/Bridges/Constraint/flip_sign.jl index baa137ea61..24ee6b9f18 100644 --- a/test/Bridges/Constraint/flip_sign.jl +++ b/test/Bridges/Constraint/flip_sign.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/functionize.jl b/test/Bridges/Constraint/functionize.jl index 13d7f24796..f0a9e43e43 100644 --- a/test/Bridges/Constraint/functionize.jl +++ b/test/Bridges/Constraint/functionize.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/geomean.jl b/test/Bridges/Constraint/geomean.jl index 15e2becf04..e3f76beded 100644 --- a/test/Bridges/Constraint/geomean.jl +++ b/test/Bridges/Constraint/geomean.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/geomean_to_relentr.jl b/test/Bridges/Constraint/geomean_to_relentr.jl index 8f966c57e6..4335be5c53 100644 --- a/test/Bridges/Constraint/geomean_to_relentr.jl +++ b/test/Bridges/Constraint/geomean_to_relentr.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/indicator_activate_on_zero.jl b/test/Bridges/Constraint/indicator_activate_on_zero.jl index 86cf371f6f..ffdd62cda5 100644 --- a/test/Bridges/Constraint/indicator_activate_on_zero.jl +++ b/test/Bridges/Constraint/indicator_activate_on_zero.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/indicator_sos.jl b/test/Bridges/Constraint/indicator_sos.jl index 32a73a1f43..4d1d44066a 100644 --- a/test/Bridges/Constraint/indicator_sos.jl +++ b/test/Bridges/Constraint/indicator_sos.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/interval.jl b/test/Bridges/Constraint/interval.jl index b8f35ec140..acb289cf49 100644 --- a/test/Bridges/Constraint/interval.jl +++ b/test/Bridges/Constraint/interval.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/ltgt_to_interval.jl b/test/Bridges/Constraint/ltgt_to_interval.jl index 35a579bd4f..44a2bcb7c1 100644 --- a/test/Bridges/Constraint/ltgt_to_interval.jl +++ b/test/Bridges/Constraint/ltgt_to_interval.jl @@ -4,7 +4,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl index 09c5860955..9170c17425 100644 --- a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl +++ b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/norm_to_lp.jl b/test/Bridges/Constraint/norm_to_lp.jl index d8e56b3cc9..0daef552e6 100644 --- a/test/Bridges/Constraint/norm_to_lp.jl +++ b/test/Bridges/Constraint/norm_to_lp.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/quad_to_soc.jl b/test/Bridges/Constraint/quad_to_soc.jl index fe72710782..52224aa874 100644 --- a/test/Bridges/Constraint/quad_to_soc.jl +++ b/test/Bridges/Constraint/quad_to_soc.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/relentr_to_exp.jl b/test/Bridges/Constraint/relentr_to_exp.jl index fe75bf1c7d..8b302dc0cd 100644 --- a/test/Bridges/Constraint/relentr_to_exp.jl +++ b/test/Bridges/Constraint/relentr_to_exp.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/rsoc.jl b/test/Bridges/Constraint/rsoc.jl index f06b2429a2..0a5f734ee4 100644 --- a/test/Bridges/Constraint/rsoc.jl +++ b/test/Bridges/Constraint/rsoc.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/scalarize.jl b/test/Bridges/Constraint/scalarize.jl index e0c12d0742..ab55f9c587 100644 --- a/test/Bridges/Constraint/scalarize.jl +++ b/test/Bridges/Constraint/scalarize.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/semi_to_binary.jl b/test/Bridges/Constraint/semi_to_binary.jl index 596bdeb391..fcfa9b7eca 100644 --- a/test/Bridges/Constraint/semi_to_binary.jl +++ b/test/Bridges/Constraint/semi_to_binary.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges const MOIBC = MathOptInterface.Bridges.Constraint diff --git a/test/Bridges/Constraint/slack.jl b/test/Bridges/Constraint/slack.jl index e1c66b8826..a20c304da2 100644 --- a/test/Bridges/Constraint/slack.jl +++ b/test/Bridges/Constraint/slack.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/soc_to_nonconvex_quad.jl b/test/Bridges/Constraint/soc_to_nonconvex_quad.jl index e7d4093c8d..dc16a2bf05 100644 --- a/test/Bridges/Constraint/soc_to_nonconvex_quad.jl +++ b/test/Bridges/Constraint/soc_to_nonconvex_quad.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges const MOIBC = MathOptInterface.Bridges.Constraint diff --git a/test/Bridges/Constraint/soc_to_psd.jl b/test/Bridges/Constraint/soc_to_psd.jl index f4ab85339f..be3ea8c8b4 100644 --- a/test/Bridges/Constraint/soc_to_psd.jl +++ b/test/Bridges/Constraint/soc_to_psd.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/square.jl b/test/Bridges/Constraint/square.jl index 8d76dc1edf..3528070b9a 100644 --- a/test/Bridges/Constraint/square.jl +++ b/test/Bridges/Constraint/square.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/vectorize.jl b/test/Bridges/Constraint/vectorize.jl index 173da8a984..3c368344e1 100644 --- a/test/Bridges/Constraint/vectorize.jl +++ b/test/Bridges/Constraint/vectorize.jl @@ -2,7 +2,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Constraint/zero_one.jl b/test/Bridges/Constraint/zero_one.jl index 07698c0f91..a63bb4f338 100644 --- a/test/Bridges/Constraint/zero_one.jl +++ b/test/Bridges/Constraint/zero_one.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges const MOIBC = MathOptInterface.Bridges.Constraint diff --git a/test/Bridges/Objective/functionize.jl b/test/Bridges/Objective/functionize.jl index 0ba095809f..7e84a237e7 100644 --- a/test/Bridges/Objective/functionize.jl +++ b/test/Bridges/Objective/functionize.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Objective/slack.jl b/test/Bridges/Objective/slack.jl index db7c668db1..7c39fef6e7 100644 --- a/test/Bridges/Objective/slack.jl +++ b/test/Bridges/Objective/slack.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/bridge.jl b/test/Bridges/Variable/bridge.jl index eb26ac2690..e07773860c 100644 --- a/test/Bridges/Variable/bridge.jl +++ b/test/Bridges/Variable/bridge.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/flip_sign.jl b/test/Bridges/Variable/flip_sign.jl index 4101109d14..4f2682146a 100644 --- a/test/Bridges/Variable/flip_sign.jl +++ b/test/Bridges/Variable/flip_sign.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/free.jl b/test/Bridges/Variable/free.jl index cb0d540168..a41fc03dcb 100644 --- a/test/Bridges/Variable/free.jl +++ b/test/Bridges/Variable/free.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/rsoc_to_psd.jl b/test/Bridges/Variable/rsoc_to_psd.jl index 914c520ea8..ac01f33cc1 100644 --- a/test/Bridges/Variable/rsoc_to_psd.jl +++ b/test/Bridges/Variable/rsoc_to_psd.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/rsoc_to_soc.jl b/test/Bridges/Variable/rsoc_to_soc.jl index 93381160ec..5bb00bdb3f 100644 --- a/test/Bridges/Variable/rsoc_to_soc.jl +++ b/test/Bridges/Variable/rsoc_to_soc.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/soc_to_rsoc.jl b/test/Bridges/Variable/soc_to_rsoc.jl index a22208fc83..c15138b2e6 100644 --- a/test/Bridges/Variable/soc_to_rsoc.jl +++ b/test/Bridges/Variable/soc_to_rsoc.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/Variable/vectorize.jl b/test/Bridges/Variable/vectorize.jl index 1c7be2de2f..c12ad8765f 100644 --- a/test/Bridges/Variable/vectorize.jl +++ b/test/Bridges/Variable/vectorize.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges @@ -135,7 +135,7 @@ end @testset "get `UnknownVariableAttribute``" begin err = ArgumentError( "Variable bridge of type `$(MathOptInterface.Bridges.Variable.VectorizeBridge{Float64,MathOptInterface.Nonpositives})`" * - " does not support accessing the attribute `MathOptInterface.Test.UnknownVariableAttribute()`.", + " does not support accessing the attribute `MathOptInterface.DeprecatedTest.UnknownVariableAttribute()`.", ) @test_throws err MOI.get( bridged_mock, diff --git a/test/Bridges/Variable/zeros.jl b/test/Bridges/Variable/zeros.jl index 77a0371c08..e910e6e0a5 100644 --- a/test/Bridges/Variable/zeros.jl +++ b/test/Bridges/Variable/zeros.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges @@ -90,7 +90,7 @@ err = ErrorException( err = ArgumentError( "Variable bridge of type `MathOptInterface.Bridges.Variable.ZerosBridge{Float64}`" * - " does not support accessing the attribute `MathOptInterface.Test.UnknownVariableAttribute()`.", + " does not support accessing the attribute `MathOptInterface.DeprecatedTest.UnknownVariableAttribute()`.", ) @test_throws err MOI.get(bridged_mock, MOIT.UnknownVariableAttribute(), y) diff --git a/test/Bridges/bridge_optimizer.jl b/test/Bridges/bridge_optimizer.jl index fce8be17d6..3535bde62e 100644 --- a/test/Bridges/bridge_optimizer.jl +++ b/test/Bridges/bridge_optimizer.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Bridges/lazy_bridge_optimizer.jl b/test/Bridges/lazy_bridge_optimizer.jl index 8dfcd2573f..75aae3b4bb 100644 --- a/test/Bridges/lazy_bridge_optimizer.jl +++ b/test/Bridges/lazy_bridge_optimizer.jl @@ -2,7 +2,7 @@ using Test using MathOptInterface const MOI = MathOptInterface -const MOIT = MathOptInterface.Test +const MOIT = MathOptInterface.DeprecatedTest const MOIU = MathOptInterface.Utilities const MOIB = MathOptInterface.Bridges diff --git a/test/Test/Test.jl b/test/DeprecatedTest/DeprecatedTest.jl similarity index 75% rename from test/Test/Test.jl rename to test/DeprecatedTest/DeprecatedTest.jl index 1e26b3d94d..066b3d4551 100644 --- a/test/Test/Test.jl +++ b/test/DeprecatedTest/DeprecatedTest.jl @@ -1,7 +1,7 @@ using Test @testset "$(file)" for file in readdir(@__DIR__) - if file == "Test.jl" + if file == "DeprecatedTest.jl" continue end include(file) diff --git a/test/Test/config.jl b/test/DeprecatedTest/config.jl similarity index 95% rename from test/Test/config.jl rename to test/DeprecatedTest/config.jl index e4433fe706..2235692dbb 100644 --- a/test/Test/config.jl +++ b/test/DeprecatedTest/config.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities function atest(model::MOI.ModelLike, config::MOIT.Config{T}) where {T<:Real} diff --git a/test/Test/contconic.jl b/test/DeprecatedTest/contconic.jl similarity index 99% rename from test/Test/contconic.jl rename to test/DeprecatedTest/contconic.jl index 1a77ae6af0..09db6b3f1b 100644 --- a/test/Test/contconic.jl +++ b/test/DeprecatedTest/contconic.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities mock = MOIU.MockOptimizer(MOIU.Model{Float64}()) diff --git a/test/Test/contlinear.jl b/test/DeprecatedTest/contlinear.jl similarity index 99% rename from test/Test/contlinear.jl rename to test/DeprecatedTest/contlinear.jl index 594a0ed342..eb5bfbfec1 100644 --- a/test/Test/contlinear.jl +++ b/test/DeprecatedTest/contlinear.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities mock = MOIU.MockOptimizer(MOIU.UniversalFallback(MOIU.Model{Float64}())) diff --git a/test/Test/contquadratic.jl b/test/DeprecatedTest/contquadratic.jl similarity index 99% rename from test/Test/contquadratic.jl rename to test/DeprecatedTest/contquadratic.jl index 6faf97e45f..049ce56a92 100644 --- a/test/Test/contquadratic.jl +++ b/test/DeprecatedTest/contquadratic.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities mock = MOIU.MockOptimizer(MOIU.Model{Float64}()) diff --git a/test/Test/intconic.jl b/test/DeprecatedTest/intconic.jl similarity index 91% rename from test/Test/intconic.jl rename to test/DeprecatedTest/intconic.jl index 08d18cbfeb..bf94607c24 100644 --- a/test/Test/intconic.jl +++ b/test/DeprecatedTest/intconic.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities mock = MOIU.MockOptimizer(MOIU.Model{Float64}()) diff --git a/test/Test/intlinear.jl b/test/DeprecatedTest/intlinear.jl similarity index 99% rename from test/Test/intlinear.jl rename to test/DeprecatedTest/intlinear.jl index 0416541a70..bab2753713 100644 --- a/test/Test/intlinear.jl +++ b/test/DeprecatedTest/intlinear.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities mock = MOIU.MockOptimizer(MOIU.Model{Float64}()) diff --git a/test/Test/modellike.jl b/test/DeprecatedTest/modellike.jl similarity index 76% rename from test/Test/modellike.jl rename to test/DeprecatedTest/modellike.jl index 875974abe2..caafc10f3e 100644 --- a/test/Test/modellike.jl +++ b/test/DeprecatedTest/modellike.jl @@ -1,12 +1,15 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOU = MOI.Utilities @testset "Start value attributes and nothing" begin model = MOIU.MockOptimizer(MOIU.UniversalFallback(MOIU.Model{Float64}())) - MOI.Test.start_values_unset_test(model, MOI.Test.Config()) + MOI.DeprecatedTest.start_values_unset_test( + model, + MOI.DeprecatedTest.Config(), + ) end @testset "Failed copy" begin diff --git a/test/Test/nlp.jl b/test/DeprecatedTest/nlp.jl similarity index 81% rename from test/Test/nlp.jl rename to test/DeprecatedTest/nlp.jl index d2b931d261..e7aded3654 100644 --- a/test/Test/nlp.jl +++ b/test/DeprecatedTest/nlp.jl @@ -4,7 +4,7 @@ import MathOptInterface const MOI = MathOptInterface @testset "hs071-manual" begin - d = MOI.Test.HS071(true, true) + d = MOI.DeprecatedTest.HS071(true, true) MOI.initialize(d, [:Grad, :Jac, :ExprGraph, :Hess, :HessVec]) @test :HessVec in MOI.features_available(d) x = ones(4) @@ -40,7 +40,7 @@ end MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()), eval_objective_value = false, ) - config = MOI.Test.Config(optimal_status = MOI.LOCALLY_SOLVED) + config = MOI.DeprecatedTest.Config(optimal_status = MOI.LOCALLY_SOLVED) MOI.Utilities.set_mock_optimize!( mock, (mock) -> begin @@ -57,11 +57,11 @@ end MOI.set(mock, MOI.ObjectiveValue(), 17.014017145179164) end, ) - MOI.Test.hs071_test(mock, config) - MOI.Test.hs071_no_hessian_test(mock, config) - MOI.Test.hs071_hessian_vector_product_test(mock, config) + MOI.DeprecatedTest.hs071_test(mock, config) + MOI.DeprecatedTest.hs071_no_hessian_test(mock, config) + MOI.DeprecatedTest.hs071_hessian_vector_product_test(mock, config) - d = MOI.Test.HS071(false) + d = MOI.DeprecatedTest.HS071(false) VI = MOI.VariableIndex @test MOI.objective_expr(d) == :( x[$(VI(1))] * x[$(VI(4))] * (x[$(VI(1))] + x[$(VI(2))] + x[$(VI(3))]) + @@ -79,7 +79,7 @@ end mock = MOI.Utilities.MockOptimizer( MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()), ) - config = MOI.Test.Config(optimal_status = MOI.LOCALLY_SOLVED) + config = MOI.DeprecatedTest.Config(optimal_status = MOI.LOCALLY_SOLVED) MOI.Utilities.set_mock_optimize!( mock, (mock) -> MOI.Utilities.mock_optimize!( @@ -88,14 +88,14 @@ end [2.8, 0.0, 0.8, 1.2], ), ) - MOI.Test.mixed_complementaritytest(mock, config) + MOI.DeprecatedTest.mixed_complementaritytest(mock, config) end @testset "math_program_complementarity_constraints" begin mock = MOI.Utilities.MockOptimizer( MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()), ) - config = MOI.Test.Config(optimal_status = MOI.LOCALLY_SOLVED) + config = MOI.DeprecatedTest.Config(optimal_status = MOI.LOCALLY_SOLVED) MOI.Utilities.set_mock_optimize!( mock, (mock) -> MOI.Utilities.mock_optimize!( @@ -104,5 +104,8 @@ end [1.0, 0.0, 3.5, 0.0, 0.0, 0.0, 3.0, 6.0], ), ) - MOI.Test.math_program_complementarity_constraintstest(mock, config) + MOI.DeprecatedTest.math_program_complementarity_constraintstest( + mock, + config, + ) end diff --git a/test/Test/unit.jl b/test/DeprecatedTest/unit.jl similarity index 99% rename from test/Test/unit.jl rename to test/DeprecatedTest/unit.jl index 961b3476bc..b055d29167 100644 --- a/test/Test/unit.jl +++ b/test/DeprecatedTest/unit.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities @testset "Basic Constraint Tests" begin diff --git a/test/FileFormats/NL/NL.jl b/test/FileFormats/NL/NL.jl index 69e05fca32..8cd48617ed 100644 --- a/test/FileFormats/NL/NL.jl +++ b/test/FileFormats/NL/NL.jl @@ -305,7 +305,7 @@ function test_nlmodel_hs071() MOI.add_constraint.(model, MOI.SingleVariable.(v), MOI.LessThan.(u)) MOI.set.(model, MOI.VariablePrimalStart(), v, start) lb, ub = [25.0, 40.0], [Inf, 40.0] - evaluator = MOI.Test.HS071(true) + evaluator = MOI.DeprecatedTest.HS071(true) block_data = MOI.NLPBlockData(MOI.NLPBoundsPair.(lb, ub), evaluator, true) MOI.set(model, MOI.NLPBlock(), block_data) MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE) @@ -455,7 +455,7 @@ function test_nlmodel_hs071_linear_obj() MOI.add_constraint(model, MOI.SingleVariable(v[3]), MOI.Integer()) MOI.set.(model, MOI.VariablePrimalStart(), v, start) lb, ub = [25.0, 40.0], [Inf, 40.0] - evaluator = MOI.Test.HS071(true) + evaluator = MOI.DeprecatedTest.HS071(true) block_data = MOI.NLPBlockData(MOI.NLPBoundsPair.(lb, ub), evaluator, false) MOI.set(model, MOI.NLPBlock(), block_data) f = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.(l, v), 2.0) diff --git a/test/Utilities/cachingoptimizer.jl b/test/Utilities/cachingoptimizer.jl index 66ceb85692..748febbc20 100644 --- a/test/Utilities/cachingoptimizer.jl +++ b/test/Utilities/cachingoptimizer.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities @testset "Test default attributes" begin diff --git a/test/Utilities/copy.jl b/test/Utilities/copy.jl index dc3755c0ba..9c8f5c4710 100644 --- a/test/Utilities/copy.jl +++ b/test/Utilities/copy.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities const DoubleDicts = MathOptInterface.Utilities.DoubleDicts diff --git a/test/Utilities/matrix_of_constraints.jl b/test/Utilities/matrix_of_constraints.jl index 81882c011e..ba8058edac 100644 --- a/test/Utilities/matrix_of_constraints.jl +++ b/test/Utilities/matrix_of_constraints.jl @@ -4,7 +4,7 @@ using SparseArrays, Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities function runtests() @@ -141,7 +141,7 @@ function _test( return end -function _lp(model, ::MOI.Test.Config{T}) where {T} +function _lp(model, ::MOI.DeprecatedTest.Config{T}) where {T} MOI.empty!(model) x = MOI.add_variable(model) fx = one(T) * MOI.SingleVariable(x) @@ -410,7 +410,7 @@ function test_nametest() }, }, }() - MOI.Test.nametest(model, delete = false) + MOI.DeprecatedTest.nametest(model, delete = false) end end @@ -437,7 +437,7 @@ function test_empty() }, }, }() - return MOI.Test.emptytest(model) + return MOI.DeprecatedTest.emptytest(model) end function test_valid() @@ -446,7 +446,7 @@ function test_valid() ConstantsType = MOIU.Box{T} for ProductOfSetsType in [MixLP{Float64}, OrdLP{Float64}] model = matrix_instance(T, ConstantsType, ProductOfSetsType, Indexing) - MOI.Test.validtest(model, delete = false) + MOI.DeprecatedTest.validtest(model, delete = false) end end @@ -466,7 +466,7 @@ function test_supports_constraint(T::Type = Float64, BadT::Type = Float32) }, }, }() - MOI.Test.supports_constrainttest(model, T, BadT) + MOI.DeprecatedTest.supports_constrainttest(model, T, BadT) end end @@ -501,7 +501,7 @@ function test_copy(Indexing) }, }, }() - MOI.Test.copytest(model, MOIU.Model{T}()) + MOI.DeprecatedTest.copytest(model, MOIU.Model{T}()) end end diff --git a/test/Utilities/mockoptimizer.jl b/test/Utilities/mockoptimizer.jl index 8eed826afc..774a8aedf5 100644 --- a/test/Utilities/mockoptimizer.jl +++ b/test/Utilities/mockoptimizer.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities @testset "Default objective sense" begin diff --git a/test/Utilities/model.jl b/test/Utilities/model.jl index 04b8cf5dea..196c9cb4d8 100644 --- a/test/Utilities/model.jl +++ b/test/Utilities/model.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities function bound_vectors_test(::Type{T}, nolb, noub) where {T} diff --git a/test/Utilities/print.jl b/test/Utilities/print.jl index 533b2047e6..455f3e4141 100644 --- a/test/Utilities/print.jl +++ b/test/Utilities/print.jl @@ -523,7 +523,7 @@ function test_nlp() MOI.set(model, MOI.VariableName(), v[i], "x[$i]") end lb, ub = [25.0, 40.0], [Inf, 40.0] - evaluator = MOI.Test.HS071(true) + evaluator = MOI.DeprecatedTest.HS071(true) block_data = MOI.NLPBlockData(MOI.NLPBoundsPair.(lb, ub), evaluator, true) MOI.set(model, MOI.NLPBlock(), block_data) MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE) diff --git a/test/Utilities/print_with_acronym.jl b/test/Utilities/print_with_acronym.jl index 931a968476..9bdd8d15f9 100644 --- a/test/Utilities/print_with_acronym.jl +++ b/test/Utilities/print_with_acronym.jl @@ -13,7 +13,8 @@ const MOIU = MOI.Utilities @test sprint(MOIU.print_with_acronym, "MathOptInterfaceXXBridges") == "MOIXXBridges" @test sprint(MOIU.print_with_acronym, "MathOptInterface.BridgesXX") == "MOIBXX" -@test sprint(MOIU.print_with_acronym, "MathOptInterface.Test.x") == "MOIT.x" +@test sprint(MOIU.print_with_acronym, "MathOptInterface.DeprecatedTest.x") == + "MOIT.x" @test sprint(MOIU.print_with_acronym, "MathOptInterface.x.Test") == "MOI.x.Test" @test sprint(MOIU.print_with_acronym, "MathOptInterface.Utilities.Test") == "MOIU.Test" diff --git a/test/Utilities/universalfallback.jl b/test/Utilities/universalfallback.jl index 2df241592f..c95c433346 100644 --- a/test/Utilities/universalfallback.jl +++ b/test/Utilities/universalfallback.jl @@ -1,7 +1,7 @@ using Test import MathOptInterface const MOI = MathOptInterface -const MOIT = MOI.Test +const MOIT = MOI.DeprecatedTest const MOIU = MOI.Utilities function test_optmodattrs(uf, model, attr, listattr) diff --git a/test/runtests.jl b/test/runtests.jl index d0aba68a0b..c07753033b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -17,9 +17,10 @@ end @testset "MOI.$(submodule)" for submodule in [ "Bridges", "FileFormats", - "Test", + # "Test", "Utilities", "Benchmarks", + "DeprecatedTest", ] include("$(submodule)/$(submodule).jl") end