diff --git a/Project.toml b/Project.toml index dd93ab32..8c8a6828 100644 --- a/Project.toml +++ b/Project.toml @@ -63,13 +63,13 @@ LinearAlgebra = "1.10" MCIntegration = "0.4.2" MonteCarloIntegration = "0.2" Mooncake = "0.5.6" -Pkg = "1.10" QuadGK = "2.11" Random = "1.10" Reexport = "1.2" -SafeTestsets = "0.1" +SafeTestsets = "0.1, 1" SciMLBase = "2.104, 3.0" SciMLLogging = "1.10.1, 2" +SciMLTesting = "1" StaticArrays = "1.6.4" Test = "1.10" Zygote = "0.6.69, 0.7" @@ -90,11 +90,11 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" HAdaptiveIntegration = "eaa5ad34-b243-48e9-b09c-54bc0655cecf" MCIntegration = "ea1e2de9-7db7-4b42-91ee-0cd1bf6df167" Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["ADTypes", "Arblib", "StaticArrays", "FiniteDiff", "SafeTestsets", "Test", "Distributions", "ForwardDiff", "Zygote", "ChainRulesCore", "FastGaussQuadrature", "FastTanhSinhQuadrature", "Cuba", "Cubature", "MCIntegration", "Mooncake", "DifferentiationInterface", "Pkg", "HAdaptiveIntegration"] +test = ["ADTypes", "Arblib", "StaticArrays", "FiniteDiff", "SafeTestsets", "SciMLTesting", "Test", "Distributions", "ForwardDiff", "Zygote", "ChainRulesCore", "FastGaussQuadrature", "FastTanhSinhQuadrature", "Cuba", "Cubature", "MCIntegration", "Mooncake", "DifferentiationInterface", "HAdaptiveIntegration"] diff --git a/test/derivative_tests.jl b/test/AD/derivative_tests.jl similarity index 100% rename from test/derivative_tests.jl rename to test/AD/derivative_tests.jl diff --git a/test/nested_ad_tests.jl b/test/AD/nested_ad_tests.jl similarity index 100% rename from test/nested_ad_tests.jl rename to test/AD/nested_ad_tests.jl diff --git a/test/qa/Project.toml b/test/qa/Project.toml index 581e61cf..42e6aea2 100644 --- a/test/qa/Project.toml +++ b/test/qa/Project.toml @@ -3,6 +3,8 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7" Integrals = "de52edbc-65ea-441a-8357-d3a637375a31" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] @@ -11,7 +13,9 @@ Integrals = {path = "../.."} [compat] Aqua = "0.8" ExplicitImports = "1.14.0" -JET = "0.9, 0.10, 0.11.3" Integrals = "5" +JET = "0.9, 0.10, 0.11.3" +SafeTestsets = "0.1, 1" +SciMLTesting = "1" Test = "1.10" julia = "1.10" diff --git a/test/runtests.jl b/test/runtests.jl index 499c7739..a18a7cc4 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,38 +1,2 @@ -using Pkg -using SafeTestsets -using Test - -const GROUP = get(ENV, "GROUP", "All") - -# QA (Aqua + ExplicitImports + JET) runs in an isolated environment (test/qa) so -# its tooling deps never enter the main test target's resolve. On Julia < 1.11 -# the [sources] table is ignored, so develop the package by path to test the PR -# branch code. -function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() -end - -if GROUP == "All" || GROUP == "Core" - @time @safetestset "Interface Tests" include("interface_tests.jl") - @time @safetestset "Infinite Integral Tests" include("inf_integral_tests.jl") - @time @safetestset "Gaussian Quadrature Tests" include("gaussian_quadrature_tests.jl") - @time @safetestset "Sampled Integration Tests" include("sampled_tests.jl") - @time @safetestset "QuadratureFunction Tests" include("quadrule_tests.jl") - @time @safetestset "Verbosity Tests" include("verbosity_tests.jl") - @time @safetestset "Alternative Transformation Tests" include("alt_transformation_tests.jl") - @time @safetestset "HAdaptiveIntegration Tests" include("hadaptiveintegration_tests.jl") -end - -if GROUP == "All" || GROUP == "AD" - @time @safetestset "Derivative Tests" include("derivative_tests.jl") - @time @safetestset "Nested AD Tests" include("nested_ad_tests.jl") -end - -if GROUP == "QA" - activate_qa_env() - @time @safetestset "Quality Assurance" include("qa/qa.jl") -end +using SciMLTesting +run_tests()