fixed tests

Author: daniel-sanche

tests/unit/v1/test_base_query.py

@@ -2120,7 +2120,9 @@ def test__query_pipeline_cursors():
     from google.cloud.firestore_v1 import pipeline_expressions as expr
 
     client = make_client()
-    query_start = client.collection("my_col").order_by("field_a").start_at({"field_a": 10})
+    query_start = (
+        client.collection("my_col").order_by("field_a").start_at({"field_a": 10})
+    )
     pipeline = query_start._build_pipeline(client.pipeline())
 
     # Stages:
@@ -2129,7 +2131,7 @@ def test__query_pipeline_cursors():
     # 2: Where (cursor condition)
     # 3: Sort (field_a)
     assert len(pipeline.stages) == 4
-    
+
     where_stage = pipeline.stages[2]
     assert isinstance(where_stage, stages.Where)
     # Expected: (field_a > 10) OR (field_a == 10)
@@ -2336,6 +2338,7 @@ def _make_snapshot(docref, values):
 
     return document.DocumentSnapshot(docref, values, True, None, None, None)
 
+
 def test__where_conditions_from_cursor_descending():
     from google.cloud.firestore_v1.base_query import _where_conditions_from_cursor
     from google.cloud.firestore_v1 import pipeline_expressions
@@ -2348,10 +2351,7 @@ def test__where_conditions_from_cursor_descending():
     cursor = ([10], True)
     condition = _where_conditions_from_cursor(cursor, [ordering], is_start_cursor=True)
     # Expected: field < 10 OR field == 10
-    expected = pipeline_expressions.Or(
-        field_expr.less_than(10),
-        field_expr.equal(10)
-    )
+    expected = pipeline_expressions.Or(field_expr.less_than(10), field_expr.equal(10))
     assert condition == expected
 
     # Case 2: StartAfter (exclusive) -> < 10
@@ -2366,8 +2366,7 @@ def test__where_conditions_from_cursor_descending():
     condition = _where_conditions_from_cursor(cursor, [ordering], is_start_cursor=False)
     # Expected: field > 10 OR field == 10
     expected = pipeline_expressions.Or(
-        field_expr.greater_than(10),
-        field_expr.equal(10)
+        field_expr.greater_than(10), field_expr.equal(10)
     )
     assert condition == expected
 

tests/unit/v1/test_pipeline_expressions.py

@@ -463,58 +463,72 @@ def test__from_query_filter_pb_unary_filter_unknown_op(self, mock_client):
             BooleanExpression._from_query_filter_pb(wrapped_filter_pb, mock_client)
 
     @pytest.mark.parametrize(
-        "op_enum, value, expected_expr_func",
+        "op_enum, value, expected_expr_func, expects_existance",
         [
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.LESS_THAN,
                 10,
                 Expression.less_than,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.LESS_THAN_OR_EQUAL,
                 10,
                 Expression.less_than_or_equal,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.GREATER_THAN,
                 10,
                 Expression.greater_than,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.GREATER_THAN_OR_EQUAL,
                 10,
                 Expression.greater_than_or_equal,
+                True,
+            ),
+            (
+                query_pb.StructuredQuery.FieldFilter.Operator.EQUAL,
+                10,
+                Expression.equal,
+                True,
             ),
-            (query_pb.StructuredQuery.FieldFilter.Operator.EQUAL, 10, Expression.equal),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.NOT_EQUAL,
                 10,
                 Expression.not_equal,
+                False,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.ARRAY_CONTAINS,
                 10,
                 Expression.array_contains,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.ARRAY_CONTAINS_ANY,
                 [10, 20],
                 Expression.array_contains_any,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.IN,
                 [10, 20],
                 Expression.equal_any,
+                True,
             ),
             (
                 query_pb.StructuredQuery.FieldFilter.Operator.NOT_IN,
                 [10, 20],
                 Expression.not_equal_any,
+                False,
             ),
         ],
     )
     def test__from_query_filter_pb_field_filter(
-        self, mock_client, op_enum, value, expected_expr_func
+        self, mock_client, op_enum, value, expected_expr_func, expects_existance
     ):
         """
         test supported field filters
@@ -536,10 +550,11 @@ def test__from_query_filter_pb_field_filter(
             [Constant(e) for e in value] if isinstance(value, list) else Constant(value)
         )
         expected_condition = expected_expr_func(field_expr, value)
-        # should include existance checks
-        expected = expr.And(field_expr.exists(), expected_condition)
+        if expects_existance:
+            # some expressions include extra existance checks
+            expected_condition = expr.And(field_expr.exists(), expected_condition)
 
-        assert repr(result) == repr(expected)
+        assert repr(result) == repr(expected_condition)
 
     def test__from_query_filter_pb_field_filter_unknown_op(self, mock_client):
         """