fix tests

geopython · Mar 28, 2024 · 37d86ac · 37d86ac
1 parent 5b9b3cf
commit 37d86ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/pygeofilter/parsers/cql2_json/parser.py b/pygeofilter/parsers/cql2_json/parser.py
@@ -125,7 +125,10 @@ def walk_cql_json(node: JsonType):  # noqa: C901
             return ast.Not(cast(ast.Node, walk_cql_json(args)))
 
         elif op == "isNull":
-            return ast.IsNull(cast(ast.Node, walk_cql_json(args)), False)
+            # like with "not", allow both arrays and objects
+            if isinstance(args, list):
+                args = args[0]
+            return ast.IsNull(cast(ast.Node, walk_cql_json(args)), not_=False)
 
         elif op == "between":
             return ast.Between(
@@ -153,12 +156,6 @@ def walk_cql_json(node: JsonType):  # noqa: C901
                 not_=False,
             )
 
-        elif op == "isNull":
-            return ast.IsNull(
-                walk_cql_json(args),
-                not_=False,
-            )
-
         elif op in BINARY_OP_PREDICATES_MAP:
             args = [cast(ast.Node, walk_cql_json(arg)) for arg in args]
             return BINARY_OP_PREDICATES_MAP[op](*args)

diff --git a/tests/parsers/cql2_json/test_parser.py b/tests/parsers/cql2_json/test_parser.py
@@ -145,7 +145,7 @@ def test_attribute_in_list():
 
 
 def test_attribute_is_null():
-    result = parse({"op": "isNull", "args": {"property": "attr"}})
+    result = parse({"op": "isNull", "args": [{"property": "attr"}]})
     assert result == ast.IsNull(ast.Attribute("attr"), False)