proto to types

Author: crwilcox

tests/unit/v1beta1/test__helpers.py

@@ -220,7 +220,7 @@ def test_geo_point(self):
         self.assertEqual(result, expected)
 
     def test_array(self):
-        from google.cloud.firestore_v1beta1.proto.document import ArrayValue
+        from google.cloud.firestore_v1beta1.types.document import ArrayValue
 
         result = self._call_fut([99, True, 118.5])
 
@@ -235,7 +235,7 @@ def test_array(self):
         self.assertEqual(result, expected)
 
     def test_map(self):
-        from google.cloud.firestore_v1beta1.proto.document import MapValue
+        from google.cloud.firestore_v1beta1.types.document import MapValue
 
         result = self._call_fut({"abc": 285, "def": b"piglatin"})
 
@@ -264,8 +264,8 @@ def _call_fut(values_dict):
     def test_many_types(self):
         from google.protobuf import struct_pb2
         from google.protobuf import timestamp_pb2
-        from google.cloud.firestore_v1beta1.proto.document import ArrayValue
-        from google.cloud.firestore_v1beta1.proto.document import MapValue
+        from google.cloud.firestore_v1beta1.types.document import ArrayValue
+        from google.cloud.firestore_v1beta1.types.document import MapValue
 
         dt_seconds = 1497397225
         dt_nanos = 465964000
@@ -536,8 +536,8 @@ def _call_fut(value_fields, client=mock.sentinel.client):
     def test_many_types(self):
         from google.protobuf import struct_pb2
         from google.protobuf import timestamp_pb2
-        from google.cloud.firestore_v1beta1.proto.document import ArrayValue
-        from google.cloud.firestore_v1beta1.proto.document import MapValue
+        from google.cloud.firestore_v1beta1.types.document import ArrayValue
+        from google.cloud.firestore_v1beta1.types.document import MapValue
         from google.cloud._helpers import UTC
         from google.cloud.firestore_v1beta1.field_path import FieldPath
 
@@ -2052,7 +2052,7 @@ def test_modify_write(self):
 
 
 def _value_pb(**kwargs):
-    from google.cloud.firestore_v1beta1.proto.document import Value
+    from google.cloud.firestore_v1beta1.types.document import Value
 
     return Value(**kwargs)
 

tests/unit/v1beta1/test_batch.py

@@ -254,7 +254,7 @@ def test_as_context_mgr_w_error(self):
 
 
 def _value_pb(**kwargs):
-    from google.cloud.firestore_v1beta1.proto.document import Value
+    from google.cloud.firestore_v1beta1.types.document import Value
 
     return Value(**kwargs)
 

tests/unit/v1beta1/test_collection.py

@@ -445,7 +445,7 @@ def _list_documents_helper(self, page_size=None):
         from google.cloud.firestore_v1beta1.services.firestore_client import (
             FirestoreClient,
         )
-        from google.cloud.firestore_v1beta1.proto.document import Document
+        from google.cloud.firestore_v1beta1.types.document import Document
 
         class _Iterator(Iterator):
             def __init__(self, pages):