Skip to content

Commit 7ab54f7

Browse files
Adopt SciMLTesting v1.2 folder-based run_tests (on top of grouped-tests conversion)
FVM's Core group is a capability/shared-module driver: the test files use `using ..FiniteVolumeMethod` and a shared `test_functions.jl` include, and Core also runs the docs/src/literate_tutorials and literate_wyos example files (outside test/) with file-count assertions. That does not partition into self-contained group folders, so this uses v1.2 explicit-args mode rather than forcing folder-discovery: * The whole original Core driver (the `safe_include` helper + the nested `@testset`s, verbatim) moves into test/core_tests.jl and is passed as the `core =` file body. The `@safetestset` wrapper supplies `using Test`, and core_tests.jl's `using FiniteVolumeMethod` makes the nested-module `using ..FiniteVolumeMethod` in each included test file resolve exactly as before. * QA: top-level test/qa.jl moves into test/qa/qa.jl (the existing qa sub-env), run as `qa = (; env = test/qa, body = test/qa/qa.jl)`. * `all = ["Core"]` keeps GROUP=All to Core only (QA stays its own lane), matching the original `if GROUP == "QA" ... else <Core> end` routing. Adds SciMLTesting + SafeTestsets to the main test env and the qa sub-env; drops Pkg from the test env (only the old hand-rolled harness used it). Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent b39abe3 commit 7ab54f7

5 files changed

Lines changed: 105 additions & 103 deletions

File tree

‎test/Project.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ NaturalNeighbours = "f16ad982-4edb-46b1-8125-78e5a8b5a9e6"
2121
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
2222
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
2323
PolygonOps = "647866c9-e3ac-4575-94e7-e3d426903924"
24-
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
2524
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2625
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
2726
Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
27+
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
28+
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
2829
SimpleGraphs = "55797a34-41de-5266-9ec1-32ac4eb504d3"
2930
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
3031
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
@@ -57,6 +58,8 @@ OrdinaryDiffEq = "7.0.0"
5758
PolygonOps = "0.1.2"
5859
ReferenceTests = "0.10.6"
5960
Roots = "3.0.0"
61+
SafeTestsets = "0.1, 1"
62+
SciMLTesting = "1"
6063
SimpleGraphs = "0.8.10"
6164
SpecialFunctions = "2.8.0"
6265
StableRNGs = "1.0.4"

‎test/core_tests.jl‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
using FiniteVolumeMethod
2+
using Dates
3+
4+
ct() = Dates.format(now(), "HH:MM:SS")
5+
function safe_include(filename; name = filename) # Workaround for not being able to interpolate into SafeTestset test names
6+
mod = @eval module $(gensym()) end
7+
@info "[$(ct())] Testing $name"
8+
return @testset verbose = true "Example: $name" begin
9+
Base.include(mod, filename)
10+
end
11+
end
12+
13+
@testset verbose = true "FiniteVolumeMethod.jl" begin
14+
@testset verbose = true "Geometry" begin
15+
safe_include("geometry.jl")
16+
end
17+
@testset verbose = true "Conditions" begin
18+
safe_include("conditions.jl")
19+
end
20+
@testset verbose = true "Problem" begin
21+
safe_include("problem.jl")
22+
end
23+
@testset verbose = true "Equations" begin
24+
safe_include("equations.jl")
25+
end
26+
@testset verbose = true "README" begin
27+
safe_include("README.jl")
28+
end
29+
30+
@testset verbose = true "Tutorials" begin
31+
dir = joinpath(dirname(@__DIR__), "docs", "src", "literate_tutorials")
32+
files = readdir(dir)
33+
file_names = [
34+
"diffusion_equation_in_a_wedge_with_mixed_boundary_conditions.jl",
35+
"diffusion_equation_on_a_square_plate.jl",
36+
"diffusion_equation_on_an_annulus.jl",
37+
"equilibrium_temperature_distribution_with_mixed_boundary_conditions_and_using_ensembleproblems.jl",
38+
"helmholtz_equation_with_inhomogeneous_boundary_conditions.jl",
39+
"laplaces_equation_with_internal_dirichlet_conditions.jl",
40+
"mean_exit_time.jl",
41+
"piecewise_linear_and_natural_neighbour_interpolation_for_an_advection_diffusion_equation.jl",
42+
"porous_fisher_equation_and_travelling_waves.jl",
43+
"porous_medium_equation.jl",
44+
"reaction_diffusion_brusselator_system_of_pdes.jl",
45+
"reaction_diffusion_equation_with_a_time_dependent_dirichlet_boundary_condition_on_a_disk.jl",
46+
"solving_mazes_with_laplaces_equation.jl",
47+
"gray_scott_model_turing_patterns_from_a_coupled_reaction_diffusion_system.jl",
48+
] # do it manually just to make it easier for testing individual files rather than in a loop, e.g. one like
49+
#=
50+
for file in files
51+
@testset "Example: $file" begin
52+
safe_include(joinpath(dir, file))
53+
end
54+
end
55+
=#
56+
@test length(files) == length(file_names) # make sure we didn't miss any
57+
safe_include(joinpath(dir, file_names[1]); name = file_names[1]) # diffusion_equation_in_a_wedge_with_mixed_boundary_conditions
58+
safe_include(joinpath(dir, file_names[2]); name = file_names[2]) # diffusion_equation_on_a_square_plate
59+
safe_include(joinpath(dir, file_names[3]); name = file_names[3]) # diffusion_equation_on_an_annulus
60+
safe_include(joinpath(dir, file_names[4]); name = file_names[4]) # equilibrium_temperature_distribution_with_mixed_boundary_conditions_and_using_ensembleproblems
61+
safe_include(joinpath(dir, file_names[5]); name = file_names[5]) # helmholtz_equation_with_inhomogeneous_boundary_conditions
62+
safe_include(joinpath(dir, file_names[6]); name = file_names[6]) # laplaces_equation_with_internal_dirichlet_conditions
63+
safe_include(joinpath(dir, file_names[7]); name = file_names[7]) # mean_exit_time
64+
safe_include(joinpath(dir, file_names[8]); name = file_names[8]) # piecewise_linear_and_natural_neighbour_interpolation_for_an_advection_diffusion_equation
65+
safe_include(joinpath(dir, file_names[9]); name = file_names[9]) # porous_fisher_equation_and_travelling_waves
66+
safe_include(joinpath(dir, file_names[10]); name = file_names[10]) # porous_medium_equation
67+
safe_include(joinpath(dir, file_names[11]); name = file_names[11]) # reaction_diffusion_brusselator_system_of_pdes
68+
safe_include(joinpath(dir, file_names[12]); name = file_names[12]) # reaction_diffusion_equation_with_a_time_dependent_dirichlet_boundary_condition_on_a_disk
69+
safe_include(joinpath(dir, file_names[13]); name = file_names[13]) # solving_mazes_with_laplaces_equation
70+
safe_include(joinpath(dir, file_names[14]); name = file_names[14]) # gray_scott_model_turing_patterns_from_a_coupled_reaction_diffusion_system
71+
# safe_include(joinpath(dir, file_names[15]); name=file_names[15]) # keller_segel_chemotaxis
72+
end
73+
74+
@testset verbose = true "Custom Templates" begin
75+
dir = joinpath(dirname(@__DIR__), "docs", "src", "literate_wyos")
76+
files = readdir(dir)
77+
file_names = [
78+
"diffusion_equations.jl",
79+
"mean_exit_time.jl",
80+
"linear_reaction_diffusion_equations.jl",
81+
"poissons_equation.jl",
82+
"laplaces_equation.jl",
83+
]
84+
@test length(files) == length(file_names) # make sure we didn't miss any
85+
safe_include(joinpath(dir, file_names[1]); name = file_names[1]) # diffusion_equations
86+
safe_include(joinpath(dir, file_names[2]); name = file_names[2]) # mean_exit_time
87+
safe_include(joinpath(dir, file_names[3]); name = file_names[3]) # linear_reaction_diffusion_equations
88+
safe_include(joinpath(dir, file_names[4]); name = file_names[4]) # poissons_equation
89+
safe_include(joinpath(dir, file_names[5]); name = file_names[5]) # laplaces_equation
90+
end
91+
end

‎test/qa/Project.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
33
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
44
FiniteVolumeMethod = "d4f04ab7-4f65-4d72-8a28-7087bc7f46f4"
5+
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
6+
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
57
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
68

79
[sources]
@@ -10,5 +12,7 @@ FiniteVolumeMethod = {path = "../.."}
1012
[compat]
1113
Aqua = "0.7, 0.8"
1214
ExplicitImports = "1.15.0"
15+
SafeTestsets = "0.1, 1"
16+
SciMLTesting = "1"
1317
Test = "1"
1418
julia = "1.10"
File renamed without changes.

‎test/runtests.jl‎

Lines changed: 6 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,7 @@
1-
using Test
1+
using SciMLTesting
22

3-
const GROUP = get(ENV, "GROUP", "All")
4-
5-
if GROUP == "QA"
6-
import Pkg
7-
Pkg.activate(joinpath(@__DIR__, "qa"))
8-
Pkg.develop(path = dirname(@__DIR__))
9-
Pkg.instantiate()
10-
include("qa.jl")
11-
else
12-
using FiniteVolumeMethod
13-
using Dates
14-
15-
ct() = Dates.format(now(), "HH:MM:SS")
16-
function safe_include(filename; name = filename) # Workaround for not being able to interpolate into SafeTestset test names
17-
mod = @eval module $(gensym()) end
18-
@info "[$(ct())] Testing $name"
19-
return @testset verbose = true "Example: $name" begin
20-
Base.include(mod, filename)
21-
end
22-
end
23-
24-
@testset verbose = true "FiniteVolumeMethod.jl" begin
25-
@testset verbose = true "Geometry" begin
26-
safe_include("geometry.jl")
27-
end
28-
@testset verbose = true "Conditions" begin
29-
safe_include("conditions.jl")
30-
end
31-
@testset verbose = true "Problem" begin
32-
safe_include("problem.jl")
33-
end
34-
@testset verbose = true "Equations" begin
35-
safe_include("equations.jl")
36-
end
37-
@testset verbose = true "README" begin
38-
safe_include("README.jl")
39-
end
40-
41-
@testset verbose = true "Tutorials" begin
42-
dir = joinpath(dirname(@__DIR__), "docs", "src", "literate_tutorials")
43-
files = readdir(dir)
44-
file_names = [
45-
"diffusion_equation_in_a_wedge_with_mixed_boundary_conditions.jl",
46-
"diffusion_equation_on_a_square_plate.jl",
47-
"diffusion_equation_on_an_annulus.jl",
48-
"equilibrium_temperature_distribution_with_mixed_boundary_conditions_and_using_ensembleproblems.jl",
49-
"helmholtz_equation_with_inhomogeneous_boundary_conditions.jl",
50-
"laplaces_equation_with_internal_dirichlet_conditions.jl",
51-
"mean_exit_time.jl",
52-
"piecewise_linear_and_natural_neighbour_interpolation_for_an_advection_diffusion_equation.jl",
53-
"porous_fisher_equation_and_travelling_waves.jl",
54-
"porous_medium_equation.jl",
55-
"reaction_diffusion_brusselator_system_of_pdes.jl",
56-
"reaction_diffusion_equation_with_a_time_dependent_dirichlet_boundary_condition_on_a_disk.jl",
57-
"solving_mazes_with_laplaces_equation.jl",
58-
"gray_scott_model_turing_patterns_from_a_coupled_reaction_diffusion_system.jl",
59-
] # do it manually just to make it easier for testing individual files rather than in a loop, e.g. one like
60-
#=
61-
for file in files
62-
@testset "Example: $file" begin
63-
safe_include(joinpath(dir, file))
64-
end
65-
end
66-
=#
67-
@test length(files) == length(file_names) # make sure we didn't miss any
68-
safe_include(joinpath(dir, file_names[1]); name = file_names[1]) # diffusion_equation_in_a_wedge_with_mixed_boundary_conditions
69-
safe_include(joinpath(dir, file_names[2]); name = file_names[2]) # diffusion_equation_on_a_square_plate
70-
safe_include(joinpath(dir, file_names[3]); name = file_names[3]) # diffusion_equation_on_an_annulus
71-
safe_include(joinpath(dir, file_names[4]); name = file_names[4]) # equilibrium_temperature_distribution_with_mixed_boundary_conditions_and_using_ensembleproblems
72-
safe_include(joinpath(dir, file_names[5]); name = file_names[5]) # helmholtz_equation_with_inhomogeneous_boundary_conditions
73-
safe_include(joinpath(dir, file_names[6]); name = file_names[6]) # laplaces_equation_with_internal_dirichlet_conditions
74-
safe_include(joinpath(dir, file_names[7]); name = file_names[7]) # mean_exit_time
75-
safe_include(joinpath(dir, file_names[8]); name = file_names[8]) # piecewise_linear_and_natural_neighbour_interpolation_for_an_advection_diffusion_equation
76-
safe_include(joinpath(dir, file_names[9]); name = file_names[9]) # porous_fisher_equation_and_travelling_waves
77-
safe_include(joinpath(dir, file_names[10]); name = file_names[10]) # porous_medium_equation
78-
safe_include(joinpath(dir, file_names[11]); name = file_names[11]) # reaction_diffusion_brusselator_system_of_pdes
79-
safe_include(joinpath(dir, file_names[12]); name = file_names[12]) # reaction_diffusion_equation_with_a_time_dependent_dirichlet_boundary_condition_on_a_disk
80-
safe_include(joinpath(dir, file_names[13]); name = file_names[13]) # solving_mazes_with_laplaces_equation
81-
safe_include(joinpath(dir, file_names[14]); name = file_names[14]) # gray_scott_model_turing_patterns_from_a_coupled_reaction_diffusion_system
82-
# safe_include(joinpath(dir, file_names[15]); name=file_names[15]) # keller_segel_chemotaxis
83-
end
84-
85-
@testset verbose = true "Custom Templates" begin
86-
dir = joinpath(dirname(@__DIR__), "docs", "src", "literate_wyos")
87-
files = readdir(dir)
88-
file_names = [
89-
"diffusion_equations.jl",
90-
"mean_exit_time.jl",
91-
"linear_reaction_diffusion_equations.jl",
92-
"poissons_equation.jl",
93-
"laplaces_equation.jl",
94-
]
95-
@test length(files) == length(file_names) # make sure we didn't miss any
96-
safe_include(joinpath(dir, file_names[1]); name = file_names[1]) # diffusion_equations
97-
safe_include(joinpath(dir, file_names[2]); name = file_names[2]) # mean_exit_time
98-
safe_include(joinpath(dir, file_names[3]); name = file_names[3]) # linear_reaction_diffusion_equations
99-
safe_include(joinpath(dir, file_names[4]); name = file_names[4]) # poissons_equation
100-
safe_include(joinpath(dir, file_names[5]); name = file_names[5]) # laplaces_equation
101-
end
102-
end
103-
end
3+
run_tests(;
4+
core = joinpath(@__DIR__, "core_tests.jl"),
5+
qa = (; env = joinpath(@__DIR__, "qa"), body = joinpath(@__DIR__, "qa", "qa.jl")),
6+
all = ["Core"],
7+
)

0 commit comments

Comments
 (0)