diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index d41f8f2..f38cc00 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -20,13 +20,7 @@ concurrency: jobs: tests: - name: "Tests" - strategy: - fail-fast: false - matrix: - version: - - "1" - uses: "SciML/.github/.github/workflows/tests.yml@v1" + uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1" with: - julia-version: "${{ matrix.version }}" + coverage-directories: "src" secrets: "inherit" diff --git a/Project.toml b/Project.toml index fdb98f9..068f222 100644 --- a/Project.toml +++ b/Project.toml @@ -7,13 +7,18 @@ version = "1.0.0" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" [compat] +DifferentialEquations = "7" ModelingToolkit = "9" +SafeTestsets = "0.1" +SciMLTesting = "1" +Test = "1" julia = "1.10" [extras] SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" [targets] -test = ["Test", "SafeTestsets", "DifferentialEquations"] +test = ["Test", "SafeTestsets", "DifferentialEquations", "SciMLTesting"] diff --git a/test/qa/Project.toml b/test/qa/Project.toml new file mode 100644 index 0000000..d766d87 --- /dev/null +++ b/test/qa/Project.toml @@ -0,0 +1,18 @@ +[deps] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" +ProcessSimulator = "8886c03b-4dde-4be1-b6ee-87d056f985b8" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[sources] +ProcessSimulator = {path = "../.."} + +[compat] +Aqua = "0.8" +JET = "0.9,0.10,0.11" +SafeTestsets = "0.1, 1" +SciMLTesting = "1" +Test = "1" +julia = "1.10" diff --git a/test/qa/qa.jl b/test/qa/qa.jl new file mode 100644 index 0000000..1c69ace --- /dev/null +++ b/test/qa/qa.jl @@ -0,0 +1,5 @@ +using ProcessSimulator, Aqua, JET +using SciMLTesting + +run_qa(ProcessSimulator; Aqua = Aqua, JET = JET, jet = true, + jet_kwargs = (; target_defined_modules = true)) diff --git a/test/runtests.jl b/test/runtests.jl index 437fc5a..a18a7cc 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,11 +1,2 @@ -using ProcessSimulator -using Test -using SafeTestsets - -@safetestset "Base components" begin - include("base/simple_steady_state.jl") -end - -@safetestset "Reactors" begin - include("reactors/simple_cstr.jl") -end +using SciMLTesting +run_tests() diff --git a/test/reactors/simple_cstr.jl b/test/simple_cstr.jl similarity index 100% rename from test/reactors/simple_cstr.jl rename to test/simple_cstr.jl diff --git a/test/base/simple_steady_state.jl b/test/simple_steady_state.jl similarity index 100% rename from test/base/simple_steady_state.jl rename to test/simple_steady_state.jl diff --git a/test/test_groups.toml b/test/test_groups.toml new file mode 100644 index 0000000..1fe84cd --- /dev/null +++ b/test/test_groups.toml @@ -0,0 +1,5 @@ +[Core] +versions = ["lts", "1", "pre"] + +[QA] +versions = ["lts", "1"]