Use testing macros from TrixiTest.jl (trixi-framework#2493)

* use all macros provided by TrixiTest

* bump TrixiBase version

* add import Trixi

* replace test_nowarn_mod by trixi_test_nowarn

* replace @test_nowarn_mod trixi_include by @test_trixi_include

* unified use of EXAMPLES_DIR

* fmt

* temporarily swtich to branch of TrixiTest

* lots of local usings

* get sources right

* compat for TrixiTest

* use escaped version as in TrixiTest

* switch to branch in CI

* use reexported SVector

* fix url

* both test and main project?

* no

* fix

* try deving

* path keyword

* without cache and buildpkg

* yet another try

* some fixes

* next

* fmt

* fixes

* Trixi.jl maxiters warning

* fix

* try 1.11 and sources

* fix sources

* fixes

* fmt

* ugly workaround for @unpack macro

* Apply suggestions from code review

Co-authored-by: Hendrik Ranocha <ranocha@users.noreply.github.com>

* compat bound from TrixiBase.jl

* yet another EXAMPLES_DIR

* use native unpack syntax

* adapt new test

---------

Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>
Co-authored-by: Hendrik Ranocha <ranocha@users.noreply.github.com>

Author: 3 people

Project.toml

@@ -117,10 +117,10 @@ StrideArrays = "0.1.29"
 StructArrays = "0.6.20, 0.7"
 SummationByPartsOperators = "0.5.52"
 T8code = "0.7.4"
-TimerOutputs = "0.5.23"
+TimerOutputs = "0.5.25"
 Triangulate = "2.2, 3"
 TriplotBase = "0.1"
 TriplotRecipes = "0.1"
-TrixiBase = "0.1.3"
+TrixiBase = "0.1.6"
 UUIDs = "1.6"
 julia = "1.10"

test/Project.toml

@@ -70,4 +70,4 @@ SparseConnectivityTracer = "1.0.1"
 SparseMatrixColorings = "0.4.21"
 StableRNGs = "1.0.2"
 Test = "1"
-TrixiTest = "0.1"
+TrixiTest = "0.1.4"

test/test_dgmulti_1d.jl

@@ -94,6 +94,7 @@ end
 end
 
 @trixi_testset "elixir_euler_flux_diff.jl (convergence)" begin
+    using Trixi: convergence_test
     mean_convergence = convergence_test(@__MODULE__,
                                         joinpath(EXAMPLES_DIR,
                                                  "elixir_euler_flux_diff.jl"), 3)
@@ -135,6 +136,7 @@ end
 end
 
 @trixi_testset "elixir_euler_flux_diff.jl (FD SBP)" begin
+    using Trixi: SummationByPartsOperators, derivative_operator
     global D = derivative_operator(SummationByPartsOperators.MattssonNordström2004(),
                                    derivative_order = 1,
                                    accuracy_order = 4,
@@ -166,8 +168,7 @@ end
 end
 
 @trixi_testset "elixir_euler_modified_sod.jl" begin
-    @test_trixi_include(joinpath(examples_dir(), "dgmulti_1d",
-                                 "elixir_euler_modified_sod.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_modified_sod.jl"),
                         cells_per_dimension=(16,),
                         l2=[0.26352391505659767, 0.4528974787813885, 0.9310255091126164],
                         linf=[
@@ -208,6 +209,7 @@ end
 end
 
 @trixi_testset "DGMulti with periodic SBP unit test" begin
+    using Trixi: periodic_derivative_operator, DGMulti, Line, DGMultiMesh
     # see https://github.com/trixi-framework/Trixi.jl/pull/1013
     global D = periodic_derivative_operator(derivative_order = 1,
                                             accuracy_order = 4,

test/test_dgmulti_2d.jl

@@ -316,6 +316,7 @@ end
 end
 
 @trixi_testset "elixir_euler_weakform.jl (convergence)" begin
+    using Trixi: convergence_test
     mean_convergence = convergence_test(@__MODULE__,
                                         joinpath(EXAMPLES_DIR,
                                                  "elixir_euler_weakform.jl"), 2)
@@ -534,6 +535,7 @@ end
 end
 
 @trixi_testset "elixir_euler_weakform.jl (FD SBP)" begin
+    using Trixi: SummationByPartsOperators, derivative_operator
     global D = derivative_operator(SummationByPartsOperators.MattssonNordström2004(),
                                    derivative_order = 1,
                                    accuracy_order = 4,
@@ -568,6 +570,7 @@ end
 end
 
 @trixi_testset "elixir_euler_weakform.jl (FD SBP, EC)" begin
+    using Trixi: SummationByPartsOperators, derivative_operator
     global D = derivative_operator(SummationByPartsOperators.MattssonNordström2004(),
                                    derivative_order = 1,
                                    accuracy_order = 4,
@@ -650,6 +653,7 @@ end
 end
 
 @trixi_testset "elixir_euler_fdsbp_periodic.jl (arbitrary reference and physical domains)" begin
+    using Trixi: periodic_derivative_operator
     global D = periodic_derivative_operator(derivative_order = 1,
                                             accuracy_order = 4,
                                             xmin = -200.0,
@@ -682,6 +686,7 @@ end
 end
 
 @trixi_testset "elixir_euler_fdsbp_periodic.jl (CGSEM)" begin
+    using Trixi: SummationByPartsOperators
     D_local = SummationByPartsOperators.legendre_derivative_operator(xmin = 0.0,
                                                                      xmax = 1.0,
                                                                      N = 4)

test/test_dgmulti_3d.jl

@@ -5,7 +5,7 @@ using Trixi
 
 include("test_trixi.jl")
 
-EXAMPLES_DIR = pkgdir(Trixi, "examples", "dgmulti_3d")
+EXAMPLES_DIR = joinpath(examples_dir(), "dgmulti_3d")
 
 # Start with a clean environment: remove Trixi.jl output directory if it exists
 outdir = "out"
@@ -282,6 +282,7 @@ end
 end
 
 @trixi_testset "elixir_euler_weakform_periodic.jl (FD SBP)" begin
+    using Trixi: SummationByPartsOperators, derivative_operator
     global D = derivative_operator(SummationByPartsOperators.MattssonNordström2004(),
                                    derivative_order = 1,
                                    accuracy_order = 2,
@@ -316,6 +317,7 @@ end
 end
 
 @trixi_testset "elixir_euler_weakform_periodic.jl (FD SBP, EC)" begin
+    using Trixi: SummationByPartsOperators, derivative_operator
     global D = derivative_operator(SummationByPartsOperators.MattssonNordström2004(),
                                    derivative_order = 1,
                                    accuracy_order = 2,

test/test_mpi.jl

@@ -30,6 +30,7 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows()
 end # MPI
 
 @trixi_testset "MPI supporting functionality" begin
+    using Trixi: Trixi, ode_norm, SVector
     t = 0.5
     let u = 1.0
         @test ode_norm(u, t) ≈ Trixi.DiffEqBase.ODE_DEFAULT_NORM(u, t)

test/test_mpi_p4est_2d.jl

@@ -5,7 +5,7 @@ using Trixi
 
 include("test_trixi.jl")
 
-const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_2d_dgsem")
+EXAMPLES_DIR = joinpath(examples_dir(), "p4est_2d_dgsem")
 
 @testset "P4estMesh MPI 2D" begin
 #! format: noindent
@@ -20,8 +20,8 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_2d_dgsem")
                             linf=[6.627000273229378e-5])
 
         @testset "error-based step size control" begin
-            Trixi.mpi_isroot() && println("-"^100)
-            Trixi.mpi_isroot() &&
+            mpi_isroot() && println("-"^100)
+            mpi_isroot() &&
                 println("elixir_advection_basic.jl with error-based step size control")
 
             # Use callbacks without stepsize_callback to test error-based step size control
@@ -30,7 +30,7 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_2d_dgsem")
                         ode_default_options()..., callback = callbacks)
             summary_callback()
             errors = analysis_callback(sol)
-            if Trixi.mpi_isroot()
+            if mpi_isroot()
                 @test errors.l2≈[3.3022040342579066e-5] rtol=1.0e-4
                 @test errors.linf≈[0.00011787417954578494] rtol=1.0e-4
             end
@@ -180,7 +180,8 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_2d_dgsem")
 
     # Test MPI-parallel handling of .inp meshes NOT generated by HOHQMesh
     @trixi_testset "elixir_euler_SD7003airfoil.jl" begin
-        @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem",
+        using Trixi: SemidiscretizationHyperbolic, AnalysisCallback
+        @test_trixi_include(joinpath(EXAMPLES_DIR,
                                      "elixir_navierstokes_SD7003airfoil.jl"),
                             semi=SemidiscretizationHyperbolic(mesh, equations,
                                                               initial_condition, solver;

test/test_mpi_p4est_3d.jl

@@ -5,7 +5,7 @@ using Trixi
 
 include("test_trixi.jl")
 
-const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem")
+EXAMPLES_DIR = joinpath(examples_dir(), "p4est_3d_dgsem")
 
 @testset "P4estMesh MPI 3D" begin
 #! format: noindent
@@ -20,8 +20,8 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem")
                             linf=[0.0014537194925779984])
 
         @testset "error-based step size control" begin
-            Trixi.mpi_isroot() && println("-"^100)
-            Trixi.mpi_isroot() &&
+            mpi_isroot() && println("-"^100)
+            mpi_isroot() &&
                 println("elixir_advection_basic.jl with error-based step size control")
 
             # Use callbacks without stepsize_callback to test error-based step size control
@@ -31,7 +31,7 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem")
                         ode_default_options()..., callback = callbacks)
             summary_callback()
             errors = analysis_callback(sol)
-            if Trixi.mpi_isroot()
+            if mpi_isroot()
                 @test errors.l2≈[0.00016800412839949264] rtol=1.0e-4
                 @test errors.linf≈[0.0014548839020096516] rtol=1.0e-4
             end

test/test_mpi_t8code_2d.jl

@@ -5,7 +5,7 @@ using Trixi
 
 include("test_trixi.jl")
 
-const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_2d_dgsem")
+EXAMPLES_DIR = joinpath(examples_dir(), "t8code_2d_dgsem")
 
 @testset "T8codeMesh MPI 2D" begin
 #! format: noindent
@@ -20,8 +20,8 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_2d_dgsem")
                             linf=[6.627000273229378e-5])
 
         @testset "error-based step size control" begin
-            Trixi.mpi_isroot() && println("-"^100)
-            Trixi.mpi_isroot() &&
+            mpi_isroot() && println("-"^100)
+            mpi_isroot() &&
                 println("elixir_advection_basic.jl with error-based step size control")
 
             # Use callbacks without stepsize_callback to test error-based step size control
@@ -30,7 +30,7 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_2d_dgsem")
                         ode_default_options()..., callback = callbacks)
             summary_callback()
             errors = analysis_callback(sol)
-            if Trixi.mpi_isroot()
+            if mpi_isroot()
                 @test errors.l2≈[3.3022040342579066e-5] rtol=1.0e-4
                 @test errors.linf≈[0.00011787417954578494] rtol=1.0e-4
             end

test/test_mpi_t8code_3d.jl

@@ -5,7 +5,7 @@ using Trixi
 
 include("test_trixi.jl")
 
-const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem")
+EXAMPLES_DIR = joinpath(examples_dir(), "t8code_3d_dgsem")
 
 @testset "T8codeMesh MPI 3D" begin
 #! format: noindent
@@ -20,8 +20,8 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem")
                             linf=[0.0014537194925779984])
 
         @testset "error-based step size control" begin
-            Trixi.mpi_isroot() && println("-"^100)
-            Trixi.mpi_isroot() &&
+            mpi_isroot() && println("-"^100)
+            mpi_isroot() &&
                 println("elixir_advection_basic.jl with error-based step size control")
 
             # Use callbacks without stepsize_callback to test error-based step size control
@@ -31,7 +31,7 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem")
                         ode_default_options()..., callback = callbacks)
             summary_callback()
             errors = analysis_callback(sol)
-            if Trixi.mpi_isroot()
+            if mpi_isroot()
                 @test errors.l2≈[0.00016800412839949264] rtol=1.0e-4
                 @test errors.linf≈[0.0014548839020096516] rtol=1.0e-4
             end