tests/bugfixes for juliaraw and juliadict

Author: Christopher Doris

src/cpython/juliadict.jl

@@ -108,7 +108,8 @@ Base.iterate(x::DictPairSet) =
     (r = iterate(x.dict); r === nothing ? nothing : (Tuple(r[1]), r[2]))
 Base.iterate(x::DictPairSet, st) =
     (r = iterate(x.dict, st); r === nothing ? nothing : (Tuple(r[1]), r[2]))
-Base.in(v, x::DictPairSet) = v in x.dict
+Base.in(v::Pair, x::DictPairSet) = v in x.dict
+Base.in(v::Tuple{Any,Any}, x::DictPairSet) = Pair(v[1], v[2]) in x.dict
 
 const PyJuliaDictValue_Type = LazyPyObject() do
     c = []
@@ -122,37 +123,37 @@ const PyJuliaDictValue_Type = LazyPyObject() do
             PyMethodDef(
                 name = cacheptr!(c, "keys"),
                 flags = Py_METH_NOARGS,
-                meth = @cfunctionOO(pyjldict_keys),
+                meth = @cfunctionOOO(pyjldict_keys),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "values"),
                 flags = Py_METH_NOARGS,
-                meth = @cfunctionOO(pyjldict_values),
+                meth = @cfunctionOOO(pyjldict_values),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "items"),
                 flags = Py_METH_NOARGS,
-                meth = @cfunctionOO(pyjldict_items),
+                meth = @cfunctionOOO(pyjldict_items),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "get"),
                 flags = Py_METH_VARARGS,
-                meth = @cfunctionOO(pyjldict_get),
+                meth = @cfunctionOOO(pyjldict_get),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "clear"),
                 flags = Py_METH_NOARGS,
-                meth = @cfunctionOO(pyjldict_clear),
+                meth = @cfunctionOOO(pyjldict_clear),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "pop"),
                 flags = Py_METH_VARARGS,
-                meth = @cfunctionOO(pyjldict_pop),
+                meth = @cfunctionOOO(pyjldict_pop),
             ),
             PyMethodDef(
                 name = cacheptr!(c, "popitem"),
                 flags = Py_METH_NOARGS,
-                meth = @cfunctionOO(pyjldict_popitem),
+                meth = @cfunctionOOO(pyjldict_popitem),
             ),
             # PyMethodDef(
             #     name = cacheptr!(c, "update"),
@@ -162,7 +163,7 @@ const PyJuliaDictValue_Type = LazyPyObject() do
             PyMethodDef(
                 name = cacheptr!(c, "setdefault"),
                 flags = Py_METH_VARARGS,
-                meth = @cfunctionOO(pyjldict_setdefault),
+                meth = @cfunctionOOO(pyjldict_setdefault),
             ),
             PyMethodDef(),
         ]),

test/runtests.jl

@@ -824,6 +824,35 @@ end
             @test pyjlgetvalue(v) === value
         end
 
+        @testset "juliaraw" begin
+            xo = pyjlraw(nothing)
+            @test @pyv `repr($xo) == "<jl nothing>"`::Bool
+            @test @pyv `str($xo) == "nothing"`::Bool
+            x = Struct1("foo", 12)
+            xo = pyjlraw(x)
+            @test (@pyv `$xo.x`::Any) === x.x
+            @test (@pyv `$xo.y`::Any) === x.y
+            @py `$xo.x = "bar"`
+            @test x.x == "bar"
+            @test @pyv `"x" in dir($xo)`::Bool
+            @test @pyv `"y" in dir($xo)`::Bool
+            xo = pyjlraw(+)
+            @test (@pyv `$xo(2,3)`::Any) === 5
+            x = [1,2,3]
+            xo = pyjlraw(x)
+            @test @pyv `len($xo) == 3`::Bool
+            @test (@pyv `$xo[1]`::Any) === x[1]
+            @test (@pyv `$xo[$(pyjlraw(1:3))]`::Any) == [1,2,3]
+            @py `$xo[1] = 0`
+            @test x == [0,2,3]
+            x = [1 2; 3 4]
+            xo = pyjlraw(x)
+            @test @pyv `len($xo) == 4`::Bool
+            @test (@pyv `$xo[1,2]`::Any) === x[1,2]
+            @py `$xo[1,2] = 0`
+            @test x == [1 0; 3 4]
+        end
+
         @testset "juliaany" begin
             for value in Any[nothing, missing, (), identity, push!]
                 @test @pyv `type($(pyjl(value))).__name__ == "AnyValue"`::Bool
@@ -948,6 +977,45 @@ end
             @test @pyv `list($xmv) == [0,3,2,4]`::Bool
         end
 
+        @testset "juliavector" begin
+            # TODO
+        end
+
+        @testset "juliaset" begin
+            # TODO
+        end
+
+        @testset "juliadict" begin
+            x = Dict("foo"=>1, "bar"=>2, "baz"=>3)
+            @test @pyv `set($x) == {"foo", "bar", "baz"}`::Bool
+            @test @pyv `set($x.keys()) == {"foo", "bar", "baz"}`::Bool
+            @test @pyv `set($x.values()) == {1, 2, 3}`::Bool
+            @test @pyv `set($x.items()) == {("foo", 1), ("bar", 2), ("baz", 3)}`::Bool
+            @test @pyv `len($x) == 3`::Bool
+            @test @pyv `len($x.items()) == 3`::Bool
+            @test @pyv `"foo" in $x`::Bool
+            @test @pyv `"hello" not in $x`::Bool
+            @test @pyv `1 not in $x`::Bool
+            @test @pyv `("foo", 1) in $x.items()`::Bool
+            @test @pyv `$x.get("bar") == 2`::Bool
+            @test @pyv `$x.get("hello") is None`::Bool
+            @test @pyv `$x.get(1) is None`::Bool
+            @test @pyv `$x.get("hello", "MISSING") == "MISSING"`::Bool
+            @test @pyv `$x.setdefault("foo", 0) == 1`::Bool
+            @test x["foo"] == 1
+            @test @pyv `$x.setdefault("bax", 0) == 0`::Bool
+            @test x["bax"] == 0
+            @test @pyv `$x.pop("bax", None) == 0`::Bool
+            @test @pyv `$x.pop("bax", None) is None`::Bool
+            @test_throws Exception @pyv `$x.pop("bax")`
+            @py `$x.clear()`
+            @test isempty(x)
+            x["foo"] = 1
+            @test @pyv `$x.popitem() == ("foo", 1)`::Bool
+            @test_throws Exception @pyv `$x.popitem()`
+            @test isempty(x)
+        end
+
         @testset "juliaio" begin
             for value in Any[stdin, stdout, IOBuffer()]
                 @test @pyv `type($(pyjl(value))).__name__ == "BufferedIOValue"`::Bool