From a1665a8415ee9951641f00897176e5e3ac490dfb Mon Sep 17 00:00:00 2001 From: odow Date: Tue, 24 Aug 2021 12:38:56 +1200 Subject: [PATCH 1/4] [breaking] Move test_models_equal to Test --- src/Test/Test.jl | 101 +++++++++++++ src/Utilities/functions.jl | 134 ++---------------- test/Bridges/Constraint/geomean.jl | 12 +- test/Bridges/Constraint/geomean_to_relentr.jl | 12 +- test/Bridges/Constraint/indicator_sos.jl | 4 +- .../Constraint/norm_spec_nuc_to_psd.jl | 8 +- test/Bridges/Constraint/norm_to_lp.jl | 21 ++- test/Bridges/Constraint/relentr_to_exp.jl | 4 +- test/Bridges/Constraint/semi_to_binary.jl | 4 +- test/Bridges/Constraint/zero_one.jl | 4 +- test/Bridges/Objective/slack.jl | 8 +- test/Bridges/Variable/flip_sign.jl | 4 +- test/Bridges/Variable/free.jl | 18 +-- test/Bridges/Variable/rsoc_to_psd.jl | 18 +-- test/Bridges/Variable/rsoc_to_soc.jl | 9 +- test/Bridges/Variable/soc_to_rsoc.jl | 9 +- test/Bridges/Variable/vectorize.jl | 8 +- test/Bridges/Variable/zeros.jl | 4 +- test/FileFormats/CBF/CBF.jl | 4 +- test/FileFormats/MOF/MOF.jl | 8 +- test/FileFormats/MPS/MPS.jl | 12 +- test/FileFormats/SDPA/SDPA.jl | 4 +- test/Utilities/parser.jl | 10 +- test/deprecate.jl | 10 ++ 24 files changed, 194 insertions(+), 236 deletions(-) diff --git a/src/Test/Test.jl b/src/Test/Test.jl index 6a980c4ec8..6c6564176c 100644 --- a/src/Test/Test.jl +++ b/src/Test/Test.jl @@ -440,6 +440,107 @@ function _test_attribute_value_type( return end +function _test_variablenames_equal(model, variable_names) + seen_name = Dict(name => false for name in variable_names) + for index in MOI.get(model, MOI.ListOfVariableIndices()) + name = MOI.get(model, MOI.VariableName(), index) + @test haskey(seen_name, name) + @test seen_name[name] == false + seen_name[name] = true + end + @test all(values(seen_name)) + return +end + +function _test_constraintnames_equal(model, constraint_names) + seen_name = Dict(name => false for name in constraint_names) + for (F, S) in MOI.get(model, MOI.ListOfConstraintTypesPresent()) + if F == MOI.SingleVariable + continue + end + for index in MOI.get(model, MOI.ListOfConstraintIndices{F,S}()) + name = MOI.get(model, MOI.ConstraintName(), index) + @test haskey(seen_name, name) + @test seen_name[name] == false + seen_name[name] = true + end + end + @test all(values(seen_name)) + return +end + +""" + test_models_equal( + model1::ModelLike, + model2::ModelLike, + variable_names::Vector{String}, + constraint_names::Vector{String}, + single_variable_constraints::Vector{Tuple{String,<:MOI.AbstractScalarSet}} + ) + +Test that `model1` and `model2` are identical using `variable_names` as keys for +the variable names and `constraint_names` as keys for the constraint names. + +In addition, it checks that there is a SingleVariable-in-Set constraint for each +`(name, set)` tuple in `single_variable_constraints`, where `name` is the name +of the corresponding variable. + +!!! warning + This is not a generic function that works in all cases. It is mainly + intended for writing tests in which all variables and constraints have + unique names. +""" +function test_models_equal( + model1::MOI.ModelLike, + model2::MOI.ModelLike, + variable_names::Vector{String}, + constraint_names::Vector{String}, + single_variable_constraints::Vector{<:Tuple} = Tuple[], +) + for (name, set) in single_variable_constraints + x1 = MOI.get(model1, MOI.VariableIndex, name) + ci1 = MOI.ConstraintIndex{MOI.SingleVariable,typeof(set)}(x1.value) + @test MOI.is_valid(model1, ci1) + @test MOI.get(model1, MOI.ConstraintSet(), ci1) == set + x2 = MOI.get(model2, MOI.VariableIndex, name) + ci2 = MOI.ConstraintIndex{MOI.SingleVariable,typeof(set)}(x2.value) + @test MOI.is_valid(model2, ci2) + @test MOI.get(model2, MOI.ConstraintSet(), ci2) == set + end + _test_variablenames_equal(model1, variable_names) + _test_variablenames_equal(model2, variable_names) + _test_constraintnames_equal(model1, constraint_names) + _test_constraintnames_equal(model2, constraint_names) + map_2to1 = Dict{MOI.VariableIndex,MOI.VariableIndex}() + for name in variable_names + index2 = MOI.get(model2, MOI.VariableIndex, name) + map_2to1[index2] = MOI.get(model1, MOI.VariableIndex, name) + end + for name in constraint_names + c1 = MOI.get(model1, MOI.ConstraintIndex, name) + c2 = MOI.get(model2, MOI.ConstraintIndex, name) + f1 = MOI.get(model1, MOI.ConstraintFunction(), c1) + f2 = MOI.get(model2, MOI.ConstraintFunction(), c2) + @test isapprox(f1, MOI.Utilities.map_indices(map_2to1, f2)) + @test MOI.get(model1, MOI.ConstraintSet(), c1) == + MOI.get(model2, MOI.ConstraintSet(), c2) + end + attrs1 = MOI.get(model1, MOI.ListOfModelAttributesSet()) + attrs2 = MOI.get(model2, MOI.ListOfModelAttributesSet()) + for attr in union(attrs1, attrs2) + value1 = MOI.get(model1, attr) + value2 = MOI.get(model2, attr) + if value1 isa MOI.AbstractFunction + @test value2 isa MOI.AbstractFunction + @test isapprox(value1, MOI.Utilities.map_indices(map_2to1, value2)) + else + @test !(value2 isa MOI.AbstractFunction) + @test value1 == value2 + end + end + return +end + ### ### Include all the test files! ### diff --git a/src/Utilities/functions.jl b/src/Utilities/functions.jl index 0c11249c37..ec2162a33d 100644 --- a/src/Utilities/functions.jl +++ b/src/Utilities/functions.jl @@ -1,4 +1,11 @@ -using Test +function test_models_equal(args...) + @warn( + "`Utilities.test_models_equal` has been moved to " * + "`Test.test_models_equal`", + maxlog = 1, + ) + return MOI.Test.test_models_equal(args...) +end variable_function_type(::Type{<:MOI.AbstractScalarSet}) = MOI.SingleVariable variable_function_type(::Type{<:MOI.AbstractVectorSet}) = MOI.VectorOfVariables @@ -801,56 +808,6 @@ function sort_and_compress!(x::AbstractVector, by, keep, combine) return x end -function test_variablenames_equal(model, variablenames) - seen_name = Dict(name => false for name in variablenames) - for index in MOI.get(model, MOI.ListOfVariableIndices()) - vname = MOI.get(model, MOI.VariableName(), index) - if !haskey(seen_name, vname) - error( - "Variable with name $vname present in model but not expected list of variable names.", - ) - end - if seen_name[vname] - error( - "Variable with name $vname present twice in model (shouldn't happen!)", - ) - end - seen_name[vname] = true - end - for (vname, seen) in seen_name - if !seen - error("Did not find variable with name $vname in instance.") - end - end -end -function test_constraintnames_equal(model, constraintnames) - seen_name = Dict(name => false for name in constraintnames) - for (F, S) in MOI.get(model, MOI.ListOfConstraintTypesPresent()) - if F == MOI.SingleVariable - continue - end - for index in MOI.get(model, MOI.ListOfConstraintIndices{F,S}()) - cname = MOI.get(model, MOI.ConstraintName(), index) - if !haskey(seen_name, cname) - error( - "Constraint with name $cname present in model but not expected list of constraint names.", - ) - end - if seen_name[cname] - error( - "Constraint with name $cname present twice in model (shouldn't happen!)", - ) - end - seen_name[cname] = true - end - end - for (cname, seen) in seen_name - if !seen - error("Did not find constraint with name $cname in instance.") - end - end -end - """ all_coefficients(p::Function, f::MOI.AbstractFunction) @@ -914,81 +871,6 @@ function Base.isone( return isone(MOI.constant(f)) && _is_constant(canonical(f)) end -""" - test_models_equal( - model1::ModelLike, - model2::ModelLike, - variablenames::Vector{String}, - constraintnames::Vector{String}, - single_variable_constraints::Vector{Tuple{String,<:MOI.AbstractScalarSet}} - ) - -Test that `model1` and `model2` are identical using `variablenames` as as keys -for the variable names and `constraintnames` as keys for the constraint names. - -In addition, it checks that there is a SingleVariable-in-Set constraint for each -`(name, set)` tuple in `single_variable_constraints`, where `name` is the name -of the corresponding variable. - -Uses `Base.Test` macros. -""" -function test_models_equal( - model1::MOI.ModelLike, - model2::MOI.ModelLike, - variablenames::Vector{String}, - constraintnames::Vector{String}, - single_variable_constraints::Vector{<:Tuple} = Tuple[], -) - for (x_name, set) in single_variable_constraints - x1 = MOI.get(model1, MOI.VariableIndex, x_name) - ci1 = MOI.ConstraintIndex{MOI.SingleVariable,typeof(set)}(x1.value) - @test MOI.is_valid(model1, ci1) - @test MOI.get(model1, MOI.ConstraintSet(), ci1) == set - x2 = MOI.get(model2, MOI.VariableIndex, x_name) - ci2 = MOI.ConstraintIndex{MOI.SingleVariable,typeof(set)}(x2.value) - @test MOI.is_valid(model2, ci2) - @test MOI.get(model2, MOI.ConstraintSet(), ci2) == set - end - # TODO: give test-friendly feedback instead of errors? - test_variablenames_equal(model1, variablenames) - test_variablenames_equal(model2, variablenames) - test_constraintnames_equal(model1, constraintnames) - test_constraintnames_equal(model2, constraintnames) - - variablemap_2to1 = Dict{VI,VI}() - for vname in variablenames - index1 = MOI.get(model1, VI, vname) - index2 = MOI.get(model2, VI, vname) - variablemap_2to1[index2] = index1 - end - - for cname in constraintnames - index1 = MOI.get(model1, CI, cname) - index2 = MOI.get(model2, CI, cname) - f1 = MOI.get(model1, MOI.ConstraintFunction(), index1) - f2 = MOI.get(model2, MOI.ConstraintFunction(), index2) - s1 = MOI.get(model1, MOI.ConstraintSet(), index1) - s2 = MOI.get(model2, MOI.ConstraintSet(), index2) - @test isapprox(f1, map_indices(variablemap_2to1, f2)) - @test s1 == s2 - end - attrs1 = MOI.get(model1, MOI.ListOfModelAttributesSet()) - attrs2 = MOI.get(model2, MOI.ListOfModelAttributesSet()) - attr_list = attrs1 ∪ attrs2 - for attr in attr_list - value1 = MOI.get(model1, attr) - value2 = MOI.get(model2, attr) - if value1 isa MOI.AbstractFunction - @test value2 isa MOI.AbstractFunction - @test isapprox(value1, map_indices(variablemap_2to1, value2)) - else - @test !(value2 isa MOI.AbstractFunction) - @test value1 == value2 - end - end - return -end - _keep_all(keep::Function, v::MOI.VariableIndex) = keep(v) function _keep_all(keep::Function, t::MOI.ScalarAffineTerm) diff --git a/test/Bridges/Constraint/geomean.jl b/test/Bridges/Constraint/geomean.jl index a562275201..142a1821ca 100644 --- a/test/Bridges/Constraint/geomean.jl +++ b/test/Bridges/Constraint/geomean.jl @@ -96,7 +96,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -135,7 +135,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -273,7 +273,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -322,7 +322,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -416,7 +416,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, ["t", "x"], @@ -455,7 +455,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["t", "x"], diff --git a/test/Bridges/Constraint/geomean_to_relentr.jl b/test/Bridges/Constraint/geomean_to_relentr.jl index 04c8a80a67..645d1caae5 100644 --- a/test/Bridges/Constraint/geomean_to_relentr.jl +++ b/test/Bridges/Constraint/geomean_to_relentr.jl @@ -106,7 +106,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, vcat(var_names, "aux"), @@ -139,7 +139,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -258,7 +258,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, vcat(var_names, "aux"), @@ -300,7 +300,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -409,7 +409,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, vcat(var_names, "aux"), @@ -442,7 +442,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Constraint/indicator_sos.jl b/test/Bridges/Constraint/indicator_sos.jl index 1495a0e497..1b36d53694 100644 --- a/test/Bridges/Constraint/indicator_sos.jl +++ b/test/Bridges/Constraint/indicator_sos.jl @@ -263,7 +263,7 @@ function test_model_equality() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -292,7 +292,7 @@ function test_model_equality() maxobjective: z """ MOI.Utilities.loadfromstring!(model, sbridged) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["z", "x"], diff --git a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl index f5e554177d..1afcb78559 100644 --- a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl +++ b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl @@ -88,7 +88,7 @@ function test_NormSpectral() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["psd"]) + MOI.Test.test_models_equal(mock, model, var_names, ["psd"]) spec = MOI.get( bridged_mock, MOI.ListOfConstraintIndices{ @@ -106,7 +106,7 @@ function test_NormSpectral() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(bridged_mock, model, var_names, ["spec"]) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["spec"]) ci = first( MOI.get( bridged_mock, @@ -234,7 +234,7 @@ function test_NormNuclear() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["greater", "psd"]) + MOI.Test.test_models_equal(mock, model, var_names, ["greater", "psd"]) MOI.set( bridged_mock, MOI.VariableName(), @@ -258,7 +258,7 @@ function test_NormNuclear() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(bridged_mock, model, ["t"], ["nuc"]) + MOI.Test.test_models_equal(bridged_mock, model, ["t"], ["nuc"]) ci = first( MOI.get( bridged_mock, diff --git a/test/Bridges/Constraint/norm_to_lp.jl b/test/Bridges/Constraint/norm_to_lp.jl index fb18f5a4b6..fbb8480f4e 100644 --- a/test/Bridges/Constraint/norm_to_lp.jl +++ b/test/Bridges/Constraint/norm_to_lp.jl @@ -92,7 +92,7 @@ function test_NormInfinity_1() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -133,7 +133,7 @@ function test_NormInfinity_1() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -216,12 +216,7 @@ function test_conic_NormInfinityCone_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - mock, - model, - var_names, - ["nonneg1", "nonneg2"], - ) + MOI.Test.test_models_equal(mock, model, var_names, ["nonneg1", "nonneg2"]) MOI.set( bridged_mock, MOI.VariableName(), @@ -255,7 +250,7 @@ function test_conic_NormInfinityCone_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -372,7 +367,7 @@ function test_conic_NormOneCone_VectorOfVariables() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, [var_names; "u"; "v"], @@ -407,7 +402,7 @@ function test_conic_NormOneCone_VectorOfVariables() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -484,7 +479,7 @@ function test_conic_NormOneCone() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names_all, @@ -522,7 +517,7 @@ function test_conic_NormOneCone() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Constraint/relentr_to_exp.jl b/test/Bridges/Constraint/relentr_to_exp.jl index 49bb24b680..846c55228c 100644 --- a/test/Bridges/Constraint/relentr_to_exp.jl +++ b/test/Bridges/Constraint/relentr_to_exp.jl @@ -93,7 +93,7 @@ function test_RelativeEntropy() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, vcat(var_names, "y1", "y2"), @@ -116,7 +116,7 @@ function test_RelativeEntropy() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(bridged_mock, model, var_names, ["relentr"]) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["relentr"]) ci = first( MOI.get( bridged_mock, diff --git a/test/Bridges/Constraint/semi_to_binary.jl b/test/Bridges/Constraint/semi_to_binary.jl index 88e8eb0028..da87a868b3 100644 --- a/test/Bridges/Constraint/semi_to_binary.jl +++ b/test/Bridges/Constraint/semi_to_binary.jl @@ -176,7 +176,7 @@ function test_SemiToBinary() MOI.empty!(bridged_mock) @test MOI.is_empty(bridged_mock) MOI.Utilities.loadfromstring!(bridged_mock, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x", "y"], @@ -221,7 +221,7 @@ function test_SemiToBinary() ), ) MOI.set(mock, MOI.ConstraintName(), ci, "cup") - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, modelb, ["x", "y", "z"], diff --git a/test/Bridges/Constraint/zero_one.jl b/test/Bridges/Constraint/zero_one.jl index ee9a28682d..854bebe370 100644 --- a/test/Bridges/Constraint/zero_one.jl +++ b/test/Bridges/Constraint/zero_one.jl @@ -107,14 +107,14 @@ function test_ZeroOne() MOI.empty!(bridged_mock) @test MOI.is_empty(bridged_mock) MOI.Utilities.loadfromstring!(bridged_mock, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x", "y"], String[], [("y", MOI.EqualTo{Float64}(1.0)), ("x", MOI.ZeroOne())], ) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, modelb, ["x", "y"], diff --git a/test/Bridges/Objective/slack.jl b/test/Bridges/Objective/slack.jl index c4bdb0c986..359c40cd1a 100644 --- a/test/Bridges/Objective/slack.jl +++ b/test/Bridges/Objective/slack.jl @@ -266,7 +266,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, [var_names; "s"], @@ -285,7 +285,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, @@ -338,7 +338,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, [var_names; "s"], @@ -356,7 +356,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Variable/flip_sign.jl b/test/Bridges/Variable/flip_sign.jl index 1a78f6bc92..3d55d0b802 100644 --- a/test/Bridges/Variable/flip_sign.jl +++ b/test/Bridges/Variable/flip_sign.jl @@ -112,7 +112,7 @@ function test_NonposToNonneg() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -128,7 +128,7 @@ function test_NonposToNonneg() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x", "z", "w", "v"], diff --git a/test/Bridges/Variable/free.jl b/test/Bridges/Variable/free.jl index ef850a7af1..4246e99b91 100644 --- a/test/Bridges/Variable/free.jl +++ b/test/Bridges/Variable/free.jl @@ -85,7 +85,7 @@ function test_modification_multirow_vectoraffine_nonpos() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["nonneg", "c"]) + MOI.Test.test_models_equal(mock, model, var_names, ["nonneg", "c"]) s = """ variables: x c: [4.0x + -1.0, 3.0x + -1.0] in MathOptInterface.Nonpositives(2) @@ -93,7 +93,7 @@ function test_modification_multirow_vectoraffine_nonpos() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(bridged_mock, model, ["x"], ["c"]) + MOI.Test.test_models_equal(bridged_mock, model, ["x"], ["c"]) return end @@ -282,12 +282,7 @@ function test_linear_transform() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - mock, - model, - var_names, - ["nonneg", "c1", "c2"], - ) + MOI.Test.test_models_equal(mock, model, var_names, ["nonneg", "c1", "c2"]) var_names = ["v1", "v2"] MOI.set(bridged_mock, MOI.VariableName(), vis, var_names) s = """ @@ -298,12 +293,7 @@ function test_linear_transform() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - bridged_mock, - model, - var_names, - ["c1", "c2"], - ) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["c1", "c2"]) _test_delete_bridged_variable( bridged_mock, vis[1], diff --git a/test/Bridges/Variable/rsoc_to_psd.jl b/test/Bridges/Variable/rsoc_to_psd.jl index 31eb970ef0..4e2d4e4934 100644 --- a/test/Bridges/Variable/rsoc_to_psd.jl +++ b/test/Bridges/Variable/rsoc_to_psd.jl @@ -71,7 +71,7 @@ function test_RSOC_of_dimension_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["cab", "c"]) + MOI.Test.test_models_equal(mock, model, var_names, ["cab", "c"]) var_names = ["x", "y"] MOI.set( bridged_mock, @@ -88,12 +88,7 @@ function test_RSOC_of_dimension_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - bridged_mock, - model, - var_names, - ["cxy", "c"], - ) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["cxy", "c"]) _test_delete_bridged_variables( bridged_mock, xy, @@ -181,7 +176,7 @@ function test_RSOC4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, var_names, @@ -223,12 +218,7 @@ function test_RSOC4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - bridged_mock, - model, - var_names, - ["rsoc", "c"], - ) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["rsoc", "c"]) v = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) @test length(v) == 4 diff --git a/test/Bridges/Variable/rsoc_to_soc.jl b/test/Bridges/Variable/rsoc_to_soc.jl index 2cc5ee97ec..c0901c7f9b 100644 --- a/test/Bridges/Variable/rsoc_to_soc.jl +++ b/test/Bridges/Variable/rsoc_to_soc.jl @@ -66,7 +66,7 @@ function test_rotatedsoc4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["soc", "c"]) + MOI.Test.test_models_equal(mock, model, var_names, ["soc", "c"]) var_names = ["t", "u", "x", "y"] MOI.set( bridged_mock, @@ -92,12 +92,7 @@ function test_rotatedsoc4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - bridged_mock, - model, - var_names, - ["rsoc", "c"], - ) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["rsoc", "c"]) tuxy = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) diff --git a/test/Bridges/Variable/soc_to_rsoc.jl b/test/Bridges/Variable/soc_to_rsoc.jl index 2c2eb61721..065782ee8e 100644 --- a/test/Bridges/Variable/soc_to_rsoc.jl +++ b/test/Bridges/Variable/soc_to_rsoc.jl @@ -67,7 +67,7 @@ function test_soc1v() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, var_names, ["rsoc", "ceq"]) + MOI.Test.test_models_equal(mock, model, var_names, ["rsoc", "ceq"]) var_names = ["x", "y", "z"] MOI.set( bridged_mock, @@ -90,12 +90,7 @@ function test_soc1v() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( - bridged_mock, - model, - var_names, - ["soc", "ceq"], - ) + MOI.Test.test_models_equal(bridged_mock, model, var_names, ["soc", "ceq"]) xyz = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) message = string( diff --git a/test/Bridges/Variable/vectorize.jl b/test/Bridges/Variable/vectorize.jl index 1e58e1e84a..1990f28a3c 100644 --- a/test/Bridges/Variable/vectorize.jl +++ b/test/Bridges/Variable/vectorize.jl @@ -62,7 +62,7 @@ function test_get_scalar_constraint() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, ["y"], ["cy", "c"]) + MOI.Test.test_models_equal(mock, model, ["y"], ["cy", "c"]) end @testset "Bridged model" begin MOI.set(bridged_mock, MOI.VariableName(), x, "x") @@ -73,7 +73,7 @@ function test_get_scalar_constraint() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x"], @@ -203,7 +203,7 @@ function test_exp3_with_add_constrained_variable_y() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal(mock, model, ["x", "z"], ["zc", "xc", "ec"]) + MOI.Test.test_models_equal(mock, model, ["x", "z"], ["zc", "xc", "ec"]) MOI.set(bridged_mock, MOI.VariableName(), y, "y") s = """ @@ -214,7 +214,7 @@ function test_exp3_with_add_constrained_variable_y() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x", "y"], diff --git a/test/Bridges/Variable/zeros.jl b/test/Bridges/Variable/zeros.jl index fddc12b412..55347ccf6b 100644 --- a/test/Bridges/Variable/zeros.jl +++ b/test/Bridges/Variable/zeros.jl @@ -46,7 +46,7 @@ function test_zeros() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( bridged_mock, model, ["x", "y", "z"], @@ -165,7 +165,7 @@ function test_zeros() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Utilities.test_models_equal( + MOI.Test.test_models_equal( mock, model, ["x"], diff --git a/test/FileFormats/CBF/CBF.jl b/test/FileFormats/CBF/CBF.jl index b01eec48fd..386fa8e932 100644 --- a/test/FileFormats/CBF/CBF.jl +++ b/test/FileFormats/CBF/CBF.jl @@ -72,7 +72,7 @@ function _test_write_then_read(model_string::String) MOI.read_from_file(model2, CBF_TEST_FILE) _set_var_and_con_names(model2) - return MOIU.test_models_equal(model1, model2, args...) + return MOI.Test.test_models_equal(model1, model2, args...) end function _test_read(filename::String, model_string::String) @@ -84,7 +84,7 @@ function _test_read(filename::String, model_string::String) MOI.read_from_file(model2, filename) _set_var_and_con_names(model2) - return MOIU.test_models_equal(model1, model2, args...) + return MOI.Test.test_models_equal(model1, model2, args...) end function test_show() diff --git a/test/FileFormats/MOF/MOF.jl b/test/FileFormats/MOF/MOF.jl index 9d8e5f4718..db7963258f 100644 --- a/test/FileFormats/MOF/MOF.jl +++ b/test/FileFormats/MOF/MOF.jl @@ -41,7 +41,7 @@ function _test_model_equality(model_string, variables, constraints; suffix = "") MOI.write_to_file(model, TEST_MOF_FILE * suffix) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE * suffix) - MOIU.test_models_equal(model, model_2, variables, constraints) + MOI.Test.test_models_equal(model, model_2, variables, constraints) return _validate(TEST_MOF_FILE * suffix) end @@ -319,7 +319,7 @@ function test_empty_model() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOIU.test_models_equal(model, model_2, String[], String[]) + return MOI.Test.test_models_equal(model, model_2, String[], String[]) end function test_FEASIBILITY_SENSE() @@ -330,7 +330,7 @@ function test_FEASIBILITY_SENSE() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOIU.test_models_equal(model, model_2, ["x"], String[]) + return MOI.Test.test_models_equal(model, model_2, ["x"], String[]) end function test_empty_function_term() @@ -346,7 +346,7 @@ function test_empty_function_term() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOIU.test_models_equal(model, model_2, ["x"], ["c"]) + return MOI.Test.test_models_equal(model, model_2, ["x"], ["c"]) end function test_min_objective() diff --git a/test/FileFormats/MPS/MPS.jl b/test/FileFormats/MPS/MPS.jl index 923b012a3d..0c9067b610 100644 --- a/test/FileFormats/MPS/MPS.jl +++ b/test/FileFormats/MPS/MPS.jl @@ -14,7 +14,7 @@ function _test_model_equality(model_string, variables, constraints) MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOIU.test_models_equal(model, model_2, variables, constraints) + return MOI.Test.test_models_equal(model, model_2, variables, constraints) end function test_show() @@ -136,7 +136,7 @@ z in ZeroOne() """, ) MOI.set(model_2, MOI.Name(), "stacked_data") - return MOIU.test_models_equal( + return MOI.Test.test_models_equal( model, model_2, ["x", "y", "z"], @@ -162,7 +162,7 @@ con1: 1.0 * x >= 1.0 x in Integer() """, ) - return MOIU.test_models_equal( + return MOI.Test.test_models_equal( model, model_2, ["x"], @@ -316,7 +316,7 @@ x >= 1.0 MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOIU.test_models_equal( + return MOI.Test.test_models_equal( model, model_2, ["x", "y", "z"], @@ -343,7 +343,7 @@ y <= 0.0 MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOIU.test_models_equal( + return MOI.Test.test_models_equal( model, model_2, ["x", "y", "z"], @@ -371,7 +371,7 @@ w in Interval(4.0, 5.0) MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOIU.test_models_equal( + return MOI.Test.test_models_equal( model, model_2, ["w", "x", "y", "z"], diff --git a/test/FileFormats/SDPA/SDPA.jl b/test/FileFormats/SDPA/SDPA.jl index cc556acf9b..187aee4bbb 100644 --- a/test/FileFormats/SDPA/SDPA.jl +++ b/test/FileFormats/SDPA/SDPA.jl @@ -69,7 +69,7 @@ function _test_write_then_read(model_string::String) MOI.set(model2, attr, MOIU.operate(-, Float64, obj)) end - return MOIU.test_models_equal(model1, model2, args...) + return MOI.Test.test_models_equal(model1, model2, args...) end function _test_read(filename::String, model_string::String) @@ -79,7 +79,7 @@ function _test_read(filename::String, model_string::String) model2 = SDPA.Model() MOI.read_from_file(model2, filename) _set_var_and_con_names(model2) - return MOIU.test_models_equal(model1, model2, args...) + return MOI.Test.test_models_equal(model1, model2, args...) end function test_show() diff --git a/test/Utilities/parser.jl b/test/Utilities/parser.jl index 82e74e4601..6707ae5554 100644 --- a/test/Utilities/parser.jl +++ b/test/Utilities/parser.jl @@ -106,7 +106,7 @@ function test_one_variable() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOIU.test_models_equal( + MOI.Test.test_models_equal( model, model2, ["x"], @@ -158,7 +158,7 @@ function test_linear_constraints() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOIU.test_models_equal( + MOI.Test.test_models_equal( model, model2, ["x", "y"], @@ -189,7 +189,7 @@ function test_minimization_linear_objective() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOIU.test_models_equal(model, model2, ["x", "y"], String[]) + MOI.Test.test_models_equal(model, model2, ["x", "y"], String[]) return end @@ -215,7 +215,7 @@ function test_maximization_linear_objective() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOIU.test_models_equal(model, model2, ["x", "y"], String[]) + MOI.Test.test_models_equal(model, model2, ["x", "y"], String[]) return end @@ -263,7 +263,7 @@ function test_SecondOrderCone_constraints() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOIU.test_models_equal( + MOI.Test.test_models_equal( model, model2, ["x", "y", "z"], diff --git a/test/deprecate.jl b/test/deprecate.jl index fc70cfd9dd..1ee91f2960 100644 --- a/test/deprecate.jl +++ b/test/deprecate.jl @@ -84,6 +84,16 @@ function test_copy_to_copy_names() return end +function test_test_models_equal() + dest = MOI.Utilities.Model{Float64}() + src = MOI.Utilities.Model{Float64}() + @test_logs( + (:warn,), + MOI.Utilities.test_models_equal(dest, src, String[], String[]), + ) + return +end + function runtests() for name in names(@__MODULE__; all = true) if startswith("$name", "test_") From 4c0a67b964b94e200ad570253fed7f49ea777100 Mon Sep 17 00:00:00 2001 From: odow Date: Tue, 24 Aug 2021 13:41:32 +1200 Subject: [PATCH 2/4] Skip test_models_equal --- src/Test/Test.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Test/Test.jl b/src/Test/Test.jl index 6c6564176c..3da1773ea9 100644 --- a/src/Test/Test.jl +++ b/src/Test/Test.jl @@ -176,6 +176,8 @@ function runtests( continue elseif !isempty(exclude) && any(s -> occursin(s, name), exclude) continue + elseif name == "test_models_equal" + continue # Hard-coded skip! end @testset "$(name)" begin test_function = getfield(@__MODULE__, name_sym) From d95ae04d98b86f1640c56f435071df3612028ab5 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 24 Aug 2021 14:44:07 +1200 Subject: [PATCH 3/4] Update functions.jl --- src/Utilities/functions.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utilities/functions.jl b/src/Utilities/functions.jl index ec2162a33d..ff853419db 100644 --- a/src/Utilities/functions.jl +++ b/src/Utilities/functions.jl @@ -1,4 +1,4 @@ -function test_models_equal(args...) +function test_models_equal(args...) @warn( "`Utilities.test_models_equal` has been moved to " * "`Test.test_models_equal`", From fb7dec3c9501b3fd3a1e270076de5b849a43a92f Mon Sep 17 00:00:00 2001 From: odow Date: Fri, 27 Aug 2021 09:33:03 +1200 Subject: [PATCH 4/4] rename --- src/Test/Test.jl | 6 ++---- src/Utilities/functions.jl | 4 ++-- test/Bridges/Constraint/geomean.jl | 12 +++++------ test/Bridges/Constraint/geomean_to_relentr.jl | 12 +++++------ test/Bridges/Constraint/indicator_sos.jl | 4 ++-- .../Constraint/norm_spec_nuc_to_psd.jl | 8 +++---- test/Bridges/Constraint/norm_to_lp.jl | 21 ++++++++++++------- test/Bridges/Constraint/relentr_to_exp.jl | 4 ++-- test/Bridges/Constraint/semi_to_binary.jl | 4 ++-- test/Bridges/Constraint/zero_one.jl | 4 ++-- test/Bridges/Objective/slack.jl | 8 +++---- test/Bridges/Variable/flip_sign.jl | 4 ++-- test/Bridges/Variable/free.jl | 18 ++++++++++++---- test/Bridges/Variable/rsoc_to_psd.jl | 18 ++++++++++++---- test/Bridges/Variable/rsoc_to_soc.jl | 9 ++++++-- test/Bridges/Variable/soc_to_rsoc.jl | 9 ++++++-- test/Bridges/Variable/vectorize.jl | 8 +++---- test/Bridges/Variable/zeros.jl | 4 ++-- test/FileFormats/CBF/CBF.jl | 4 ++-- test/FileFormats/MOF/MOF.jl | 8 +++---- test/FileFormats/MPS/MPS.jl | 17 +++++++++------ test/FileFormats/SDPA/SDPA.jl | 4 ++-- test/Utilities/parser.jl | 10 ++++----- 23 files changed, 119 insertions(+), 81 deletions(-) diff --git a/src/Test/Test.jl b/src/Test/Test.jl index 3da1773ea9..11449bd297 100644 --- a/src/Test/Test.jl +++ b/src/Test/Test.jl @@ -176,8 +176,6 @@ function runtests( continue elseif !isempty(exclude) && any(s -> occursin(s, name), exclude) continue - elseif name == "test_models_equal" - continue # Hard-coded skip! end @testset "$(name)" begin test_function = getfield(@__MODULE__, name_sym) @@ -472,7 +470,7 @@ function _test_constraintnames_equal(model, constraint_names) end """ - test_models_equal( + util_test_models_equal( model1::ModelLike, model2::ModelLike, variable_names::Vector{String}, @@ -492,7 +490,7 @@ of the corresponding variable. intended for writing tests in which all variables and constraints have unique names. """ -function test_models_equal( +function util_test_models_equal( model1::MOI.ModelLike, model2::MOI.ModelLike, variable_names::Vector{String}, diff --git a/src/Utilities/functions.jl b/src/Utilities/functions.jl index 0e7d488b55..423f091304 100644 --- a/src/Utilities/functions.jl +++ b/src/Utilities/functions.jl @@ -1,10 +1,10 @@ function test_models_equal(args...) @warn( "`Utilities.test_models_equal` has been moved to " * - "`Test.test_models_equal`", + "`Test.util_test_models_equal`", maxlog = 1, ) - return MOI.Test.test_models_equal(args...) + return MOI.Test.util_test_models_equal(args...) end variable_function_type(::Type{<:MOI.AbstractScalarSet}) = MOI.SingleVariable diff --git a/test/Bridges/Constraint/geomean.jl b/test/Bridges/Constraint/geomean.jl index 142a1821ca..2154768924 100644 --- a/test/Bridges/Constraint/geomean.jl +++ b/test/Bridges/Constraint/geomean.jl @@ -96,7 +96,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -135,7 +135,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -273,7 +273,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -322,7 +322,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -416,7 +416,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, ["t", "x"], @@ -455,7 +455,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["t", "x"], diff --git a/test/Bridges/Constraint/geomean_to_relentr.jl b/test/Bridges/Constraint/geomean_to_relentr.jl index 645d1caae5..aa56490362 100644 --- a/test/Bridges/Constraint/geomean_to_relentr.jl +++ b/test/Bridges/Constraint/geomean_to_relentr.jl @@ -106,7 +106,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, vcat(var_names, "aux"), @@ -139,7 +139,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -258,7 +258,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, vcat(var_names, "aux"), @@ -300,7 +300,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -409,7 +409,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, vcat(var_names, "aux"), @@ -442,7 +442,7 @@ function test_conic_GeometricMeanCone_VectorAffineFunction_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Constraint/indicator_sos.jl b/test/Bridges/Constraint/indicator_sos.jl index 1b36d53694..6eaca02550 100644 --- a/test/Bridges/Constraint/indicator_sos.jl +++ b/test/Bridges/Constraint/indicator_sos.jl @@ -263,7 +263,7 @@ function test_model_equality() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -292,7 +292,7 @@ function test_model_equality() maxobjective: z """ MOI.Utilities.loadfromstring!(model, sbridged) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["z", "x"], diff --git a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl index 1afcb78559..928e558823 100644 --- a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl +++ b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl @@ -88,7 +88,7 @@ function test_NormSpectral() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["psd"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["psd"]) spec = MOI.get( bridged_mock, MOI.ListOfConstraintIndices{ @@ -106,7 +106,7 @@ function test_NormSpectral() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["spec"]) + MOI.Test.util_test_models_equal(bridged_mock, model, var_names, ["spec"]) ci = first( MOI.get( bridged_mock, @@ -234,7 +234,7 @@ function test_NormNuclear() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["greater", "psd"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["greater", "psd"]) MOI.set( bridged_mock, MOI.VariableName(), @@ -258,7 +258,7 @@ function test_NormNuclear() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, ["t"], ["nuc"]) + MOI.Test.util_test_models_equal(bridged_mock, model, ["t"], ["nuc"]) ci = first( MOI.get( bridged_mock, diff --git a/test/Bridges/Constraint/norm_to_lp.jl b/test/Bridges/Constraint/norm_to_lp.jl index fbb8480f4e..4515700e34 100644 --- a/test/Bridges/Constraint/norm_to_lp.jl +++ b/test/Bridges/Constraint/norm_to_lp.jl @@ -92,7 +92,7 @@ function test_NormInfinity_1() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -133,7 +133,7 @@ function test_NormInfinity_1() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -216,7 +216,12 @@ function test_conic_NormInfinityCone_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["nonneg1", "nonneg2"]) + MOI.Test.util_test_models_equal( + mock, + model, + var_names, + ["nonneg1", "nonneg2"], + ) MOI.set( bridged_mock, MOI.VariableName(), @@ -250,7 +255,7 @@ function test_conic_NormInfinityCone_3() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -367,7 +372,7 @@ function test_conic_NormOneCone_VectorOfVariables() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, [var_names; "u"; "v"], @@ -402,7 +407,7 @@ function test_conic_NormOneCone_VectorOfVariables() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -479,7 +484,7 @@ function test_conic_NormOneCone() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names_all, @@ -517,7 +522,7 @@ function test_conic_NormOneCone() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Constraint/relentr_to_exp.jl b/test/Bridges/Constraint/relentr_to_exp.jl index 846c55228c..f2ca0adf5d 100644 --- a/test/Bridges/Constraint/relentr_to_exp.jl +++ b/test/Bridges/Constraint/relentr_to_exp.jl @@ -93,7 +93,7 @@ function test_RelativeEntropy() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, vcat(var_names, "y1", "y2"), @@ -116,7 +116,7 @@ function test_RelativeEntropy() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["relentr"]) + MOI.Test.util_test_models_equal(bridged_mock, model, var_names, ["relentr"]) ci = first( MOI.get( bridged_mock, diff --git a/test/Bridges/Constraint/semi_to_binary.jl b/test/Bridges/Constraint/semi_to_binary.jl index da87a868b3..5d53db8f28 100644 --- a/test/Bridges/Constraint/semi_to_binary.jl +++ b/test/Bridges/Constraint/semi_to_binary.jl @@ -176,7 +176,7 @@ function test_SemiToBinary() MOI.empty!(bridged_mock) @test MOI.is_empty(bridged_mock) MOI.Utilities.loadfromstring!(bridged_mock, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x", "y"], @@ -221,7 +221,7 @@ function test_SemiToBinary() ), ) MOI.set(mock, MOI.ConstraintName(), ci, "cup") - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, modelb, ["x", "y", "z"], diff --git a/test/Bridges/Constraint/zero_one.jl b/test/Bridges/Constraint/zero_one.jl index 854bebe370..b34f50de98 100644 --- a/test/Bridges/Constraint/zero_one.jl +++ b/test/Bridges/Constraint/zero_one.jl @@ -107,14 +107,14 @@ function test_ZeroOne() MOI.empty!(bridged_mock) @test MOI.is_empty(bridged_mock) MOI.Utilities.loadfromstring!(bridged_mock, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x", "y"], String[], [("y", MOI.EqualTo{Float64}(1.0)), ("x", MOI.ZeroOne())], ) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, modelb, ["x", "y"], diff --git a/test/Bridges/Objective/slack.jl b/test/Bridges/Objective/slack.jl index 359c40cd1a..8d29df1b1d 100644 --- a/test/Bridges/Objective/slack.jl +++ b/test/Bridges/Objective/slack.jl @@ -266,7 +266,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, [var_names; "s"], @@ -285,7 +285,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, @@ -338,7 +338,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, [var_names; "s"], @@ -356,7 +356,7 @@ function test_original() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, var_names, diff --git a/test/Bridges/Variable/flip_sign.jl b/test/Bridges/Variable/flip_sign.jl index 3d55d0b802..512e92ff63 100644 --- a/test/Bridges/Variable/flip_sign.jl +++ b/test/Bridges/Variable/flip_sign.jl @@ -112,7 +112,7 @@ function test_NonposToNonneg() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -128,7 +128,7 @@ function test_NonposToNonneg() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x", "z", "w", "v"], diff --git a/test/Bridges/Variable/free.jl b/test/Bridges/Variable/free.jl index 4246e99b91..6c397cc8f7 100644 --- a/test/Bridges/Variable/free.jl +++ b/test/Bridges/Variable/free.jl @@ -85,7 +85,7 @@ function test_modification_multirow_vectoraffine_nonpos() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["nonneg", "c"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["nonneg", "c"]) s = """ variables: x c: [4.0x + -1.0, 3.0x + -1.0] in MathOptInterface.Nonpositives(2) @@ -93,7 +93,7 @@ function test_modification_multirow_vectoraffine_nonpos() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, ["x"], ["c"]) + MOI.Test.util_test_models_equal(bridged_mock, model, ["x"], ["c"]) return end @@ -282,7 +282,12 @@ function test_linear_transform() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["nonneg", "c1", "c2"]) + MOI.Test.util_test_models_equal( + mock, + model, + var_names, + ["nonneg", "c1", "c2"], + ) var_names = ["v1", "v2"] MOI.set(bridged_mock, MOI.VariableName(), vis, var_names) s = """ @@ -293,7 +298,12 @@ function test_linear_transform() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["c1", "c2"]) + MOI.Test.util_test_models_equal( + bridged_mock, + model, + var_names, + ["c1", "c2"], + ) _test_delete_bridged_variable( bridged_mock, vis[1], diff --git a/test/Bridges/Variable/rsoc_to_psd.jl b/test/Bridges/Variable/rsoc_to_psd.jl index 4e2d4e4934..084939a0e3 100644 --- a/test/Bridges/Variable/rsoc_to_psd.jl +++ b/test/Bridges/Variable/rsoc_to_psd.jl @@ -71,7 +71,7 @@ function test_RSOC_of_dimension_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["cab", "c"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["cab", "c"]) var_names = ["x", "y"] MOI.set( bridged_mock, @@ -88,7 +88,12 @@ function test_RSOC_of_dimension_2() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["cxy", "c"]) + MOI.Test.util_test_models_equal( + bridged_mock, + model, + var_names, + ["cxy", "c"], + ) _test_delete_bridged_variables( bridged_mock, xy, @@ -176,7 +181,7 @@ function test_RSOC4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, var_names, @@ -218,7 +223,12 @@ function test_RSOC4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["rsoc", "c"]) + MOI.Test.util_test_models_equal( + bridged_mock, + model, + var_names, + ["rsoc", "c"], + ) v = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) @test length(v) == 4 diff --git a/test/Bridges/Variable/rsoc_to_soc.jl b/test/Bridges/Variable/rsoc_to_soc.jl index c0901c7f9b..7d5b87a852 100644 --- a/test/Bridges/Variable/rsoc_to_soc.jl +++ b/test/Bridges/Variable/rsoc_to_soc.jl @@ -66,7 +66,7 @@ function test_rotatedsoc4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["soc", "c"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["soc", "c"]) var_names = ["t", "u", "x", "y"] MOI.set( bridged_mock, @@ -92,7 +92,12 @@ function test_rotatedsoc4() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["rsoc", "c"]) + MOI.Test.util_test_models_equal( + bridged_mock, + model, + var_names, + ["rsoc", "c"], + ) tuxy = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) diff --git a/test/Bridges/Variable/soc_to_rsoc.jl b/test/Bridges/Variable/soc_to_rsoc.jl index 065782ee8e..fc10f86049 100644 --- a/test/Bridges/Variable/soc_to_rsoc.jl +++ b/test/Bridges/Variable/soc_to_rsoc.jl @@ -67,7 +67,7 @@ function test_soc1v() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, var_names, ["rsoc", "ceq"]) + MOI.Test.util_test_models_equal(mock, model, var_names, ["rsoc", "ceq"]) var_names = ["x", "y", "z"] MOI.set( bridged_mock, @@ -90,7 +90,12 @@ function test_soc1v() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(bridged_mock, model, var_names, ["soc", "ceq"]) + MOI.Test.util_test_models_equal( + bridged_mock, + model, + var_names, + ["soc", "ceq"], + ) xyz = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) message = string( diff --git a/test/Bridges/Variable/vectorize.jl b/test/Bridges/Variable/vectorize.jl index 1990f28a3c..2a5b31c4d3 100644 --- a/test/Bridges/Variable/vectorize.jl +++ b/test/Bridges/Variable/vectorize.jl @@ -62,7 +62,7 @@ function test_get_scalar_constraint() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, ["y"], ["cy", "c"]) + MOI.Test.util_test_models_equal(mock, model, ["y"], ["cy", "c"]) end @testset "Bridged model" begin MOI.set(bridged_mock, MOI.VariableName(), x, "x") @@ -73,7 +73,7 @@ function test_get_scalar_constraint() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x"], @@ -203,7 +203,7 @@ function test_exp3_with_add_constrained_variable_y() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal(mock, model, ["x", "z"], ["zc", "xc", "ec"]) + MOI.Test.util_test_models_equal(mock, model, ["x", "z"], ["zc", "xc", "ec"]) MOI.set(bridged_mock, MOI.VariableName(), y, "y") s = """ @@ -214,7 +214,7 @@ function test_exp3_with_add_constrained_variable_y() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x", "y"], diff --git a/test/Bridges/Variable/zeros.jl b/test/Bridges/Variable/zeros.jl index 55347ccf6b..aa2aac8d23 100644 --- a/test/Bridges/Variable/zeros.jl +++ b/test/Bridges/Variable/zeros.jl @@ -46,7 +46,7 @@ function test_zeros() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( bridged_mock, model, ["x", "y", "z"], @@ -165,7 +165,7 @@ function test_zeros() """ model = MOI.Utilities.Model{Float64}() MOI.Utilities.loadfromstring!(model, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( mock, model, ["x"], diff --git a/test/FileFormats/CBF/CBF.jl b/test/FileFormats/CBF/CBF.jl index 386fa8e932..3612ba75a8 100644 --- a/test/FileFormats/CBF/CBF.jl +++ b/test/FileFormats/CBF/CBF.jl @@ -72,7 +72,7 @@ function _test_write_then_read(model_string::String) MOI.read_from_file(model2, CBF_TEST_FILE) _set_var_and_con_names(model2) - return MOI.Test.test_models_equal(model1, model2, args...) + return MOI.Test.util_test_models_equal(model1, model2, args...) end function _test_read(filename::String, model_string::String) @@ -84,7 +84,7 @@ function _test_read(filename::String, model_string::String) MOI.read_from_file(model2, filename) _set_var_and_con_names(model2) - return MOI.Test.test_models_equal(model1, model2, args...) + return MOI.Test.util_test_models_equal(model1, model2, args...) end function test_show() diff --git a/test/FileFormats/MOF/MOF.jl b/test/FileFormats/MOF/MOF.jl index db7963258f..fb50c0e66b 100644 --- a/test/FileFormats/MOF/MOF.jl +++ b/test/FileFormats/MOF/MOF.jl @@ -41,7 +41,7 @@ function _test_model_equality(model_string, variables, constraints; suffix = "") MOI.write_to_file(model, TEST_MOF_FILE * suffix) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE * suffix) - MOI.Test.test_models_equal(model, model_2, variables, constraints) + MOI.Test.util_test_models_equal(model, model_2, variables, constraints) return _validate(TEST_MOF_FILE * suffix) end @@ -319,7 +319,7 @@ function test_empty_model() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOI.Test.test_models_equal(model, model_2, String[], String[]) + return MOI.Test.util_test_models_equal(model, model_2, String[], String[]) end function test_FEASIBILITY_SENSE() @@ -330,7 +330,7 @@ function test_FEASIBILITY_SENSE() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOI.Test.test_models_equal(model, model_2, ["x"], String[]) + return MOI.Test.util_test_models_equal(model, model_2, ["x"], String[]) end function test_empty_function_term() @@ -346,7 +346,7 @@ function test_empty_function_term() MOI.write_to_file(model, TEST_MOF_FILE) model_2 = MOF.Model() MOI.read_from_file(model_2, TEST_MOF_FILE) - return MOI.Test.test_models_equal(model, model_2, ["x"], ["c"]) + return MOI.Test.util_test_models_equal(model, model_2, ["x"], ["c"]) end function test_min_objective() diff --git a/test/FileFormats/MPS/MPS.jl b/test/FileFormats/MPS/MPS.jl index 0c9067b610..5ddf39ff71 100644 --- a/test/FileFormats/MPS/MPS.jl +++ b/test/FileFormats/MPS/MPS.jl @@ -14,7 +14,12 @@ function _test_model_equality(model_string, variables, constraints) MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOI.Test.test_models_equal(model, model_2, variables, constraints) + return MOI.Test.util_test_models_equal( + model, + model_2, + variables, + constraints, + ) end function test_show() @@ -136,7 +141,7 @@ z in ZeroOne() """, ) MOI.set(model_2, MOI.Name(), "stacked_data") - return MOI.Test.test_models_equal( + return MOI.Test.util_test_models_equal( model, model_2, ["x", "y", "z"], @@ -162,7 +167,7 @@ con1: 1.0 * x >= 1.0 x in Integer() """, ) - return MOI.Test.test_models_equal( + return MOI.Test.util_test_models_equal( model, model_2, ["x"], @@ -316,7 +321,7 @@ x >= 1.0 MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOI.Test.test_models_equal( + return MOI.Test.util_test_models_equal( model, model_2, ["x", "y", "z"], @@ -343,7 +348,7 @@ y <= 0.0 MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOI.Test.test_models_equal( + return MOI.Test.util_test_models_equal( model, model_2, ["x", "y", "z"], @@ -371,7 +376,7 @@ w in Interval(4.0, 5.0) MOI.write_to_file(model, MPS_TEST_FILE) model_2 = MPS.Model() MOI.read_from_file(model_2, MPS_TEST_FILE) - return MOI.Test.test_models_equal( + return MOI.Test.util_test_models_equal( model, model_2, ["w", "x", "y", "z"], diff --git a/test/FileFormats/SDPA/SDPA.jl b/test/FileFormats/SDPA/SDPA.jl index 187aee4bbb..cf7bc82c8d 100644 --- a/test/FileFormats/SDPA/SDPA.jl +++ b/test/FileFormats/SDPA/SDPA.jl @@ -69,7 +69,7 @@ function _test_write_then_read(model_string::String) MOI.set(model2, attr, MOIU.operate(-, Float64, obj)) end - return MOI.Test.test_models_equal(model1, model2, args...) + return MOI.Test.util_test_models_equal(model1, model2, args...) end function _test_read(filename::String, model_string::String) @@ -79,7 +79,7 @@ function _test_read(filename::String, model_string::String) model2 = SDPA.Model() MOI.read_from_file(model2, filename) _set_var_and_con_names(model2) - return MOI.Test.test_models_equal(model1, model2, args...) + return MOI.Test.util_test_models_equal(model1, model2, args...) end function test_show() diff --git a/test/Utilities/parser.jl b/test/Utilities/parser.jl index 5e292b0599..2e284cdf93 100644 --- a/test/Utilities/parser.jl +++ b/test/Utilities/parser.jl @@ -111,7 +111,7 @@ function test_one_variable() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( model, model2, ["x"], @@ -163,7 +163,7 @@ function test_linear_constraints() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( model, model2, ["x", "y"], @@ -194,7 +194,7 @@ function test_minimization_linear_objective() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOI.Test.test_models_equal(model, model2, ["x", "y"], String[]) + MOI.Test.util_test_models_equal(model, model2, ["x", "y"], String[]) return end @@ -220,7 +220,7 @@ function test_maximization_linear_objective() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOI.Test.test_models_equal(model, model2, ["x", "y"], String[]) + MOI.Test.util_test_models_equal(model, model2, ["x", "y"], String[]) return end @@ -268,7 +268,7 @@ function test_SecondOrderCone_constraints() model2 = MOIU.Model{Float64}() MOIU.loadfromstring!(model2, s) - MOI.Test.test_models_equal( + MOI.Test.util_test_models_equal( model, model2, ["x", "y", "z"],