There was an error running the code:\nDomainError", h)
+ @test occursin("then: There was an error running the code:\nDomainError", h)
end
@testset "Eval (nojl)" begin
@@ -202,7 +202,7 @@ end
println("Is this a file? $(isfile(fn))")
include(abspath(fn))
println("Now: $a")
- rm(fn)
done. Is this a file? true
+ rm(fn)
done. Is this a file? true
Now: 2
""")
@@ -222,7 +222,7 @@ end
@test isapproxstr(h, """
a = 5
a *= 2
- 10
+ 10
""")
# Show with stdout
@@ -240,7 +240,7 @@ end
a = 5
println("hello")
a *= 2
- hello
+ hello
10
""")
end
diff --git a/test/converter/lx_input.jl b/test/converter/lx_input.jl
index ff9367fc1..d722bf969 100644
--- a/test/converter/lx_input.jl
+++ b/test/converter/lx_input.jl
@@ -27,7 +27,7 @@
write(plain1, "2")
r = J.resolve_lx_input_plainoutput("script1.jl", code=true)
- @test r == "2
"
+ @test r == "2
"
end
@@ -52,7 +52,7 @@ end
h = J.convert_html(m, J.PageVars())
@test occursin("Some string
$(read(joinpath(J.PATHS[:assets], "index", "code", "s1.jl"), String))
", h)
- @test occursin("Then maybe $(read(joinpath(J.PATHS[:assets], "index", "code", "output", "s1.out"), String))
", h)
+ @test occursin("Then maybe $(read(joinpath(J.PATHS[:assets], "index", "code", "output", "s1.out"), String))
", h)
@test occursin("Finally img: ![\"\"](\"/assets/index/code/output/s1a.png\")
done.", h)
end
diff --git a/test/coverage/extras1.jl b/test/coverage/extras1.jl
new file mode 100644
index 000000000..84532050b
--- /dev/null
+++ b/test/coverage/extras1.jl
@@ -0,0 +1,69 @@
+@testset "Converter-lx" begin
+ cd(td)
+ # Exception instead of ArgumentError as may fail with system error
+ @test_throws Exception J.check_input_rpath("aldjfk")
+end
+
+@testset "Converter-html" begin
+ @test_throws J.HTMLFunctionError J.convert_html("{{fill bb cc}}", J.PageVars())
+ @test_throws J.HTMLFunctionError J.convert_html("{{insert bb cc}}", J.PageVars())
+ @test_throws J.HTMLFunctionError J.convert_html("{{href aa}}", J.PageVars())
+ @test (@test_logs (:warn, "Unknown dictionary name aa in {{href ...}}. Ignoring") J.convert_html("{{href aa bb}}", J.PageVars())) == "??"
+ @test_throws J.HTMLBlockError J.convert_html("{{if asdf}}{{end}}", J.PageVars())
+ @test_throws J.HTMLBlockError J.convert_html("{{if asdf}}", J.PageVars())
+ @test_throws J.HTMLBlockError J.convert_html("{{isdef asdf}}", J.PageVars())
+ @test_throws J.HTMLBlockError J.convert_html("{{ispage asdf}}", J.PageVars())
+end
+
+@testset "Converter-md" begin
+ s = """
+ @def blah
+ """
+ @test (@test_logs (:warn, "Found delimiters for an @def environment but it didn't have the right @def var = ... format. Verify (ignoring for now).") (s |> jd2html_td)) == ""
+
+ s = """
+ Blah
+ [^1]: hello
+ """ |> jd2html_td
+ @test isapproxstr(s, "Blah
")
+end
+
+@testset "Judoc" begin
+ cd(td); mkpath("foo"); cd("foo");
+ @test_throws ArgumentError serve(single=true)
+ cd(td)
+end
+
+@testset "RSS" begin
+ J.set_var!(J.GLOBAL_PAGE_VARS, "website_descr", "")
+ J.RSS_DICT["hello"] = J.RSSItem("","","","","","","",Date(1))
+ @test (@test_logs (:warn, """
+ I found RSS items but the RSS feed is not properly described:
+ at least one of the following variables has not been defined in
+ your config.md: `website_title`, `website_descr`, `website_url`.
+ The feed will not be (re)generated.""") J.rss_generator()) === nothing
+end
+
+
+@testset "parser-lx" begin
+ s = raw"""
+ \newcommand{hello}{hello}
+ """
+ @test_throws J.LxDefError (s |> jd2html)
+ s = raw"""
+ \foo
+ """
+ @test_throws J.LxComError (s |> jd2html)
+ s = raw"""
+ \newcommand{\foo}[2]{hello #1 #2}
+ \foo{a} {}
+ """
+ @test_throws J.LxComError (s |> jd2html)
+end
+
+@testset "ocblocks" begin
+ s = raw"""
+ @@foo
+ """
+ @test_throws J.OCBlockError (s |> jd2html)
+end
diff --git a/test/global/eval.jl b/test/global/eval.jl
index 792197b39..dff3e2ce1 100644
--- a/test/global/eval.jl
+++ b/test/global/eval.jl
@@ -24,7 +24,7 @@
h = foo |> jd2html_td
@test isapproxstr(h, """
- println(randn())
$a
+ println(randn())
$a
""")
# TEXT MODIFICATION + IN SCOPE --> NO REEVAL
@@ -34,7 +34,7 @@
h = foo |> jd2html_td
@test isapproxstr(h, """
- println(randn())
$a
etc
+ println(randn())
$a
etc
""")
# CODE ADDITION + IN SCOPE --> NO REEVAL OF FIRST BLOCK
@@ -53,9 +53,9 @@
h = foo |> jd2html_td
@test isapproxstr(h, """
- println(randn())
$a
etc
- println(randn())
$b
- println(randn())
$c
+ println(randn())
$a
etc
+ println(randn())
$b
+ println(randn())
$c
""")
# CODE MODIFICATION + IN SCOPE --> REEVAL OF BLOCK AND AFTER
@@ -80,10 +80,10 @@
h = foo |> jd2html_td
@test isapproxstr(h, """
- println(randn())
$a
+ println(randn())
$a
# modif
- println(randn())
$d
- println(randn())
$e
+ println(randn())
$d
+ println(randn())
$e
""")
# FROZEN CODE --> WILL USE CODE FROM BEFORE even though we changed it (no re-eval)
@@ -109,10 +109,10 @@
h = foo |> jd2html_td
@test isapproxstr(h, """
- println(randn())
$a
+ println(randn())
$a
# modif
- println(randn())
$d
- println(randn())
$e
+ println(randn()) $d
+ println(randn())
$e
""")
end
@@ -137,10 +137,10 @@ end
@test isapproxstr(h, """
a = 5
println(a)
- 5
+ 5
a += 3
println(a)
- 8
+ 8
""")
@test J.LOCAL_PAGE_VARS["jd_code"].first == """
@@ -173,13 +173,13 @@ end
@test isapproxstr(h, """
a = 5
println(a)
- 5
+ 5
a += 1
println(a)
- 6
+ 6
a += 3
println(a)
- 9
+ 9
""")
@test J.LOCAL_PAGE_VARS["jd_code"].first == """
a = 5
diff --git a/test/integration/literate.jl b/test/integration/literate.jl
index 4e7a34717..9dcef4bf7 100644
--- a/test/integration/literate.jl
+++ b/test/integration/literate.jl
@@ -1,6 +1,12 @@
-scripts = joinpath(J.PATHS[:folder], "scripts")
+scripts = joinpath(J.PATHS[:folder], "literate-scripts")
cd(td); J.set_paths!(); mkpath(scripts)
+@testset "Literate-0" begin
+ @test_throws ErrorException literate_folder("foo/")
+ litpath = literate_folder("literate-scripts/")
+ @test litpath == joinpath(J.PATHS[:folder], "literate-scripts/")
+end
+
@testset "Literate-a" begin
# Post processing: numbering of julia blocks
s = raw"""
@@ -17,6 +23,7 @@ cd(td); J.set_paths!(); mkpath(scripts)
```
"""
@test J.literate_post_process(s) == """
+
A
```julia:ex1
@@ -49,10 +56,11 @@ end
"""
path = joinpath(scripts, "tutorial.jl")
write(path, s)
- opath = J.literate_to_judoc(path)
+ opath, = J.literate_to_judoc("/literate-scripts/tutorial")
@test endswith(opath, joinpath(J.PATHS[:assets], "literate", "tutorial.md"))
out = read(opath, String)
@test out == """
+
# Rational numbers
In julia rational numbers can be constructed with the `//` operator.
@@ -76,8 +84,9 @@ end
h = raw"""
@def hascode = true
@def showall = true
+ @def reeval = true
- \literate{/scripts/tutorial.jl}
+ \literate{/literate-scripts/tutorial.jl}
""" |> jd2html_td
@test isapproxstr(h, """
Rational numbers
@@ -85,9 +94,20 @@ end
# Define variable x and y
x = 1//3
y = 2//5
- 2//5
+ 2//5
When adding x and y together we obtain a new rational number:
z = x + y
- 11//15
+ 11//15
""")
end
+
+@testset "Literate-c" begin
+ s = raw"""
+ \literate{foo}
+ """
+ @test_throws ErrorException (s |> jd2html)
+ # s = raw"""
+ # \literate{/foo}
+ # """
+ # a = @test_logs (:warn, "File not found when trying to convert a literate file ($(joinpath(J.PATHS[:folder], "foo.jl"))).") (s |> jd2html_td)
+end
diff --git a/test/manager/utils.jl b/test/manager/utils.jl
index 747f2851d..e85490581 100644
--- a/test/manager/utils.jl
+++ b/test/manager/utils.jl
@@ -36,8 +36,9 @@ end
html_files = empty(md_files)
other_files = empty(md_files)
infra_files = empty(md_files)
- watched_files = [md_files, html_files, other_files, infra_files]
- JuDoc.scan_input_dir!(md_files, html_files, other_files, infra_files, true)
+ literate_files = empty(md_files)
+ watched_files = [md_files, html_files, other_files, infra_files, literate_files]
+ JuDoc.scan_input_dir!(md_files, html_files, other_files, infra_files, literate_files, true)
@test haskey(md_files, JuDoc.PATHS[:src_pages]=>"blah.md")
@test md_files[JuDoc.PATHS[:src_pages]=>"blah.md"] == mtime(temp_blah) == stat(temp_blah).mtime
@test html_files[JuDoc.PATHS[:src_pages]=>"temp.html"] == mtime(temp_html)
diff --git a/test/misc.jl b/test/misc.jl
index 22335f7a0..008585de2 100644
--- a/test/misc.jl
+++ b/test/misc.jl
@@ -112,7 +112,7 @@ end
@test J.html_ahref_key("cc", "dd") == "dd"
@test J.html_div("dn","ct") == "ct"
@test J.html_img("src", "alt") == "![\"alt\"](\"src\")
"
- @test J.html_code("code") == "code
"
+ @test J.html_code("code") == "code
"
@test J.html_code("code", "lang") == "code
"
@test J.html_err("blah") == "// blah //
"
end
diff --git a/test/runtests.jl b/test/runtests.jl
index acd288aa3..940545403 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -70,4 +70,9 @@ println("INTEGRATION")
include("integration/literate.jl")
flush_td()
+cd(joinpath(dirname(dirname(pathof(JuDoc)))))
+
+println("COVERAGE")
+include("coverage/extras1.jl")
+
println("😅 😅 😅 😅")