stdlib/Test: fix display of ≈ with atol (#24926)

fix #24919

Author: iblislin

stdlib/Test/src/Test.jl

@@ -220,6 +220,17 @@ function eval_test(evaluated::Expr, quoted::Expr, source::LineNumberNode)
         func_sym = quoted_args[1]
         if isempty(kwargs)
             quoted = Expr(:call, func_sym, args...)
+        elseif func_sym === :≈
+            # in case of `≈(x, y, atol = z)`
+            # make the display like `Evaluated: x ≈ y (atol=z)`
+            kws = [Symbol(Expr(:kw, k, v), ",") for (k, v) in kwargs]
+            kws[end] = Symbol(Expr(:kw, kwargs[end]...))
+            kws[1] = Symbol("(", kws[1])
+            kws[end] = Symbol(kws[end], ")")
+            quoted = Expr(:comparison, args[1], func_sym, args[2], kws...)
+            if length(quoted.args) & 1 == 0  # hack to fit `show_unquoted`
+                push!(quoted.args, Symbol())
+            end
         else
             kwargs_expr = Expr(:parameters, [Expr(:kw, k, v) for (k, v) in kwargs]...)
             quoted = Expr(:call, func_sym, kwargs_expr, args...)
@@ -339,7 +350,7 @@ function get_test_result(ex, source)
             Expr(:comparison, $(quoted_terms...)),
             $(QuoteNode(source)),
         ))
-    elseif isa(ex, Expr) && ex.head == :call && ex.args[1] in (:isequal, :isapprox)
+    elseif isa(ex, Expr) && ex.head == :call && ex.args[1] in (:isequal, :isapprox, :≈)
         escaped_func = esc(ex.args[1])
         quoted_func = QuoteNode(ex.args[1])
 

stdlib/Test/test/runtests.jl

@@ -633,22 +633,42 @@ end
 end
 
 @testset "file info in test errors" begin
-     local f = tempname()
-
-     write(f,
-     """
-     using Test
-     @testset begin
-         @test 1==2
-         @test_throws UndefVarError 1
-         @test_broken 1 == 1
-     end
-     """)
-
-     local msg = read(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --color=no $f`), stderr=DevNull), String)
-     @test contains(msg, "at " * f * ":" * "3")
-     @test contains(msg, "at " * f * ":" * "4")
-     @test contains(msg, "at " * f * ":" * "5")
-
-     rm(f; force=true)
+    local f = tempname()
+
+    write(f,
+    """
+    using Test
+    @testset begin
+        @test 1==2
+        @test_throws UndefVarError 1
+        @test_broken 1 == 1
+    end
+    """)
+
+    local msg = read(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --color=no $f`), stderr=DevNull), String)
+    @test contains(msg, "at " * f * ":" * "3")
+    @test contains(msg, "at " * f * ":" * "4")
+    @test contains(msg, "at " * f * ":" * "5")
+
+    rm(f; force=true)
  end
+
+# issue #24919
+@testset "≈ with atol" begin
+    local cmd = `$(Base.julia_cmd()) --startup-file=no --color=no`
+    f(src) = read(pipeline(ignorestatus(`$cmd -e $src`), stderr=DevNull), String)
+
+    msg = f("""
+    using Test
+    x, y = 0.9, 0.1
+    @test x ≈ y atol=0.01
+    """)
+    @test contains(msg, "Evaluated: 0.9 ≈ 0.1 (atol=0.01)")
+
+    msg = f("""
+    using Test
+    x, y = 0.9, 0.1
+    @test x ≈ y nans=true atol=0.01
+    """)
+    @test contains(msg, "Evaluated: 0.9 ≈ 0.1 (nans=true, atol=0.01)")
+end