Skip to content

Commit b7ce03e

Browse files
Adopt SciMLTesting v1.2 folder-based run_tests (on top of grouped-tests conversion)
Core = top-level test/*.jl (systems, reactions, rules, events, utils, simresults, wuschel) — exactly the grouped Core set; the Core files stay at the top level so cd(@__DIR__)/joinpath("data", ...) and @__DIR__ log paths still resolve against test/. test/data/ is a non-group fixtures folder (not discovered). QA stays in test/qa/. runtests.jl becomes `using SciMLTesting; run_tests()`. SciMLTesting added to the root test deps (Pkg dropped, SafeTestsets compat widened to 0.1,1) and to the qa sub-env. Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 229174f commit b7ce03e

3 files changed

Lines changed: 10 additions & 38 deletions

File tree

Project.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ OrdinaryDiffEq = "6.107, 7"
2222
Plots = "1.41.6"
2323
SBML = "1.6"
2424
SBMLToolkitTestSuite = "0.0.5"
25-
SafeTestsets = "0.1"
25+
SafeTestsets = "0.1, 1"
26+
SciMLTesting = "1"
2627
Sundials = "4.28, 5"
2728
SymbolicUtils = "3.32, 4"
2829
Symbolics = "6.58, 7"
@@ -36,12 +37,12 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
3637
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
3738
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
3839
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
39-
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
4040
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
4141
SBMLToolkitTestSuite = "792e603a-1588-414c-b272-614011baa40e"
4242
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
43+
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
4344
Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
4445
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4546

4647
[targets]
47-
test = ["Aqua", "CSV", "DataFrames", "Downloads", "ExplicitImports", "OrdinaryDiffEq", "Pkg", "Plots", "SafeTestsets", "SBMLToolkitTestSuite", "Sundials", "Test"]
48+
test = ["Aqua", "CSV", "DataFrames", "Downloads", "ExplicitImports", "OrdinaryDiffEq", "Plots", "SafeTestsets", "SBMLToolkitTestSuite", "SciMLTesting", "Sundials", "Test"]

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
SBMLToolkit = "86080e66-c8ac-44c2-a1a0-9adaadfe4a4e"
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 @@ SBMLToolkit = {path = "../.."}
1012
[compat]
1113
Aqua = "0.8.16"
1214
ExplicitImports = "1.14.0"
15+
SafeTestsets = "0.1, 1"
16+
SciMLTesting = "1"
1317
Test = "1"
1418
julia = "1.10"

test/runtests.jl

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,3 @@
1-
using Pkg
1+
using SciMLTesting
22

3-
using SafeTestsets, Test
4-
5-
const GROUP = get(ENV, "GROUP", "All")
6-
7-
if GROUP == "QA"
8-
Pkg.activate(joinpath(@__DIR__, "qa"))
9-
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
10-
Pkg.instantiate()
11-
include("qa/qa.jl")
12-
else
13-
@safetestset "SBMLToolkit.jl" begin
14-
@safetestset "Systems" begin
15-
include("systems.jl")
16-
end
17-
@safetestset "Reactions" begin
18-
include("reactions.jl")
19-
end
20-
@safetestset "Rules" begin
21-
include("rules.jl")
22-
end
23-
@safetestset "Events" begin
24-
include("events.jl")
25-
end
26-
@safetestset "Utils" begin
27-
include("utils.jl")
28-
end
29-
@safetestset "Simulation results" begin
30-
include("simresults.jl")
31-
end
32-
@safetestset "Wuschel" begin
33-
include("wuschel.jl")
34-
end
35-
end
36-
end
3+
run_tests()

0 commit comments

Comments
 (0)