WIP: Refactor conformance tests for firestore.

firestore/google/cloud/firestore_v1beta1/batch.py

@@ -57,8 +57,8 @@ def create(self, reference, document_data):
             document_data (dict): Property names and values to use for
                 creating a document.
         """
-        write_pbs = _helpers.pbs_for_set(
-            reference._document_path, document_data, merge=False, exists=False)
+        write_pbs = _helpers.pbs_for_create(
+            reference._document_path, document_data)
         self._add_write_pbs(write_pbs)
 
     def set(self, reference, document_data, merge=False):
@@ -74,12 +74,17 @@ def set(self, reference, document_data, merge=False):
                 A document reference that will have values set in this batch.
             document_data (dict):
                 Property names and values to use for replacing a document.
-            merge (Optional[bool]):
+            merge (Optional[bool] or Optional[List<apispec>]):
                 If True, apply merging instead of overwriting the state
                 of the document.
         """
-        write_pbs = _helpers.pbs_for_set(
-            reference._document_path, document_data, merge=merge)
+        if merge is not False:
+            write_pbs = _helpers.pbs_for_set_with_merge(
+                reference._document_path, document_data, merge)
+        else:
+            write_pbs = _helpers.pbs_for_set_no_merge(
+                reference._document_path, document_data)
+
         self._add_write_pbs(write_pbs)
 
     def update(self, reference, field_updates, option=None):
@@ -98,6 +103,9 @@ def update(self, reference, field_updates, option=None):
                write option to make assertions / preconditions on the server
                state of the document before applying changes.
         """
+        if option.__class__.__name__ == 'ExistsOption':
+            raise ValueError('you must not pass an explicit write option to '
+                             'update.')
         write_pbs = _helpers.pbs_for_update(
             self._client, reference._document_path, field_updates, option)
         self._add_write_pbs(write_pbs)

firestore/google/cloud/firestore_v1beta1/client.py

@@ -23,7 +23,6 @@
 * a :class:`~.firestore_v1beta1.client.Client` owns a
   :class:`~.firestore_v1beta1.document.DocumentReference`
 """
-
 from google.cloud.client import ClientWithProject
 
 from google.cloud.firestore_v1beta1 import _helpers
@@ -39,7 +38,9 @@
 DEFAULT_DATABASE = '(default)'
 """str: The default database used in a :class:`~.firestore.client.Client`."""
 _BAD_OPTION_ERR = (
-    'Exactly one of ``last_update_time`` or ``exists`` must be provided.')
+    'Exactly one of ``last_update_time`` or ``exists`` '
+    'must be provided.'
+)
 _BAD_DOC_TEMPLATE = (
     'Document {!r} appeared in response but was not present among references')
 _ACTIVE_TXN = 'There is already an active transaction.'

firestore/google/cloud/firestore_v1beta1/document.py

@@ -211,9 +211,9 @@ def set(self, document_data, merge=False):
         Args:
             document_data (dict): Property names and values to use for
                 replacing a document.
-            option (Optional[~.firestore_v1beta1.client.WriteOption]): A
-               write option to make assertions / preconditions on the server
-               state of the document before applying changes.
+            merge (Optional[bool] or Optional[List<apispec>]):
+                If True, apply merging instead of overwriting the state
+                of the document.
 
         Returns:
             google.cloud.firestore_v1beta1.types.WriteResult: The

firestore/google/cloud/firestore_v1beta1/query.py

@@ -33,13 +33,14 @@
 from google.cloud.firestore_v1beta1.watch import Watch
 
 _EQ_OP = '=='
+_operator_enum = enums.StructuredQuery.FieldFilter.Operator
 _COMPARISON_OPERATORS = {
-    '<': enums.StructuredQuery.FieldFilter.Operator.LESS_THAN,
-    '<=': enums.StructuredQuery.FieldFilter.Operator.LESS_THAN_OR_EQUAL,
-    _EQ_OP: enums.StructuredQuery.FieldFilter.Operator.EQUAL,
-    '>=': enums.StructuredQuery.FieldFilter.Operator.GREATER_THAN_OR_EQUAL,
-    '>': enums.StructuredQuery.FieldFilter.Operator.GREATER_THAN,
-    'array_contains': enums.StructuredQuery.FieldFilter.Operator.ARRAY_CONTAINS,
+    '<': _operator_enum.LESS_THAN,
+    '<=': _operator_enum.LESS_THAN_OR_EQUAL,
+    _EQ_OP: _operator_enum.EQUAL,
+    '>=': _operator_enum.GREATER_THAN_OR_EQUAL,
+    '>': _operator_enum.GREATER_THAN,
+    'array_contains': _operator_enum.ARRAY_CONTAINS,
 }
 _BAD_OP_STRING = 'Operator string {!r} is invalid. Valid choices are: {}.'
 _BAD_OP_NAN_NULL = (

firestore/tests/system.py

@@ -202,8 +202,7 @@ def test_document_integer_field(client, cleanup):
     document.create(data1)
 
     data2 = {'1a.ab': '4d', '6f.7g': '9h'}
-    option2 = client.write_option(exists=True)
-    document.update(data2, option=option2)
+    document.update(data2)
     snapshot = document.get()
     expected = {
         '1a': {
@@ -311,9 +310,8 @@ def test_update_document(client, cleanup):
     assert document_id in exc_info.value.message
 
     # 1. Try to update before the document exists (now with an option).
-    option1 = client.write_option(exists=True)
     with pytest.raises(NotFound) as exc_info:
-        document.update({'still': 'not-there'}, option=option1)
+        document.update({'still': 'not-there'})
     assert exc_info.value.message.startswith(MISSING_DOCUMENT)
     assert document_id in exc_info.value.message
 
@@ -327,8 +325,7 @@ def test_update_document(client, cleanup):
         },
         'other': True,
     }
-    option2 = client.write_option(exists=False)
-    write_result2 = document.update(data, option=option2)
+    write_result2 = document.create(data)
 
     # 3. Send an update without a field path (no option).
     field_updates3 = {'foo': {'quux': 800}}