Skip to content

Commit 5a0bd4f

Browse files
authored
Fix DeprecatedTest in modellike that were using copy_names (#1591)
1 parent c2e237b commit 5a0bd4f

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

src/DeprecatedTest/modellike.jl

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,8 @@ function start_values_test(dest::MOI.ModelLike, src::MOI.ModelLike)
644644
@test MOI.supports(dest, cdattr, MOI.ConstraintIndex{F2,S2})
645645
end
646646
@testset "Attribute set to no indices" begin
647-
dict = MOI.copy_to(dest, src, copy_names = false)
647+
filtered = MOI.Utilities.ModelFilter(name_filter, src)
648+
dict = MOI.copy_to(dest, filtered)
648649
@test !(vpattr in MOI.get(dest, MOI.ListOfVariableAttributesSet()))
649650
@test MOI.get(dest, vpattr, dict[x]) === nothing
650651
@test MOI.get(dest, vpattr, dict[y]) === nothing
@@ -675,7 +676,8 @@ function start_values_test(dest::MOI.ModelLike, src::MOI.ModelLike)
675676
MOI.set(src, cpattr, b, 2.0)
676677
MOI.set(src, cdattr, b, 2.0)
677678
MOI.set(src, cdattr, c, [3.0])
678-
dict = MOI.copy_to(dest, src, copy_names = false)
679+
filtered = MOI.Utilities.ModelFilter(name_filter, src)
680+
dict = MOI.copy_to(dest, filtered)
679681
@test vpattr in MOI.get(dest, MOI.ListOfVariableAttributesSet())
680682
@test MOI.get(dest, vpattr, dict[x]) == 1.0
681683
@test MOI.get(dest, vpattr, dict[y]) === nothing
@@ -695,6 +697,11 @@ function start_values_test(dest::MOI.ModelLike, src::MOI.ModelLike)
695697
end
696698
end
697699

700+
name_filter(::Any) = true
701+
name_filter(::MOI.Name) = false
702+
name_filter(::MOI.VariableName) = false
703+
name_filter(::MOI.ConstraintName) = false
704+
698705
function copytest(dest::MOI.ModelLike, src::MOI.ModelLike; copy_names = false)
699706
@test MOI.supports_incremental_interface(src)
700707
MOI.empty!(src)
@@ -755,7 +762,12 @@ function copytest(dest::MOI.ModelLike, src::MOI.ModelLike; copy_names = false)
755762
MOI.VectorAffineFunction{Float64},
756763
MOI.Zeros,
757764
)
758-
dict = MOI.copy_to(dest, src, copy_names = copy_names)
765+
if copy_names
766+
dict = MOI.copy_to(dest, src)
767+
else
768+
filtered = MOI.Utilities.ModelFilter(name_filter, src)
769+
dict = MOI.copy_to(dest, filtered)
770+
end
759771
dest_name(src_name) = copy_names ? src_name : ""
760772
@test !MOI.supports(dest, MOI.Name()) ||
761773
MOI.get(dest, MOI.Name()) == dest_name("ModelName")

0 commit comments

Comments
 (0)