tests for pyeval and pyexec

Author: Christopher Doris

src/concrete/code.jl

@@ -1,6 +1,13 @@
 const MODULE_GLOBALS = Dict{Module,Py}()
 
-function _pyeval_args(globals, locals)
+function _pyeval_args(code, globals, locals)
+    if code isa AbstractString
+        code_ = code
+    elseif ispy(code)
+        code_ = code
+    else
+        throw(ArgumentError("code must be a string or Python code"))
+    end
     if globals isa Module
         globals_ = get!(pydict, MODULE_GLOBALS, globals)
     elseif ispy(globals)
@@ -15,7 +22,7 @@ function _pyeval_args(globals, locals)
     else
         locals_ = pydict(locals)
     end
-    return (globals_, locals_)
+    return (code_, globals_, locals_)
 end
 
 """
@@ -39,8 +46,8 @@ pyeval(Float64, "x+y", Main, (x=1.1, y=2.2))  # returns 3.3
 ```
 """
 function pyeval(::Type{T}, code, globals, locals=nothing) where {T}
-    globals_, locals_ = _pyeval_args(globals, locals)
-    ans = pybuiltins.eval(code, globals_, locals_)
+    code_, globals_, locals_ = _pyeval_args(code, globals, locals)
+    ans = pybuiltins.eval(code_, globals_, locals_)
     pydel!(locals_)
     return T == Py ? ans : pyconvert(T, ans)
 end
@@ -94,8 +101,8 @@ pyeval(Int, "x", Main)  # returns 12
 ```
 """
 function pyexec(::Type{T}, code, globals, locals=nothing) where {T}
-    globals_, locals_ = _pyeval_args(globals, locals)
-    pydel!(pybuiltins.exec(code, globals_, locals_))
+    code_, globals_, locals_ = _pyeval_args(code, globals, locals)
+    pydel!(pybuiltins.exec(code_, globals_, locals_))
     ans = _pyexec_ans(T, globals_, locals_)
     pydel!(locals_)
     return ans

test/concrete.jl

@@ -286,5 +286,61 @@ end
 end
 
 @testitem "code" begin
-    # TODO
+    # check for ArgumentError when inputs are mixed up
+    @test_throws ArgumentError pyeval(Main, "1+1")
+    @test_throws ArgumentError pyeval(Main, Main)
+    @test_throws ArgumentError pyeval("1+1", "1+1")
+    @test_throws ArgumentError pyexec(Main, "1+1")
+    @test_throws ArgumentError pyexec(Main, Main)
+    @test_throws ArgumentError pyexec("1+1", "1+1")
+    # basic code execution
+    m = Module(:test)
+    g = pydict()
+    @test pyeq(Bool, pyeval("1+1", m), 2)
+    @test pyeq(Bool, pyeval("1+1", g), 2)
+    @test pyeq(Bool, pyeval(pystr("1+1"), g), 2)
+    @test pyexec("1+1", m) === nothing
+    @test pyexec("1+1", g) === nothing
+    @test pyexec(pystr("1+1"), g) === nothing
+    # check the globals are what we think they are
+    @test pyis(pyeval("globals()", g), g)
+    mg = pyeval("globals()", m)
+    @test pyisinstance(mg, pybuiltins.dict)
+    # these automatically gain 1 item, __builtins__
+    @test length(g) == 1
+    @test length(mg) == 1
+    @test pycontains(g, "__builtins__")
+    @test pycontains(mg, "__builtins__")
+    # code should fail when x does not exist
+    @test_throws PyException pyeval("x+1", g)
+    @test_throws PyException pyeval("x+1", g)
+    # now set x and try again
+    g["x"] = 1
+    @test pyeq(Bool, pyeval("x+1", g), 2)
+    # set x using pyexec this time
+    pyexec("x=2", g)
+    @test pyeq(Bool, g["x"], 2)
+    @test pyeq(Bool, pyeval("x+1", g), 3)
+    # now use locals
+    # check empty locals have no effect
+    l = pydict()
+    @test pyeq(Bool, pyeval("x+1", g, l), 3)
+    @test pyeq(Bool, pyeval("x+1", g, Dict()), 3)
+    # now set x locally
+    l["x"] = 3
+    @test pyeq(Bool, pyeval("x+1", g, l), 4)
+    @test pyeq(Bool, pyeval("x+1", g, Dict()), 3)
+    @test pyeq(Bool, pyeval("x+1", g, Dict("x" => 0)), 1)
+    @test pyeq(Bool, pyeval("x+1", g, (x=1,)), 2)
+    # check pyexec runs in local scope
+    pyexec("x=4", g, l)
+    @test pyeq(Bool, g["x"], 2)
+    @test pyeq(Bool, l["x"], 4)
+    # check global code runs in global scope
+    pyexec("global y; y=x+1", g, l)
+    @test pyeq(Bool, g["y"], 5)
+    @test !pycontains(l, "y")
+    # check pyeval converts types correctly
+    @test pyeval(Int, "1+1", g) === 2
+    @test pyeval(Nothing, "None", g) === nothing
 end