refactor direct tests

Author: ChrisRackauckas

test/direct.jl

@@ -10,6 +10,17 @@ eqs = [σ*(y-x),
        x*(ρ-z)-y,
        x*y - β*z]
 
+simpexpr = [
+   :(σ * (y - x))
+   :(x * (ρ - z) - y)
+   :(x * y - β * z)
+   ]
+
+for i in 1:3
+   @test ModelingToolkit.simplified_expr.(eqs)[i] == simpexpr[i]
+   @test ModelingToolkit.simplified_expr.(eqs)[i] == simpexpr[i]
+end
+
 ∂ = ModelingToolkit.jacobian(eqs,[x,y,z])
 for i in 1:3
     ∇ = ModelingToolkit.gradient(eqs[i],[x,y,z])

test/runtests.jl

@@ -3,4 +3,5 @@ using ModelingToolkit, Test
 @testset "Parsing Test" begin include("variable_parsing.jl") end
 @testset "Differentiation Test" begin include("derivatives.jl") end
 @testset "Simplify Test" begin include("simplify.jl") end
+@testset "Direct Usage Test" begin include("direct.jl") end
 @testset "System Construction Test" begin include("system_construction.jl") end

test/system_construction.jl

@@ -31,17 +31,6 @@ eqs = [D(x) ~ σ*(y-x),
        D(y) ~ x*(ρ-z)-y,
        D(z) ~ x*y - β*z]
 
-simpexpr = [
-    :(derivative(x(t), t) = σ * (y(t) - x(t)))
-    :(derivative(y(t), t) = x(t) * (ρ - z(t)) - y(t))
-    :(derivative(z(t), t) = x(t) * y(t) - β * z(t))
-    ]
-
-for i in 1:3
-    @test ModelingToolkit.simplified_expr.(eqs)[i].args[1] == simpexpr[i].args[1]
-    @test ModelingToolkit.simplified_expr.(eqs)[i].args[2] == simpexpr[i].args[2].args[2]
-end
-
 ModelingToolkit.simplified_expr.(eqs)[1]
 :(derivative(x(t), t) = σ * (y(t) - x(t))).args
 de = ODESystem(eqs)