regroup test groups

Author: TorkelE

.github/workflows/CI.yml

@@ -14,16 +14,11 @@ jobs:
     strategy:
       matrix:
         group:
-          - ReactionSystem
-          - DSL
-          - CompositionalModelling
-          - Miscellaneous
-          - NetworkAnalysis
+          - ModelCreation
+          - Miscellaneous-NetworkAnalysis
           - Simulation
-          - Upstream
           - Spatial
-          - Visualisation
-          - Extensions
+          - Visualisation-Extensions
         version:
           - '1.10.2'
     steps:

test/reactionsystem_core/reactionsystem_structure.jl

@@ -747,6 +747,10 @@ end
 
 # Tests construction of empty reaction networks.
 let
+    function unpacksys(sys)
+        get_eqs(sys), get_iv(sys), get_unknowns(sys), get_ps(sys), nameof(sys), get_systems(sys)
+    end
+
     empty_network_1 = @reaction_network
     eqs, iv, ps, name, systems = unpacksys(empty_network_1)
     @test length(eqs) == 0

test/runtests.jl

@@ -10,8 +10,8 @@ const GROUP = get(ENV, "GROUP", "All")
 ### Run Tests ###
 @time begin
 
-    # Tests the `ReactionSystem` structure and its properties.
-    if GROUP == "All" || GROUP == "ReactionSystem"
+    if GROUP == "All" || GROUP == "ModelCreation"
+        # Tests the `ReactionSystem` structure and its properties.
         @testset "ReactionSystem" begin
             @time @safetestset "Reaction Structure" begin include("reactionsystem_core/reaction_structure.jl") end
             @time @safetestset "ReactionSystem Structure" begin include("reactionsystem_core/reactionsystem_structure.jl") end
@@ -22,36 +22,30 @@ const GROUP = get(ENV, "GROUP", "All")
             # @time @safetestset "Coupled CRN/Equation Systems" begin include("reactionsystem_core/coupled_equation_crn_systems.jl") end
             @time @safetestset "Events" begin include("reactionsystem_core/events.jl") end
         end
-    end
 
-    # Tests model creation via the @reaction_network DSL.
-    if GROUP == "All" || GROUP == "DSL"
+        # Tests model creation via the @reaction_network DSL.
         @testset "DSL" begin
             @time @safetestset "DSL Basic Model Construction" begin include("dsl/dsl_basic_model_construction.jl") end
             @time @safetestset "DSL Advanced Model Construction" begin include("dsl/dsl_advanced_model_construction.jl") end
             @time @safetestset "DSL Options" begin include("dsl/dsl_options.jl") end
         end
-    end
 
-    # Tests compositional and hierarchical modelling.
-    if GROUP == "All" || GROUP == "CompositionalModelling"
+        # Tests compositional and hierarchical modelling.
         @testset "CompositionalModelling" begin
             @time @safetestset "ReactionSystem Components Based Creation" begin include("compositional_modelling/component_based_model_creation.jl") end
         end
     end
 
-    # Tests various miscellaneous features.
-    if GROUP == "All" || GROUP == "Miscellaneous"
+    if GROUP == "All" || GROUP == "Miscellaneous-NetworkAnalysis"
+        # Tests various miscellaneous features.
         @testset "Miscellaneous" begin
             @time @safetestset "API" begin include("miscellaneous_tests/api.jl") end
             @time @safetestset "Compound Species" begin include("miscellaneous_tests/compound_macro.jl") end
             @time @safetestset "Reaction Balancing" begin include("miscellaneous_tests/reaction_balancing.jl") end
             @time @safetestset "Units" begin include("miscellaneous_tests/units.jl") end
         end
-    end
 
-    # Tests reaction network analysis features.
-    if GROUP == "All" || GROUP == "NetworkAnalysis"
+        # Tests reaction network analysis features.
         @testset "NetworkAnalysis" begin
             @time @safetestset "Conservation Laws" begin include("network_analysis/conservation_laws.jl") end
             @time @safetestset "Network Properties" begin include("network_analysis/network_properties.jl") end
@@ -67,10 +61,8 @@ const GROUP = get(ENV, "GROUP", "All")
             @time @safetestset "Jump System Simulations" begin include("simulation_and_solving/simulate_jumps.jl") end
             @time @safetestset "Nonlinear and SteadyState System Solving" begin include("simulation_and_solving/solve_nonlinear.jl") end
         end
-    end
 
-    # Tests upstream SciML and DiffEq stuff.
-    if GROUP == "All" || GROUP == "Upstream"
+        # Tests upstream SciML and DiffEq stuff.
         @testset "Upstream" begin
             @time @safetestset "MTK Structure Indexing" begin include("upstream/mtk_structure_indexing.jl") end
             @time @safetestset "MTK Problem Inputs" begin include("upstream/mtk_problem_inputs.jl") end
@@ -86,19 +78,17 @@ const GROUP = get(ENV, "GROUP", "All")
         end
     end
 
-    # Tests network visualisation.
-    if GROUP == "All" || GROUP == "Visualisation"
-        @testset "Visualization" begin
+    if GROUP == "All" || GROUP == "Visualisation-Extensions"
+        # Tests network visualisation.
+        @testset "Visualisation" begin
             @time @safetestset "Latexify" begin include("visualisation/latexify.jl") end
             # Disable on Macs as can't install GraphViz via jll
             if !Sys.isapple()
                 @time @safetestset "Graphs Visualisations" begin include("visualisation/graphs.jl") end
             end
         end
-    end
 
-    # Tests extensions.
-    if GROUP == "All" || GROUP == "Extensions"
+        # Tests extensions.
         @testset "Extensions" begin
             # @time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
             # @time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end