Skip to content

Commit da612c0

Browse files
test: make tests independent of parameter order
1 parent af1f7c6 commit da612c0

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

test/discrete_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ for df in [
4242
# iip
4343
du = zeros(3)
4444
u = collect(1:3)
45-
p = MTKParameters(syss, parameters(syss) .=> collect(1:5))
45+
p = MTKParameters(syss, [c, nsteps, δt, β, γ] .=> collect(1:5))
4646
df.f(du, u, p, 0)
4747
@test du [0.01831563888873422, 0.9816849729159067, 4.999999388195359]
4848

test/labelledarrays.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,6 @@ u0 = @LArray [9998.0, 1.0, 1.0, 1.0] (:S, :I, :R, :C)
8787
problem = ODEProblem(SIR!, u0, tspan, p)
8888
sys = complete(modelingtoolkitize(problem))
8989

90-
@test all(isequal.(parameters(sys), getproperty.(@variables(β, η, ω, φ, σ, μ), :val)))
90+
@test all(any(isequal(x), parameters(sys))
91+
for x in ModelingToolkit.unwrap.(@variables(β, η, ω, φ, σ, μ)))
9192
@test all(isequal.(Symbol.(unknowns(sys)), Symbol.(@variables(S(t), I(t), R(t), C(t)))))

test/model_parsing.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,9 @@ end
534534
@named else_in_sys = InsideTheBlock(flag = 3)
535535
else_in_sys = complete(else_in_sys)
536536

537-
@test getname.(parameters(if_in_sys)) == [:if_parameter, :eq]
538-
@test getname.(parameters(elseif_in_sys)) == [:elseif_parameter, :eq]
539-
@test getname.(parameters(else_in_sys)) == [:else_parameter, :eq]
537+
@test sort(getname.(parameters(if_in_sys))) == [:eq, :if_parameter]
538+
@test sort(getname.(parameters(elseif_in_sys))) == [:elseif_parameter, :eq]
539+
@test sort(getname.(parameters(else_in_sys))) == [:else_parameter, :eq]
540540

541541
@test getdefault(if_in_sys.if_parameter) == 100
542542
@test getdefault(elseif_in_sys.elseif_parameter) == 101

test/precompile_test.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using ODEPrecompileTest
1010

1111
u = collect(1:3)
1212
p = ModelingToolkit.MTKParameters(ODEPrecompileTest.f_noeval_good.sys,
13-
parameters(ODEPrecompileTest.f_noeval_good.sys) .=> collect(4:6))
13+
[, , ] .=> collect(4:6))
1414

1515
# These cases do not work, because they get defined in the ModelingToolkit's RGF cache.
1616
@test parentmodule(typeof(ODEPrecompileTest.f_bad.f.f_iip).parameters[2]) == ModelingToolkit

0 commit comments

Comments
 (0)