Skip to content

Commit d956864

Browse files
AayushSabharwalAayushSabharwal
committed
test: do not use @mtkmodel in tests
1 parent df6c944 commit d956864

22 files changed

+1000
-966
lines changed

‎lib/ModelingToolkitBase/test/analysis_points.jl‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -693,17 +693,26 @@ using DynamicQuantities
693693

694694
@testset "AnalysisPoint is ignored when verifying units" begin
695695
# no units first
696-
@mtkmodel FirstOrderTest begin
697-
@components begin
696+
@component function FirstOrderTest(; name)
697+
pars = @parameters begin
698+
end
699+
700+
systems = @named begin
698701
in = Step()
699702
fb = Feedback()
700703
fo = SecondOrder(k = 1, w = 1, d = 0.1)
701704
end
702-
@equations begin
705+
706+
vars = @variables begin
707+
end
708+
709+
equations = Equation[
703710
connect(in.output, :u, fb.input1)
704711
connect(fb.output, :e, fo.input)
705712
connect(fo.output, :y, fb.input2)
706-
end
713+
]
714+
715+
return System(equations, t, vars, pars; name, systems)
707716
end
708717
@named model = FirstOrderTest()
709718
@test model isa System
@@ -735,38 +744,48 @@ using DynamicQuantities
735744
]
736745
return System(eqs, t, [], pars; systems, name)
737746
end
738-
@mtkmodel TestAPAroundUnits begin
739-
@components begin
747+
@component function TestAPAroundUnits(; name)
748+
pars = @parameters begin
749+
end
750+
751+
systems = @named begin
740752
input = UnitfulInput()
753+
ub = UnitfulBlock()
741754
end
742-
@variables begin
755+
756+
vars = @variables begin
743757
output(t), [output=true, unit=u"m^2"]
744758
end
745-
@components begin
746-
ub = UnitfulBlock()
747-
end
748-
@equations begin
759+
760+
equations = Equation[
749761
connect(ub.output, :ap, input)
750762
output ~ input.u^2
751-
end
763+
]
764+
765+
return System(equations, t, vars, pars; name, systems)
752766
end
753767
@named sys = TestAPAroundUnits()
754768
@test sys isa System
755769

756-
@mtkmodel TestAPWithNoOutputs begin
757-
@components begin
770+
@component function TestAPWithNoOutputs(; name)
771+
pars = @parameters begin
772+
end
773+
774+
systems = @named begin
758775
input = UnitfulInput()
776+
ub = UnitfulBlock()
759777
end
760-
@variables begin
778+
779+
vars = @variables begin
761780
output(t), [output=true, unit=u"m^2"]
762781
end
763-
@components begin
764-
ub = UnitfulBlock()
765-
end
766-
@equations begin
782+
783+
equations = Equation[
767784
connect(ub.output, :ap, input)
768785
output ~ input.u^2
769-
end
786+
]
787+
788+
return System(equations, t, vars, pars; name, systems)
770789
end
771790
@named sys2 = TestAPWithNoOutputs()
772791
@test sys2 isa System

‎lib/ModelingToolkitBase/test/basic_transformations.jl‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,48 +256,72 @@ end
256256

257257
@testset "Change independent variable, no equations" begin
258258
# make this "look" like the standard library RealInput
259-
@mtkmodel Input begin
260-
@variables begin
259+
@component function Input(; name)
260+
pars = @parameters begin
261+
end
262+
263+
systems = @named begin
264+
end
265+
266+
vars = @variables begin
261267
u(t)
262268
end
269+
270+
equations = Equation[]
271+
272+
return System(equations, t, vars, pars; name, systems)
263273
end
264274
@named input_sys = Input()
265275
input_sys = complete(input_sys)
266276
# test no failures
267277
@test change_independent_variable(input_sys, input_sys.u) isa System
268278

269-
@mtkmodel NestedInput begin
270-
@components begin
279+
@component function NestedInput(; name)
280+
pars = @parameters begin
281+
end
282+
283+
systems = @named begin
271284
in = Input()
272285
end
273-
@variables begin
286+
287+
vars = @variables begin
274288
x(t)
275289
end
276-
@equations begin
290+
291+
equations = Equation[
277292
D(x) ~ in.u
278-
end
293+
]
294+
295+
return System(equations, t, vars, pars; name, systems)
279296
end
280297
@named nested_input_sys = NestedInput()
281298
nested_input_sys = complete(nested_input_sys; flatten = false)
282299
@test change_independent_variable(nested_input_sys, nested_input_sys.x) isa System
283300
end
284301

285302
@testset "Change of variables, connections" begin
286-
@mtkmodel ConnectSys begin
287-
@components begin
303+
@component function ConnectSys(; name)
304+
pars = @parameters begin
305+
end
306+
307+
systems = @named begin
288308
in = RealInput()
289309
out = RealOutput()
290310
end
291-
@variables begin
311+
312+
vars = @variables begin
292313
x(t)
293314
y(t)
294315
end
295-
@equations begin
316+
317+
equations = Equation[
296318
connect(in, out)
297319
in.u ~ x
298320
D(x) ~ -out.u
299321
D(y) ~ 1
300-
end
322+
]
323+
324+
return System(equations, t, vars, pars; name, systems)
301325
end
302326
@named sys = ConnectSys()
303327
sys = complete(sys; flatten = false)

‎lib/ModelingToolkitBase/test/causal_variables_connection.jl‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,44 @@ if @isdefined(ModelingToolkit)
9696
end
9797

9898
@testset "Outside input to inside input connection" begin
99-
@mtkmodel Inner begin
100-
@variables begin
99+
@component function Inner(; name)
100+
pars = @parameters begin
101+
end
102+
103+
systems = @named begin
104+
end
105+
106+
vars = @variables begin
101107
x(t), [input = true]
102108
y(t), [output = true]
103109
end
104-
@equations begin
110+
111+
equations = Equation[
105112
y ~ x
106-
end
113+
]
114+
115+
return System(equations, t, vars, pars; name, systems)
107116
end
108-
@mtkmodel Outer begin
109-
@variables begin
110-
u(t), [input = true]
111-
v(t), [output = true]
117+
118+
@component function Outer(; name)
119+
pars = @parameters begin
112120
end
113-
@components begin
121+
122+
systems = @named begin
114123
inner = Inner()
115124
end
116-
@equations begin
125+
126+
vars = @variables begin
127+
u(t), [input = true]
128+
v(t), [output = true]
129+
end
130+
131+
equations = Equation[
117132
connect(u, inner.x)
118133
connect(inner.y, v)
119-
end
134+
]
135+
136+
return System(equations, t, vars, pars; name, systems)
120137
end
121138
@named sys = Outer()
122139
ss = toggle_namespacing(sys, false)

‎lib/ModelingToolkitBase/test/common/serial_inductor.jl‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,41 @@ import ModelingToolkitStandardLibrary.Electrical as El
22
import ModelingToolkitStandardLibrary.Blocks as Bl
33
using SciCompDSL
44

5-
@mtkmodel LLModel begin
6-
@components begin
5+
@component function LLModel(; name)
6+
pars = @parameters begin
7+
end
8+
9+
systems = @named begin
710
shape = Bl.Constant(k = 10.0)
811
source = El.Voltage()
912
resistor = El.Resistor(R = 1.0)
1013
inductor1 = El.Inductor(L = 1.0e-2)
1114
inductor2 = El.Inductor(L = 2.0e-2)
1215
ground = El.Ground()
1316
end
14-
@equations begin
17+
18+
vars = @variables begin
19+
end
20+
21+
equations = Equation[
1522
connect(shape.output, source.V)
1623
connect(source.p, resistor.p)
1724
connect(resistor.n, inductor1.p)
1825
connect(inductor1.n, inductor2.p)
1926
connect(source.n, inductor2.n)
2027
connect(inductor2.n, ground.g)
21-
end
28+
]
29+
30+
return System(equations, t, vars, pars; name, systems)
2231
end
2332

2433
@named ll_model = LLModel()
2534

26-
@mtkmodel LL2Model begin
27-
@components begin
35+
@component function LL2Model(; name)
36+
pars = @parameters begin
37+
end
38+
39+
systems = @named begin
2840
shape = Bl.Constant(k = 10.0)
2941
source = El.Voltage()
3042
resistor1 = El.Resistor(R = 1.0)
@@ -33,7 +45,11 @@ end
3345
inductor2 = El.Inductor(L = 2.0e-2)
3446
ground = El.Ground()
3547
end
36-
@equations begin
48+
49+
vars = @variables begin
50+
end
51+
52+
equations = Equation[
3753
connect(shape.output, source.V)
3854
connect(source.p, inductor1.p)
3955
connect(inductor1.n, resistor1.p)
@@ -42,7 +58,9 @@ end
4258
connect(resistor2.n, inductor2.p)
4359
connect(source.n, inductor2.n)
4460
connect(inductor2.n, ground.g)
45-
end
61+
]
62+
63+
return System(equations, t, vars, pars; name, systems)
4664
end
4765

4866
@named ll2_model = LL2Model()

‎lib/ModelingToolkitBase/test/complex.jl‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,24 @@ using ModelingToolkitBase: t_nounits as t
33
using SciCompDSL
44
using Test
55

6-
@mtkmodel ComplexModel begin
7-
@variables begin
6+
@component function ComplexModel(; name)
7+
pars = @parameters begin
8+
end
9+
10+
systems = @named begin
11+
end
12+
13+
vars = @variables begin
814
x(t)
915
y(t)
1016
z(t)::Complex{Real}
1117
end
12-
@equations begin
18+
19+
equations = Equation[
1320
z ~ x + im * y
14-
end
21+
]
22+
23+
return System(equations, t, vars, pars; name, systems)
1524
end
1625
@named mixed = ComplexModel()
1726
@test length(equations(mixed)) == 2

0 commit comments

Comments
 (0)