diff --git a/Project.toml b/Project.toml index ac321d3..33db05a 100644 --- a/Project.toml +++ b/Project.toml @@ -52,6 +52,7 @@ ReactionNetworkImporters = "0.15.1, 1.3" SBMLImporter = "4" SBMLToolkit = "0.1.29" SafeTestsets = "0.1.0" +SciMLTesting = "1" Satisfiability = "0.2" SparseArrays = "1" StableRNGs = "1" @@ -62,12 +63,12 @@ UnPack = "1" julia = "1.10" [extras] -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SBMLImporter = "210efffb-c3c8-456d-a807-6f55560b12fe" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed" [targets] -test = ["Test", "SBMLImporter", "SafeTestsets", "StableRNGs", "UnPack", "Pkg"] +test = ["Test", "SBMLImporter", "SafeTestsets", "SciMLTesting", "StableRNGs", "UnPack"] diff --git a/test/qa/Project.toml b/test/qa/Project.toml index 5c0f177..437192e 100644 --- a/test/qa/Project.toml +++ b/test/qa/Project.toml @@ -2,7 +2,8 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" CatalystNetworkAnalysis = "5fe4a9df-d2e2-44a6-8bda-0abe10269b5a" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] @@ -11,6 +12,7 @@ CatalystNetworkAnalysis = {path = "../.."} [compat] Aqua = "0.8" JET = "0.9, 0.10, 0.11" -Pkg = "1" +SafeTestsets = "0.0.1, 0.1" +SciMLTesting = "1" Test = "1" julia = "1.10" diff --git a/test/runtests.jl b/test/runtests.jl index e5d67e0..a18a7cc 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,53 +1,2 @@ -using Pkg -using SafeTestsets, Test -using CatalystNetworkAnalysis -using UnPack, SBMLImporter, SBMLToolkit - -const GROUP = get(ENV, "GROUP", "All") - -# QA (Aqua + 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" - @testset "CatalystNetworkAnalysis.jl" begin - @time @safetestset "Concentration Robustness" begin - include("ACR.jl") - end - @time @safetestset "Concordance Helpers" begin - include("concordancehelpers.jl") - end - @time @safetestset "Siphons" begin - include("siphons.jl") - end - @time @safetestset "Persistence" begin - include("persistence.jl") - end - @time @safetestset "Deficiency One Algorithm" begin - include("deficiencyone.jl") - end - @time @safetestset "Specific Stoichiometric Compatibility Class Functionality" begin - include("specificscc.jl") - end - @time @safetestset "Linear programming utilities" begin - include("lp_utils.jl") - end - @time @safetestset "Network Translation" begin - include("network_translation.jl") - end - end -end - -if GROUP == "QA" - activate_qa_env() - @time @safetestset "Quality Assurance" begin - include("qa/qa.jl") - end -end +using SciMLTesting +run_tests() diff --git a/test/network_properties.jl b/test/shared/network_properties.jl similarity index 100% rename from test/network_properties.jl rename to test/shared/network_properties.jl diff --git a/test/networksummary.jl b/test/shared/networksummary.jl similarity index 100% rename from test/networksummary.jl rename to test/shared/networksummary.jl diff --git a/test/test_networks.jl b/test/shared/test_networks.jl similarity index 100% rename from test/test_networks.jl rename to test/shared/test_networks.jl