Skip to content

Commit

Permalink
test: use SafeTestsets
Browse files Browse the repository at this point in the history
  • Loading branch information
AayushSabharwal committed Nov 28, 2024
1 parent 5cf91e1 commit 443ca97
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "AlgebraicMultigrid", "DiffEqCallbacks", "ODEProblemLibrary", "DAEProblemLibrary", "ForwardDiff", "SparseDiffTools", "SparseConnectivityTracer", "IncompleteLU", "ModelingToolkit"]
test = ["Test", "AlgebraicMultigrid", "DiffEqCallbacks", "ODEProblemLibrary", "DAEProblemLibrary", "ForwardDiff", "SparseDiffTools", "SparseConnectivityTracer", "IncompleteLU", "ModelingToolkit", "SafeTestsets"]
43 changes: 22 additions & 21 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
using Sundials
using SafeTestsets
using Test

@testset "Generator" begin
include("generator.jl")
end

@testset "CVODE" begin
@testset "Roberts CVODE Simplified" begin
@safetestset "Roberts CVODE Simplified" begin
include("cvode_Roberts_simplified.jl")
end
@testset "Roberts CVODE Direct" begin
@safetestset "Roberts CVODE Direct" begin
include("cvode_Roberts_dns.jl")
end
#@testset "CVODES Direct" begin include("cvodes_dns.jl") end
end

@testset "IDA" begin
@testset "Roberts IDA Simplified" begin
@safetestset "Roberts IDA Simplified" begin
include("ida_Roberts_simplified.jl")
end
@testset "Roberts IDA Direct" begin
@safetestset "Roberts IDA Direct" begin
include("ida_Roberts_dns.jl")
end
@testset "Heat IDA Direct" begin
@safetestset "Heat IDA Direct" begin
include("ida_Heat2D.jl")
end
# Commented out because still uses the syntax from Grid which is a deprecated package
#@testset "Cable IDA Direct" begin include("ida_Cable.jl") end
end

@testset "ARK" begin
@testset "Roberts ARKStep Direct" begin
@safetestset "Roberts ARKStep Direct" begin
include("arkstep_Roberts_dns.jl")
end
@testset "NonLinear ERKStep Direct" begin
@safetestset "NonLinear ERKStep Direct" begin
include("erkstep_nonlin.jl")
end
#@testset "MRI two way couple" begin include("mri_twowaycouple.jl") end
end

@testset "Kinsol" begin
@testset "Kinsol Simplified" begin
@safetestset "Kinsol Simplified" begin
include("kinsol_mkin_simplified.jl")
end
@testset "Kinsol MKin" begin
@safetestset "Kinsol MKin" begin
include("kinsol_mkinTest.jl")
end
@testset "Kinsol Banded" begin
@safetestset "Kinsol Banded" begin
include("kinsol_banded.jl")
end
@testset "Kinsol NonlinearSolve" begin
@safetestset "Kinsol NonlinearSolve" begin
include("kinsol_nonlinear_solve.jl")
end
end
Expand All @@ -58,34 +59,34 @@ end
end

@testset "Common Interface" begin
@testset "CVODE" begin
@safetestset "CVODE" begin
include("common_interface/cvode.jl")
end
@testset "ARKODE" begin
@safetestset "ARKODE" begin
include("common_interface/arkode.jl")
end
@testset "IDA" begin
@safetestset "IDA" begin
include("common_interface/ida.jl")
end
@testset "Jacobians" begin
@safetestset "Jacobians" begin
include("common_interface/jacobians.jl")
end
@testset "Callbacks" begin
@safetestset "Callbacks" begin
include("common_interface/callbacks.jl")
end
@testset "Iterator" begin
@safetestset "Iterator" begin
include("common_interface/iterators.jl")
end
@testset "Errors" begin
@safetestset "Errors" begin
include("common_interface/errors.jl")
end
@testset "Mass Matrix" begin
@safetestset "Mass Matrix" begin
include("common_interface/mass_matrix.jl")
end
@testset "Preconditioners" begin
@safetestset "Preconditioners" begin
include("common_interface/precs.jl")
end
@testset "Initialization" begin
@safetestset "Initialization" begin
include("common_interface/initialization.jl")
end
end
Expand Down

0 comments on commit 443ca97

Please sign in to comment.