finish ODE discrete tests

Author: isaacsas

test/root_equations.jl

@@ -336,11 +336,11 @@ sys = structural_simplify(model)
 @test isempty(ModelingToolkit.continuous_events(sys))
 
 let
-    function testsol(osys, u0, p, tspan; tstops = Float64[], kwargs...)
+    function testsol(osys, u0, p, tspan; tstops = Float64[], skipparamtest = false, kwargs...)
         oprob = ODEProblem(osys, u0, tspan, p; kwargs...)
         sol = solve(oprob, Tsit5(); tstops = tstops, abstol = 1e-10, reltol = 1e-10)
         @test isapprox(sol(1.0000000001)[1] - sol(0.999999999)[1], 1.0; rtol = 1e-6)
-        @test oprob.p[1] == 1.0
+        !skipparamtest && (@test oprob.p[1] == 1.0)
         @test isapprox(sol(4.0)[1], 2 * exp(-2.0))
         sol
     end
@@ -390,8 +390,20 @@ let
     @named osys4 = ODESystem(eqs, t, [A], [k, t1], discrete_events = [cb1, cb2‵‵])
     oprob4 = ODEProblem(osys4, u0, tspan, p)
     testsol(osys4, u0, p, tspan; tstops = [1.0])
+
     # mixing with symbolic condition in the func affect
     cb2‵‵‵ = (t == t2) => (affect!, [], [k], nothing)
     @named osys5 = ODESystem(eqs, t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵‵‵])
     testsol(osys5, u0, p, tspan; tstops = [1.0, 2.0])
+    @named osys6 = ODESystem(eqs, t, [A], [k, t1, t2], discrete_events = [cb2‵‵‵, cb1])
+    testsol(osys6, u0, p, tspan; tstops = [1.0, 2.0])
+
+    # mix a continuous event too
+    cond3 = A ~ .1
+    affect3 = [k ~ 0.0]
+    cb3 = cond3 => affect3
+    @named osys7 = ODESystem(eqs, t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵‵‵],
+                             continuous_events = [cb3])
+    sol = testsol(osys7, u0, p, (0.0, 10.0); tstops = [1.0, 2.0], skipparamtest = true)
+    @test isapprox(sol(10.0)[1], .1; atol=1e-10, rtol=1e-10)
 end