diff --git a/Project.toml b/Project.toml index 3e91a0a..ab82f66 100644 --- a/Project.toml +++ b/Project.toml @@ -30,12 +30,12 @@ DocStringExtensions = "0.9.3" Flux = "0.14.16, 0.15, 0.16" Functors = "0.4.11, 0.5" LinearAlgebra = "1.10" -Pkg = "1.10" Random = "1.10" Reexport = "1.2.2" -SafeTestsets = "0.1" +SafeTestsets = "0.1, 1" SciMLBase = "3.1" SciMLSensitivity = "7.62" +SciMLTesting = "1" SparseArrays = "1.10" Statistics = "1.10" StochasticDiffEq = "6.66, 7" @@ -47,9 +47,9 @@ julia = "1.10" [extras] Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Distributions", "Test", "SafeTestsets", "Pkg"] +test = ["Distributions", "Test", "SafeTestsets", "SciMLTesting"] diff --git a/test/qa/Project.toml b/test/qa/Project.toml index f39eca8..1821c27 100644 --- a/test/qa/Project.toml +++ b/test/qa/Project.toml @@ -1,6 +1,8 @@ [deps] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" HighDimPDE = "57c578d5-59d4-4db8-a490-a9fc372d19d2" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] @@ -8,5 +10,7 @@ HighDimPDE = {path = "../.."} [compat] Aqua = "0.8" +SafeTestsets = "0.0.1, 0.1, 1" +SciMLTesting = "1" Test = "1" julia = "1.10" diff --git a/test/runtests.jl b/test/runtests.jl index 2107021..a18a7cc 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,22 +1,2 @@ -using SafeTestsets, Test, Pkg - -const GROUP = get(ENV, "GROUP", "All") - -if GROUP == "QA" - Pkg.activate(joinpath(@__DIR__, "qa")) - Pkg.develop(PackageSpec(path = joinpath(@__DIR__, ".."))) - Pkg.instantiate() - @time @safetestset "Quality Assurance" include(joinpath("qa", "qa.jl")) -else - @testset "HighDimPDE" begin - @time @safetestset "ProblemConstructors" include("ProblemConstructor.jl") - @time @safetestset "reflect" include("reflect.jl") - @time @safetestset "MLP" include("MLP.jl") - @time @safetestset "Deep Splitting" include("DeepSplitting.jl") - @time @safetestset "Deep Splitting" include("DeepBSDE.jl") - @time @safetestset "MC Sample" include("MCSample.jl") - @time @safetestset "NNStopping" include("NNStopping.jl") - @time @safetestset "NNKolmogorov" include("NNKolmogorov.jl") - @time @safetestset "NNParamKolmogorov" include("NNParamKolmogorov.jl") - end -end +using SciMLTesting +run_tests() diff --git a/test/DeepBSDE_Han.jl b/test/shared/DeepBSDE_Han.jl similarity index 100% rename from test/DeepBSDE_Han.jl rename to test/shared/DeepBSDE_Han.jl