nicer testing

Author: MikeInnes

src/patch/cst.jl

@@ -113,4 +113,6 @@ end
 
 sourcewalk(f, file) = sourcemap(x -> postwalk(f, x), file)
 
+textmap(f, text) = sourcemap(f, SourceFile("", text))
+
 textwalk(f, text) = sourcewalk(f, SourceFile("", text))

test/patch.jl

@@ -1,6 +1,8 @@
-using MacroTools: textwalk, @capture, isexpr
+using MacroTools: textmap, textwalk, @capture, isexpr
 using Test
 
+testrep(ex, text) = textmap(_ -> Expr(:file, ex), text)
+
 # Replacement
 
 @test textwalk(x -> x==:a ? :b : x, "a*2") == "b*2"
@@ -19,20 +21,20 @@ using Test
 
 # Insertion
 
-@test textwalk(x -> isexpr(x, :call) ? :(f(a,b)) : x, "f(a)") == "f(a, b)"
-@test textwalk(x -> isexpr(x, :call) ? :(f(a)) : x, "f()") == "f(a)"
+@test testrep(:(f(a,b)), "f(a)") == "f(a, b)"
+@test testrep(:(f(a)), "f()") == "f(a)"
 
-@test textwalk(x -> isexpr(x, :call) ? :(f(a, b, c)) : x, "f(a, b)") == "f(a, b, c)"
-@test textwalk(x -> isexpr(x, :call) ? :(f(a, c, b)) : x, "f(a, b)") == "f(a, c, b)"
-@test textwalk(x -> isexpr(x, :call) ? :(f(c, a, b)) : x, "f(a, b)") == "f(c, a, b)"
-@test textwalk(x -> isexpr(x, :call) ? :(c(f, a, b)) : x, "f(a, b)") == "c(f, a, b)"
+@test testrep(:(f(a, b, c)), "f(a, b)") == "f(a, b, c)"
+@test testrep(:(f(a, c, b)), "f(a, b)") == "f(a, c, b)"
+@test testrep(:(f(c, a, b)), "f(a, b)") == "f(c, a, b)"
+@test testrep(:(c(f, a, b)), "f(a, b)") == "c(f, a, b)"
 
 # Deletion
 
-@test textwalk(x -> isexpr(x, :call) ? :(f()) : x, "f(a)") == "f()"
-@test textwalk(x -> isexpr(x, :call) ? :(f()) : x, "f(a,)") == "f()"
+@test testrep(:(f()), "f(a)") == "f()"
+@test testrep(:(f()), "f(a,)") == "f()"
 
-@test textwalk(x -> isexpr(x, :call) ? :(f(a, b)) : x, "f(a, b, c)") == "f(a, b)"
-@test textwalk(x -> isexpr(x, :call) ? :(f(a, c)) : x, "f(a, b, c)") == "f(a, c)"
-@test textwalk(x -> isexpr(x, :call) ? :(f(b, c)) : x, "f(a, b, c)") == "f(b, c)"
-@test textwalk(x -> isexpr(x, :call) ? :(a(b, c)) : x, "f(a, b, c)") == "a(b, c)"
+@test testrep(:(f(a, b)), "f(a, b, c)") == "f(a, b)"
+@test testrep(:(f(a, c)), "f(a, b, c)") == "f(a, c)"
+@test testrep(:(f(b, c)), "f(a, b, c)") == "f(b, c)"
+@test testrep(:(a(b, c)), "f(a, b, c)") == "a(b, c)"