From e6cea19d5e99cb8e960bffb00b0b2edda298a24d Mon Sep 17 00:00:00 2001
From: Matti Pastell <matti.pastell@helsinki.fi>
Date: Tue, 24 Jul 2018 10:46:04 +0200
Subject: [PATCH] Update display tests

---
 test/documents/multimedia/rich_output.github.ref | 5 +++--
 test/documents/multimedia/rich_output.html.ref   | 5 +++--
 test/documents/multimedia/rich_output.md.ref     | 5 +++--
 test/documents/multimedia/rich_output.tex.ref    | 5 +++--
 test/documents/rich_output.jmd                   | 5 +++--
 test/rich_output.jl                              | 4 ++--
 test/runtests.jl                                 | 4 ++--
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/test/documents/multimedia/rich_output.github.ref b/test/documents/multimedia/rich_output.github.ref
index ce3f9b5..6ecce14 100644
--- a/test/documents/multimedia/rich_output.github.ref
+++ b/test/documents/multimedia/rich_output.github.ref
@@ -15,7 +15,7 @@ function Base.show(io::IO, m::MIME"text/latex", x::Array)
     println(io, "\\begin{tabular}")
     for i in 1:size(x,1)
         [print(io, "$r & ") for r in x[i,:]]
-        print(io,"\\\\")
+        print(io, "\\\\")
         println(io, " \\hline")
     end
     print(io, "\\end{tabular")
@@ -71,7 +71,8 @@ julia> ca
 
 
 ````julia
-m = Base.Markdown.parse("**Some Markdown**")
+using Markdown
+m = Markdown.parse("**Some Markdown**")
 m
 ````
 
diff --git a/test/documents/multimedia/rich_output.html.ref b/test/documents/multimedia/rich_output.html.ref
index 434e933..1ef4999 100644
--- a/test/documents/multimedia/rich_output.html.ref
+++ b/test/documents/multimedia/rich_output.html.ref
@@ -17,7 +17,7 @@
     </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\</span><span class='hljl-s'>begin{tabular}&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
     </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>i</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-nf'>size</span><span class='hljl-p'>(</span><span class='hljl-n'>x</span><span class='hljl-p'>,</span><span class='hljl-ni'>1</span><span class='hljl-p'>)</span><span class='hljl-t'>
         </span><span class='hljl-p'>[</span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-si'>$r</span><span class='hljl-s'> &amp; &quot;</span><span class='hljl-p'>)</span><span class='hljl-t'> </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>r</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-p'>[</span><span class='hljl-n'>i</span><span class='hljl-p'>,</span><span class='hljl-oB'>:</span><span class='hljl-p'>]]</span><span class='hljl-t'>
-        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\\\</span><span class='hljl-s'>&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\\\</span><span class='hljl-s'>&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
         </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot; </span><span class='hljl-se'>\\</span><span class='hljl-s'>hline&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
     </span><span class='hljl-k'>end</span><span class='hljl-t'>
     </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\</span><span class='hljl-s'>end{tabular&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
@@ -72,7 +72,8 @@
 
 
 <pre class='hljl'>
-<span class='hljl-n'>m</span><span class='hljl-t'> </span><span class='hljl-oB'>=</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-oB'>.</span><span class='hljl-n'>Markdown</span><span class='hljl-oB'>.</span><span class='hljl-nf'>parse</span><span class='hljl-p'>(</span><span class='hljl-s'>&quot;**Some Markdown**&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+<span class='hljl-k'>using</span><span class='hljl-t'> </span><span class='hljl-n'>Markdown</span><span class='hljl-t'>
+</span><span class='hljl-n'>m</span><span class='hljl-t'> </span><span class='hljl-oB'>=</span><span class='hljl-t'> </span><span class='hljl-n'>Markdown</span><span class='hljl-oB'>.</span><span class='hljl-nf'>parse</span><span class='hljl-p'>(</span><span class='hljl-s'>&quot;**Some Markdown**&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
 </span><span class='hljl-n'>m</span>
 </pre>
 
diff --git a/test/documents/multimedia/rich_output.md.ref b/test/documents/multimedia/rich_output.md.ref
index 6c7904a..b9f16bd 100644
--- a/test/documents/multimedia/rich_output.md.ref
+++ b/test/documents/multimedia/rich_output.md.ref
@@ -15,7 +15,7 @@ function Base.show(io::IO, m::MIME"text/latex", x::Array)
     println(io, "\\begin{tabular}")
     for i in 1:size(x,1)
         [print(io, "$r & ") for r in x[i,:]]
-        print(io,"\\\\")
+        print(io, "\\\\")
         println(io, " \\hline")
     end
     print(io, "\\end{tabular")
@@ -85,7 +85,8 @@ julia> ca
 
 
 ~~~~{.julia}
-m = Base.Markdown.parse("**Some Markdown**")
+using Markdown
+m = Markdown.parse("**Some Markdown**")
 m
 ~~~~~~~~~~~~~
 
diff --git a/test/documents/multimedia/rich_output.tex.ref b/test/documents/multimedia/rich_output.tex.ref
index 209cda7..ce603f2 100644
--- a/test/documents/multimedia/rich_output.tex.ref
+++ b/test/documents/multimedia/rich_output.tex.ref
@@ -15,7 +15,7 @@ function Base.show(io::IO, m::MIME"text/latex", x::Array)
     println(io, "\\begin{tabular}")
     for i in 1:size(x,1)
         [print(io, "$r & ") for r in x[i,:]]
-        print(io,"\\\\")
+        print(io, "\\\\")
         println(io, " \\hline")
     end
     print(io, "\\end{tabular")
@@ -79,7 +79,8 @@ julia> ca
 \end{juliaterm}
 
 \begin{juliacode}
-m = Base.Markdown.parse("**Some Markdown**")
+using Markdown
+m = Markdown.parse("**Some Markdown**")
 m
 \end{juliacode}
 
diff --git a/test/documents/rich_output.jmd b/test/documents/rich_output.jmd
index 7bf8b11..5242386 100644
--- a/test/documents/rich_output.jmd
+++ b/test/documents/rich_output.jmd
@@ -17,7 +17,7 @@ function Base.show(io::IO, m::MIME"text/latex", x::Array)
     println(io, "\\begin{tabular}")
     for i in 1:size(x,1)
         [print(io, "$r & ") for r in x[i,:]]
-        print(io,"\\\\")
+        print(io, "\\\\")
         println(io, " \\hline")
     end
     print(io, "\\end{tabular")
@@ -52,6 +52,7 @@ ca
 
 
 ```julia
-m = Base.Markdown.parse("**Some Markdown**")
+using Markdown
+m = Markdown.parse("**Some Markdown**")
 m
 ```
diff --git a/test/rich_output.jl b/test/rich_output.jl
index 44ea9cf..fd271c8 100644
--- a/test/rich_output.jl
+++ b/test/rich_output.jl
@@ -2,7 +2,7 @@ using Weave
 using Test
 
 function mmtest(source, resfile, doctype)
-  weave("documents/$source", out_path = "documents/multimedia/$resfile", 
+  weave("documents/$source", out_path = "documents/multimedia/$resfile",
     doctype=doctype, plotlib=nothing, template = "templates/mini.tpl")
   result =  read("documents/multimedia/$resfile", String)
   ref =  read("documents/multimedia/$resfile.ref", String)
@@ -10,7 +10,7 @@ function mmtest(source, resfile, doctype)
   rm("documents/multimedia/$resfile")
 end
 
+mmtest("rich_output.jmd", "rich_output.html", "md2html")
 mmtest("rich_output.jmd", "rich_output.md", "pandoc")
 mmtest("rich_output.jmd", "rich_output.tex", "tex")
-mmtest("rich_output.jmd", "rich_output.html", "md2html")
 mmtest("rich_output.jmd", "rich_output.github", "github")
diff --git a/test/runtests.jl b/test/runtests.jl
index 464e118..e194441 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -18,8 +18,8 @@ include("markdown_test.jl")
 @info("Testing figure formatters")
 include("figureformatter_test.jl")
 
-#@info("Testing rich output")
-#include("rich_output.jl")
+@info("Testing rich output")
+include("rich_output.jl")
 
 #@info("Test: Caching")
 #include("cache_test.jl")