From 26c414fcac86842823ceca7c18c6f6df6a0ffb2a Mon Sep 17 00:00:00 2001 From: hobovsky Date: Thu, 16 Mar 2023 07:47:25 +0100 Subject: [PATCH 1/3] Makes titles of passing and failing tests consistent --- src/FactCheck.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FactCheck.jl b/src/FactCheck.jl index c955470..30f537b 100644 --- a/src/FactCheck.jl +++ b/src/FactCheck.jl @@ -125,7 +125,7 @@ function Base.show(io::IO, s::Success) println(io, "\nTest Passed") println(io, "\n") else - println(io, "\n", replace_lf(s.meta.msg != nothing ? "$(s.meta.msg)" : format_fact(s.expr))) + println(io, "\n", replace_lf(format_fact(s.expr))) println(io, "\nTest Passed") println(io, "\n") end From e6ff871402f9d99ca14c79b0483f5566f8a2136a Mon Sep 17 00:00:00 2001 From: hobovsky Date: Thu, 16 Mar 2023 08:02:54 +0100 Subject: [PATCH 2/3] Consistent titles for passing and failing tests --- src/FactCheck.jl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/FactCheck.jl b/src/FactCheck.jl index 30f537b..3e57719 100644 --- a/src/FactCheck.jl +++ b/src/FactCheck.jl @@ -120,15 +120,9 @@ function Base.show(io::IO, e::Error) end function Base.show(io::IO, s::Success) - if s.rhs == :fact_throws_error - println(io, "\n", replace_lf(s.meta.msg != nothing ? "$(s.meta.msg)" : "Throws Error")) - println(io, "\nTest Passed") - println(io, "\n") - else - println(io, "\n", replace_lf(format_fact(s.expr))) - println(io, "\nTest Passed") - println(io, "\n") - end + println(io, "\n", replace_lf(format_fact(s.expr))) + println(io, "\nTest Passed") + println(io, "\n") end function Base.show(io::IO, ::Pending) From e68da8e5b1697f83771fb2746edcb079e51b9826 Mon Sep 17 00:00:00 2001 From: hobovsky Date: Thu, 16 Mar 2023 17:33:17 +0100 Subject: [PATCH 3/3] Fix consistency of IT:: titles for errored tests --- src/FactCheck.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/FactCheck.jl b/src/FactCheck.jl index 3e57719..6bae7ab 100644 --- a/src/FactCheck.jl +++ b/src/FactCheck.jl @@ -113,8 +113,9 @@ function Base.show(io::IO, f::Failure) end function Base.show(io::IO, e::Error) - println(io, "\n", replace_lf(e.meta.msg != nothing ? "$(e.meta.msg)" : format_fact(e.expr))) - println(io, "\n", replace_lf(sprint(showerror, e.err))) + println(io, "\n", replace_lf(format_fact(e.expr))) + errorMsg = e.meta.msg != nothing ? sprint(print, e.meta.msg) : sprint(showerror, e.err) + println(io, "\n", replace_lf(errorMsg)) println(io, "\n", replace_lf(sprint(showerror, e.err, e.backtrace))) println(io, "\n") end