Use TrixiTest.jl (#113)

* use TrixiTest.jl

* Update test/benchmarks.jl

---------

Co-authored-by: Erik Faulhaber <[email protected]>

Author: JoshuaLampert

test/Project.toml

@@ -4,9 +4,11 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TrixiParticles = "66699cd8-9c01-4e9d-a059-b96c86d16b3a"
+TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26"
 
 [compat]
 BenchmarkTools = "1"
 Plots = "1"
 Test = "1"
 TrixiParticles = "0.3"
+TrixiTest = "0.1"

test/benchmarks.jl

@@ -7,31 +7,31 @@
 
     @testset verbose=true "$(length(size))D" for size in [(50,), (10, 10), (5, 5, 5)]
         @testset verbose=true "`benchmark_count_neighbors`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_count_neighbors, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_count_neighbors, size, 2)
         end
 
         @testset verbose=true "`benchmark_n_body`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_n_body, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_n_body, size, 2)
         end
 
         @testset verbose=true "`benchmark_wcsph`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_wcsph, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_wcsph, size, 2)
         end
 
         @testset verbose=true "`benchmark_wcsph_fp32`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_wcsph_fp32, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_wcsph_fp32, size, 2)
         end
 
         @testset verbose=true "`benchmark_tlsph`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_tlsph, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_tlsph, size, 2)
         end
 
         @testset verbose=true "`benchmark_initialize`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_initialize, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_initialize, size, 2)
         end
 
         @testset verbose=true "`benchmark_update_alternating`" begin
-            @test_nowarn_mod plot_benchmarks(benchmark_update_alternating, size, 2)
+            @trixi_test_nowarn plot_benchmarks(benchmark_update_alternating, size, 2)
         end
     end
 end;

test/cell_lists/full_grid.jl

@@ -29,11 +29,11 @@
             @test_throws error_string initialize!(nhs, y, y)
 
             y[1, 7] = 0.0
-            @test_nowarn_mod initialize!(nhs, y, y)
-            @test_nowarn_mod update!(nhs, y, y)
+            @trixi_test_nowarn initialize!(nhs, y, y)
+            @trixi_test_nowarn update!(nhs, y, y)
 
             y[1, 7] = 10.0
-            @test_nowarn_mod update!(nhs, y, y)
+            @trixi_test_nowarn update!(nhs, y, y)
 
             y[1, 7] = NaN
             @test_throws error_string update!(nhs, y, y)

test/nhs_grid.jl

@@ -7,7 +7,7 @@
         @test_throws "ParallelUpdate() $error_str" GridNeighborhoodSearch{2}(update_strategy = ParallelUpdate())
 
         nhs = GridNeighborhoodSearch{3}(update_strategy = SerialUpdate())
-        nhs2 = @test_nowarn_mod PointNeighbors.Adapt.adapt_structure(Array, nhs)
+        nhs2 = @trixi_test_nowarn PointNeighbors.Adapt.adapt_structure(Array, nhs)
 
         @test nhs2.update_strategy == nhs.update_strategy
     end

test/test_util.jl

@@ -1,6 +1,7 @@
 # All `using` calls are in this file, so that one can run any test file
 # after running only this file.
 using Test: @test, @testset, @test_throws
+using TrixiTest: @trixi_test_nowarn
 using PointNeighbors
 
 """
@@ -33,46 +34,4 @@ macro trixi_testset(name, expr)
     end
 end
 
-"""
-    @test_nowarn_mod expr
-
-Modified version of `@test_nowarn expr` that prints the content of `stderr` when
-it is not empty and ignores some common info statements printed in Trixi.jl
-uses.
-"""
-macro test_nowarn_mod(expr, additional_ignore_content = String[])
-    quote
-        let fname = tempname()
-            try
-                ret = open(fname, "w") do f
-                    redirect_stderr(f) do
-                        $(esc(expr))
-                    end
-                end
-                stderr_content = read(fname, String)
-                if !isempty(stderr_content)
-                    println("Content of `stderr`:\n", stderr_content)
-                end
-
-                # Patterns matching the following ones will be ignored. Additional patterns
-                # passed as arguments can also be regular expressions, so we just use the
-                # type `Any` for `ignore_content`.
-                ignore_content = Any["[ Info: You just called `trixi_include`. Julia may now compile the code, please be patient.\n"]
-                append!(ignore_content, $additional_ignore_content)
-                for pattern in ignore_content
-                    stderr_content = replace(stderr_content, pattern => "")
-                end
-
-                # We also ignore simple module redefinitions for convenience. Thus, we
-                # check whether every line of `stderr_content` is of the form of a
-                # module replacement warning.
-                @test occursin(r"^(WARNING: replacing module .+\.\n)*$", stderr_content)
-                ret
-            finally
-                rm(fname, force = true)
-            end
-        end
-    end
-end
-
 include("point_cloud.jl")