diff --git a/Project.toml b/Project.toml index d451a98c..80e5bd90 100644 --- a/Project.toml +++ b/Project.toml @@ -36,6 +36,7 @@ SafeTestsets = "0.1" SciCompDSL = "1" SciMLBase = "2, 3" SciMLStructures = "1.7.0" +SciMLTesting = "1" SymbolicIndexingInterface = "0.3.39" Symbolics = "7.4.1" Test = "1" @@ -60,8 +61,9 @@ SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" SciCompDSL = "91a8cdf1-4ca6-467b-a780-87fda3fff15e" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226" +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"] +test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "SciMLTesting", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"] diff --git a/test/Electrical/analog.jl b/test/analog.jl similarity index 100% rename from test/Electrical/analog.jl rename to test/analog.jl diff --git a/test/Blocks/continuous.jl b/test/continuous.jl similarity index 100% rename from test/Blocks/continuous.jl rename to test/continuous.jl diff --git a/test/Thermal/demo.jl b/test/demo.jl similarity index 100% rename from test/Thermal/demo.jl rename to test/demo.jl diff --git a/test/Electrical/digital.jl b/test/digital.jl similarity index 100% rename from test/Electrical/digital.jl rename to test/digital.jl diff --git a/test/Hydraulic/isothermal_compressible.jl b/test/isothermal_compressible.jl similarity index 100% rename from test/Hydraulic/isothermal_compressible.jl rename to test/isothermal_compressible.jl diff --git a/test/Magnetic/magnetic.jl b/test/magnetic.jl similarity index 100% rename from test/Magnetic/magnetic.jl rename to test/magnetic.jl diff --git a/test/Blocks/math.jl b/test/math.jl similarity index 100% rename from test/Blocks/math.jl rename to test/math.jl diff --git a/test/Thermal/motor.jl b/test/motor.jl similarity index 100% rename from test/Thermal/motor.jl rename to test/motor.jl diff --git a/test/Blocks/nonlinear.jl b/test/nonlinear.jl similarity index 100% rename from test/Blocks/nonlinear.jl rename to test/nonlinear.jl diff --git a/test/Thermal/piston.jl b/test/piston.jl similarity index 100% rename from test/Thermal/piston.jl rename to test/piston.jl diff --git a/test/aqua.jl b/test/qa/aqua.jl similarity index 100% rename from test/aqua.jl rename to test/qa/aqua.jl diff --git a/test/Mechanical/rotational.jl b/test/rotational.jl similarity index 100% rename from test/Mechanical/rotational.jl rename to test/rotational.jl diff --git a/test/runtests.jl b/test/runtests.jl index c65f7b27..a18a7cc4 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,81 +1,2 @@ -using SafeTestsets, Test - -const GROUP = get(ENV, "GROUP", "All") - -@time begin - if GROUP == "QA" || GROUP == "All" - @time @safetestset "Aqua" begin - include("aqua.jl") - end - end - - if GROUP == "Core" || GROUP == "All" - @testset "Core" begin - # Blocks - @safetestset "Blocks: utils" begin - include("Blocks/utils.jl") - end - @safetestset "Blocks: math" begin - include("Blocks/math.jl") - end - @safetestset "Blocks: nonlinear" begin - include("Blocks/nonlinear.jl") - end - @safetestset "Blocks: continuous" begin - include("Blocks/continuous.jl") - end - @safetestset "Blocks: sources" begin - include("Blocks/sources.jl") - end - @safetestset "Blocks: analysis points" begin - include("Blocks/test_analysis_points.jl") - end - - # Electrical - @safetestset "Analog Circuits" begin - include("Electrical/analog.jl") - end - - @safetestset "Digital Circuits" begin - include("Electrical/digital.jl") - end - @safetestset "Chua Circuit Demo" begin - include("chua_circuit.jl") - end - - # Thermal - @safetestset "Thermal Circuits" begin - include("Thermal/thermal.jl") - end - @safetestset "Thermal Demo" begin - include("Thermal/demo.jl") - include("Thermal/motor.jl") - include("Thermal/piston.jl") - end - - # Magnetic - @safetestset "Magnetic" begin - include("Magnetic/magnetic.jl") - end - - # Mechanical - @safetestset "Mechanical Rotation" begin - include("Mechanical/rotational.jl") - end - @safetestset "Mechanical Translation" begin - include("Mechanical/translational.jl") - end - @safetestset "Mechanical Translation Modelica" begin - include("Mechanical/translational_modelica.jl") - end - @safetestset "Multi-Domain" begin - include("multi_domain.jl") - end - - # Hydraulic - @safetestset "Hydraulic IsothermalCompressible" begin - include("Hydraulic/isothermal_compressible.jl") - end - end - end -end +using SciMLTesting +run_tests() diff --git a/test/Mechanical/multibody.jl b/test/shared/multibody.jl similarity index 100% rename from test/Mechanical/multibody.jl rename to test/shared/multibody.jl diff --git a/test/Blocks/sources.jl b/test/sources.jl similarity index 100% rename from test/Blocks/sources.jl rename to test/sources.jl diff --git a/test/Blocks/test_analysis_points.jl b/test/test_analysis_points.jl similarity index 100% rename from test/Blocks/test_analysis_points.jl rename to test/test_analysis_points.jl diff --git a/test/Thermal/thermal.jl b/test/thermal.jl similarity index 100% rename from test/Thermal/thermal.jl rename to test/thermal.jl diff --git a/test/Mechanical/translational.jl b/test/translational.jl similarity index 100% rename from test/Mechanical/translational.jl rename to test/translational.jl diff --git a/test/Mechanical/translational_modelica.jl b/test/translational_modelica.jl similarity index 100% rename from test/Mechanical/translational_modelica.jl rename to test/translational_modelica.jl diff --git a/test/Blocks/utils.jl b/test/utils.jl similarity index 100% rename from test/Blocks/utils.jl rename to test/utils.jl