fixup! test: add extensive modelingtoolkitize tests

Author: AayushSabharwal

test/modelingtoolkitize.jl

@@ -417,46 +417,52 @@ sys = modelingtoolkitize(prob)
         @test is_parameter(sys, :q)
     end
 
-    @variables x(t)=1.0 y(t)=2.0
-    @parameters p=3.0 q=4.0
-    @mtkbuild sys = ODESystem([D(x) ~ p * y, D(y) ~ q * x], t)
-    prob1 = ODEProblem(sys, [], (0.0, 5.0))
-    newsys = modelingtoolkitize(prob1)
-    @test is_variable(newsys, newsys.x)
-    @test is_variable(newsys, newsys.y)
-    @test is_parameter(newsys, newsys.p)
-    @test is_parameter(newsys, newsys.q)
-    prob2 = ODEProblem(newsys, [], (0.0, 5.0))
-
-    sol1 = solve(prob1, Tsit5())
-    sol2 = solve(prob2, Tsit5())
-    @test sol1 ≈ sol2
-
-    @variables x=1.0 y=2.0
-    @mtkbuild nlsys = NonlinearSystem([0 ~ p * y^2 + x, 0 ~ y + x * q])
-    prob1 = NonlinearProblem(nlsys, [])
-    newsys = modelingtoolkitize(prob1)
-    @test is_variable(newsys, newsys.x)
-    @test is_variable(newsys, newsys.y)
-    @test is_parameter(newsys, newsys.p)
-    @test is_parameter(newsys, newsys.q)
-    prob2 = NonlinearProblem(newsys, [])
-
-    sol1 = solve(prob1)
-    sol2 = solve(prob2)
-    @test sol1 ≈ sol2
-
-    @mtkbuild optsys = OptimizationSystem((x - p)^3 + y^2 - q)
-    prob1 = OptimizationProblem(optsys, [])
-    newsys = modelingtoolkitize(prob1)
-    @test is_variable(newsys, newsys.x)
-    @test is_variable(newsys, newsys.y)
-    @test is_parameter(newsys, newsys.p)
-    @test is_parameter(newsys, newsys.q)
-    prob2 = OptimizationProblem(newsys, [])
-
-    sol1 = solve(prob1, LBFGS())
-    sol2 = solve(prob2, LBFGS())
-
-    @test sol1 ≈ sol2
+    @testset "From MTK model" begin
+        @testset "ODE" begin
+            @variables x(t)=1.0 y(t)=2.0
+            @parameters p=3.0 q=4.0
+            @mtkbuild sys = ODESystem([D(x) ~ p * y, D(y) ~ q * x], t)
+            prob1 = ODEProblem(sys, [], (0.0, 5.0))
+            newsys = complete(modelingtoolkitize(prob1))
+            @test is_variable(newsys, newsys.x)
+            @test is_variable(newsys, newsys.y)
+            @test is_parameter(newsys, newsys.p)
+            @test is_parameter(newsys, newsys.q)
+            prob2 = ODEProblem(newsys, [], (0.0, 5.0))
+
+            sol1 = solve(prob1, Tsit5())
+            sol2 = solve(prob2, Tsit5())
+            @test sol1 ≈ sol2
+        end
+        @testset "Nonlinear" begin
+            @variables x=1.0 y=2.0
+            @mtkbuild nlsys = NonlinearSystem([0 ~ p * y^2 + x, 0 ~ y + x * q])
+            prob1 = NonlinearProblem(nlsys, [])
+            newsys = complete(modelingtoolkitize(prob1))
+            @test is_variable(newsys, newsys.x)
+            @test is_variable(newsys, newsys.y)
+            @test is_parameter(newsys, newsys.p)
+            @test is_parameter(newsys, newsys.q)
+            prob2 = NonlinearProblem(newsys, [])
+
+            sol1 = solve(prob1)
+            sol2 = solve(prob2)
+            @test sol1 ≈ sol2
+        end
+        @testset "Optimization" begin
+            @mtkbuild optsys = OptimizationSystem((x - p)^3 + y^2 - q)
+            prob1 = OptimizationProblem(optsys, [])
+            newsys = complete(modelingtoolkitize(prob1))
+            @test is_variable(newsys, newsys.x)
+            @test is_variable(newsys, newsys.y)
+            @test is_parameter(newsys, newsys.p)
+            @test is_parameter(newsys, newsys.q)
+            prob2 = OptimizationProblem(newsys, [])
+
+            sol1 = solve(prob1, LBFGS())
+            sol2 = solve(prob2, LBFGS())
+
+            @test sol1 ≈ sol2
+        end
+    end
 end