Skip to content

Commit 101bd0d

Browse files
authored
Fix warnings and deprecations in tests (#262)
1 parent 9083299 commit 101bd0d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

test/compiler.jl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ end
252252
vi2 = VarInfo(f2())
253253
vi3 = VarInfo(f3())
254254
@test haskey(vi1.metadata, :y)
255-
@test vi1.metadata.y.vns[1] == VarName{:y}()
255+
@test vi1.metadata.y.vns[1] == @varname(y)
256256
@test haskey(vi2.metadata, :y)
257-
@test vi2.metadata.y.vns[1] == VarName{:y}(((2,), (Colon(), 1)))
257+
@test vi2.metadata.y.vns[1] == @varname(y[2][:, 1])
258258
@test haskey(vi3.metadata, :y)
259-
@test vi3.metadata.y.vns[1] == VarName{:y}(((1,),))
259+
@test vi3.metadata.y.vns[1] == @varname(y[1])
260260
end
261261
@testset "custom tilde" begin
262262
@model demo() = begin
@@ -326,22 +326,22 @@ end
326326
m = demo2(missing, missing)
327327
vi = VarInfo(m)
328328
ks = keys(vi)
329-
@test VarName(:x) ks
330-
@test VarName(:y) ks
329+
@test @varname(x) ks
330+
@test @varname(y) ks
331331

332332
# Observation in top-level.
333333
m = demo2(missing, 1.0)
334334
vi = VarInfo(m)
335335
ks = keys(vi)
336-
@test VarName(:x) ks
337-
@test VarName(:y) ks
336+
@test @varname(x) ks
337+
@test @varname(y) ks
338338

339339
# Observation in nested model.
340340
m = demo2(1000.0, missing)
341341
vi = VarInfo(m)
342342
ks = keys(vi)
343-
@test VarName(:x) ks
344-
@test VarName(:y) ks
343+
@test @varname(x) ks
344+
@test @varname(y) ks
345345

346346
# Observe all.
347347
m = demo2(1000.0, 0.5)
@@ -350,13 +350,13 @@ end
350350
@test isempty(ks)
351351

352352
# Check values makes sense.
353-
@model function demo2(x, y)
353+
@model function demo3(x, y)
354354
@submodel demo1(x)
355355
return y ~ Normal(x)
356356
end
357-
m = demo2(1000.0, missing)
357+
m = demo3(1000.0, missing)
358358
# Mean of `y` should be close to 1000.
359-
@test abs(mean([VarInfo(m)[VarName(:y)] for i in 1:10]) - 1000) 10
359+
@test abs(mean([VarInfo(m)[@varname(y)] for i in 1:10]) - 1000) 10
360360

361361
# Prefixed submodels and usage of submodel return values.
362362
@model function demo_return(x)
@@ -373,10 +373,10 @@ end
373373
m = demo_useval(missing, missing)
374374
vi = VarInfo(m)
375375
ks = keys(vi)
376-
@test VarName(Symbol("sub1.x")) ks
377-
@test VarName(Symbol("sub2.x")) ks
378-
@test VarName(:z) ks
379-
@test abs(mean([VarInfo(m)[VarName(:z)] for i in 1:10]) - 100) 10
376+
@test VarName{Symbol("sub1.x")}() ks
377+
@test VarName{Symbol("sub2.x")}() ks
378+
@test @varname(z) ks
379+
@test abs(mean([VarInfo(m)[@varname(z)] for i in 1:10]) - 100) 10
380380

381381
# AR1 model. Dynamic prefixing.
382382
@model function AR1(num_steps, α, μ, σ, ::Type{TV}=Vector{Float64}) where {TV}
@@ -410,7 +410,7 @@ end
410410
vi = VarInfo(m)
411411

412412
for k in [, , , Symbol("ar1_1.η"), Symbol("ar1_2.η")]
413-
@test VarName(k) keys(vi)
413+
@test VarName{k}() keys(vi)
414414
end
415415
end
416416

0 commit comments

Comments
 (0)