at-testsetr: add a trailing '/' for non-final testsets

When the pattern starts with '/', then, the final '/'
is partially matched, so this can increase the number
of matches in some cases

On the other hand, a pattern like r"^/a/b1" won't
partially match a testset-chain like "^/a/b/...",
which is desirable.

Author: rfourquet

src/testset.jl

@@ -56,8 +56,10 @@ function testset_beginend(args, tests, source)
     # finally removing the testset and giving it a chance to take
     # action (such as reporting the results)
     ex = quote
-        local current_str = get_testset_string() * '/' * $desc
-        local rx = $(esc(REGEX[]))[1 + $(esc(FINAL[]))]
+        local final = $(esc(FINAL[]))
+        local current_str = string(get_testset_string(), '/', $desc,
+                                   final ? "" : "/")
+        local rx = $(esc(REGEX[]))[1 + final]
         if partialoccursin(rx, current_str)
             _check_testset($testsettype, $(QuoteNode(testsettype.args[1])))
             local ret
@@ -133,8 +135,11 @@ function testset_forloop(args, testloop, source)
     # wrapped in the outer loop provided by the user
     tests = testloop.args[2]
     blk = quote
-        local current_str = get_testset_string(!first_iteration) * '/' * $desc
-        local rx = $(esc(REGEX[]))[1 + $(esc(FINAL[]))]
+        local final = $(esc(FINAL[]))
+        local current_str = string(get_testset_string(!first_iteration), '/', $desc,
+                                   final ? "" : "/")
+
+        local rx = $(esc(REGEX[]))[1 + final]
         if partialoccursin(rx, current_str)
             _check_testset($testsettype, $(QuoteNode(testsettype.args[1])))
             # Trick to handle `break` and `continue` in the test code before

test/runtests.jl

@@ -58,13 +58,13 @@ using .M: check
 check("a", ["a"])
 check("a1", []) # testset is "final", so we do a full match
 check("b", ["b1", "b2"])
-check("/b", ["b1", "b2"])
+check("/b", ["b1", "b2", "c", "f1"])
 check("b1", ["b1"])
 check("c1", []) # "c1" is *not* partially matched against "/c/"
 check("c/1", ["c"]) # "c" is partially matched, but nothing fully matches afterwards
 check("c/d1", ["c"])
 check("c/d", ["c", "d"])
-check("/c", ["c", "d", "e1", "e2"])
+check("/c", ["c", "d", "e1", "e2", "f1"])
 check(".*d", ["c", "d", "f1"])
 check(".*(e1|e2)", ["c", "e1", "e2", "f1"])
 check("f1", ["f1", "g", "h1", "h2"])
@@ -76,3 +76,47 @@ check(".*h\$", ["c", "f1"])
 
 runtests(M, wrap=true) # TODO: more precise tests
 runtests(M, wrap=false)
+
+module N
+using InlineTest
+
+RUN = []
+
+# testing non-final non-toplevel testsets
+@testset "i" begin
+    push!(RUN, "i")
+    @test true
+
+    @testset "j" begin
+        push!(RUN, "j")
+        @test true
+
+        @testset "k" begin
+            push!(RUN, "k")
+            @test true
+        end
+    end
+
+    @testset "l$i" for i=1:1
+        push!(RUN, "l$i")
+        @test true
+
+        @testset "m" begin
+            push!(RUN, "m")
+            @test true
+        end
+    end
+end
+
+function check(rx, list)
+    empty!(RUN)
+    runtests(N, Regex(rx))
+    @test sort(RUN) == sort(list)
+end
+end
+
+import .N
+N.check(".*j1", ["i", "j", "l1"])
+N.check(".*j/1", ["i", "j", "l1"])
+N.check("^/i/j0", ["i"])
+N.check("^/i/l10", ["i"])