Add any function for Bridges.runtests

src/Bridges/Bridges.jl

@@ -220,39 +220,35 @@
 """
     runtests(
         Bridge::Type{<:AbstractBridge},
-        input::String,
-        output::String;
+        input_fn::Function,
+        output_fn::Function;
         variable_start = 1.2,
         constraint_start = 1.2,
         eltype = Float64,
     )
 
 Run a series of tests that check the correctness of `Bridge`.
 
-`input` and `output` are models in the style of
-[`MOI.Utilities.loadfromstring!`](@ref).
+`input_fn` and `output_fn` are functions such that `input_fn(model)`
+and `output_fn(model)` load the corresponding model into `model`.
 
 ## Example
 
 ```jldoctest; setup=:(import MathOptInterface as MOI)
 julia> MOI.Bridges.runtests(
            MOI.Bridges.Constraint.ZeroOneBridge,
-           \"\"\"
-           variables: x
-           x in ZeroOne()
-           \"\"\",
-           \"\"\"
-           variables: x
-           x in Integer()
-           1.0 * x in Interval(0.0, 1.0)
-           \"\"\",
+           model -> MOI.add_constrained_variable(model, MOI.ZeroOne()),
+           model -> begin
+               x, _ = MOI.add_constrained_variable(model, MOI.Integer())
+               MOI.add_constraint(model, 1.0 * x, MOI.Interval(0.0, 1.0))
+           end,
        )
 ```
 """
 function runtests(
     Bridge::Type{<:AbstractBridge},
-    input::String,
-    output::String;
+    input_fn::Function,
+    output_fn::Function;
     variable_start = 1.2,
     constraint_start = 1.2,
     eltype = Float64,
@@ -261,7 +257,7 @@
     # Load model and bridge it
     inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{eltype}())
     model = _bridged_model(Bridge{eltype}, inner)
-    MOI.Utilities.loadfromstring!(model, input)
+    input_fn(model)
     final_touch(model)
     # Should be able to call final_touch multiple times.
     final_touch(model)
@@ -270,11 +266,11 @@
     end
     # Load a non-bridged input model, and check that getters are the same.
     test = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{eltype}())
-    MOI.Utilities.loadfromstring!(test, input)
+    input_fn(test)
     _test_structural_identical(test, model)
     # Load a bridged target model, and check that getters are the same.
     target = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{eltype}())
-    MOI.Utilities.loadfromstring!(target, output)
+    output_fn(target)
     _test_structural_identical(target, inner)
     # Test VariablePrimalStart
     attr = MOI.VariablePrimalStart()
@@ -318,6 +314,53 @@
     return
 end
 
+"""
+    runtests(
+        Bridge::Type{<:AbstractBridge},
+        input::String,
+        output::String;
+        variable_start = 1.2,
+        constraint_start = 1.2,
+        eltype = Float64,
+    )
+
+Run a series of tests that check the correctness of `Bridge`.
+
+`input` and `output` are models in the style of
+[`MOI.Utilities.loadfromstring!`](@ref).
+
+## Example
+
+```jldoctest; setup=:(import MathOptInterface as MOI)
+julia> MOI.Bridges.runtests(
+           MOI.Bridges.Constraint.ZeroOneBridge,
+           \"\"\"
+           variables: x
+           x in ZeroOne()
+           \"\"\",
+           \"\"\"
+           variables: x
+           x in Integer()
+           1.0 * x in Interval(0.0, 1.0)
+           \"\"\",
+       )
+```
+"""
+function runtests(
+    Bridge::Type{<:AbstractBridge},
+    input::String,
+    output::String;
+    kwargs...,
+)
+    runtests(
+        Bridge,
+        model -> MOI.Utilities.loadfromstring!(model, input),
+        model -> MOI.Utilities.loadfromstring!(model, output);
+        kwargs...,
+    )
+    return
+end
+
 _test_delete(::Type{<:Variable.AbstractBridge}, model, inner) = nothing
 
 function _test_delete(Bridge, model, inner)