simplify tests

Author: t-bltg

src/ImageInTerminal.jl

@@ -98,13 +98,11 @@ include("display.jl")
 """
     imshow([stream], img, [maxsize])
 
-Displays the given image `img` using unicode characters and
-terminal colors (defaults to 256 colors).
+Displays the given image `img` using unicode characters and terminal colors (defaults to 256 colors).
 `img` has to be an array of `Colorant`.
 
-If working in the REPL, the function tries to choose the encoding
-based on the current display size. The image will also be
-downsampled to fit into the display.
+If working in the REPL, the function tries to choose the encoding based on the current display size.
+The image will also be downsampled to fit into the display.
 
 Supported encoding:
     - sixel (`Sixel` backend)

src/display.jl

@@ -8,7 +8,7 @@ Base.displayable(::TerminalGraphicDisplay, ::MIME"image/png") = true
 
 function Base.display(d::TerminalGraphicDisplay, ::MIME"image/png", bytes::Vector{UInt8})
     # In this case, assume it to be png byte sequences, use FileIO to find a decoder for it.
-    img = FileIO.load(FileIO.Stream{format"PNG"}(IOBuffer(bytes)))
+    img = FileIO.load(FileIO.Stream{format"PNG"}(PipeBuffer(bytes)))
     display(d, MIME("image/png"), img)
 end
 

test/tst_baseshow.jl

@@ -55,4 +55,4 @@ for mode in (24, 8)
     end
 end
 
-set_colormode(8)  # paranoid
+set_colormode(8)  # reset to default state

test/tst_display.jl

@@ -1,7 +1,18 @@
 @testset "display" begin
     # `latex_fraction.png` was generated using:
     # $ julia -e 'using Laxtexify; render(latexify(:(x / y)), MIME("image/png"), name=abspath("latex_fraction"), callshow=false)'
-    img = FileIO.load("latex_fraction.png")
-    dsp = ImageInTerminal.TerminalGraphicDisplay(stdout)
+    fn = joinpath(@__DIR__, "latex_fraction.png")
+
+    img = FileIO.load(fn)
+    @test prod(size(img)) > 1_000
+
+    io = PipeBuffer()
+    dsp = ImageInTerminal.TerminalGraphicDisplay(io)
     display(dsp, MIME("image/png"), img)
+    @test length(read(io, String)) > 5_000
+
+    bytes = read(fn)
+    dsp = ImageInTerminal.TerminalGraphicDisplay(io)
+    display(dsp, MIME("image/png"), bytes)
+    @test length(read(io, String)) > 5_000
 end

test/tst_imshow.jl

@@ -2,18 +2,39 @@ import OffsetArrays: OffsetArray
 import SparseArrays: sprand
 import Rotations: RotMatrix
 
+# workaround for github.com/JuliaLang/julia/issues/12711
+function _redirect_stdout(f::Function, io::IO)
+    old_stdout = stdout
+    rd, = redirect_stdout()
+    task = @async write(io, rd)
+    try
+        ret = f()
+        Libc.flush_cstdio()
+        flush(stdout)
+        return ret
+    finally
+        close(rd)
+        redirect_stdout(old_stdout)
+        wait(task)
+    end
+end
+
 @testset "STDOUT" begin
     # make sure it compiles and executes
     for mode in (8, 24)
         set_colormode(mode)
-        # 2D - Matrix
-        imshow(colorview(RGB, rand(3, 2, 3)))
-        println()
-        imshow(colorview(RGB, rand(3, 2, 3)), (2, 3))
-        println()
-        # 3D
-        imshow(colorview(RGB, rand(3, 3, 4, 2)))
-        println()
+        io = PipeBuffer()
+        _redirect_stdout(io) do
+            # 2D - Matrix
+            @ensurecolor imshow(colorview(RGB, rand(3, 2, 3)))
+            println()
+            @ensurecolor imshow(colorview(RGB, rand(3, 2, 3)), (2, 3))
+            println()
+            # 3D
+            @ensurecolor imshow(colorview(RGB, rand(3, 3, 4, 2)))
+            println()
+        end
+        @test length(read(io, String)) > 500
     end
 end
 
@@ -71,4 +92,4 @@ end
     end
 end
 
-set_colormode(8)
+set_colormode(8)  # reset to default state