refactor tests

Author: vyudu

test/odesystem.jl

@@ -1673,18 +1673,3 @@ end
     prob = ODEProblem{false}(lowered_dae_sys; u0_constructor = x -> SVector(x...))
     @test prob.u0 isa SVector
 end
-
-@testset "input map validation" begin
-    import ModelingToolkit: InvalidKeyError 
-    @variables x(t) y(t) z(t)
-    @parameters a b c d 
-    eqs = [D(x) ~ x*a, D(y) ~ y*c, D(z) ~ b + d]
-    @mtkbuild sys = ODESystem(eqs, t)
-    pmap = [a => 1, b => 2, c => 3, d => 4, "b" => 2]
-    u0map = [x => 1, y => 2, z => 3]
-    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
-
-    pmap = [a => 1, b => 2, c => 3, d => 4]
-    u0map = [x => 1, y => 2, z => 3, :0 => 3]
-    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
-end

test/problem_validation.jl

@@ -2,6 +2,7 @@ using ModelingToolkit
 using ModelingToolkit: t_nounits as t, D_nounits as D
 
 @testset "Input map validation" begin
+    import ModelingToolkit: InvalidKeyError, MissingParametersError 
     @variables X(t)
     @parameters p d
     eqs = [D(X) ~ p - d*X]
@@ -10,16 +11,24 @@ using ModelingToolkit: t_nounits as t, D_nounits as D
     p = "I accidentally renamed p"
     u0 = [X => 1.0]
     ps = [p => 1.0, d => 0.5]
-    @test_throws ModelingToolkit.BadKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
+    @test_throws MissingParametersError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
 
     @parameters p d
     ps = [p => 1.0, d => 0.5, "Random stuff" => 3.0]
-    @test_throws ModelingToolkit.BadKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
+    @test_throws InvalidKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
 
     u0 = [:X => 1.0, "random" => 3.0]
-    @test_throws ModelingToolkit.BadKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
+    @test_throws InvalidKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
 
-    @parameters k
-    ps = [p => 1., d => 0.5, k => 3.]
-    @test_throws ModelingToolkit.BadKeyError oprob = ODEProblem(osys, u0, (0.0, 1.0), ps)
+    @variables x(t) y(t) z(t)
+    @parameters a b c d 
+    eqs = [D(x) ~ x*a, D(y) ~ y*c, D(z) ~ b + d]
+    @mtkbuild sys = ODESystem(eqs, t)
+    pmap = [a => 1, b => 2, c => 3, d => 4, "b" => 2]
+    u0map = [x => 1, y => 2, z => 3]
+    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
+
+    pmap = [a => 1, b => 2, c => 3, d => 4]
+    u0map = [x => 1, y => 2, z => 3, :0 => 3]
+    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
 end