chore(tests): improve client mocking in unit tests

Author: daniel-sanche

tests/unit/v1/test_async_pipeline.py

@@ -18,6 +18,8 @@
 from google.cloud.firestore_v1 import pipeline_stages as stages
 from google.cloud.firestore_v1.pipeline_expressions import Field
 
+from tests.unit.v1._test_helpers import make_async_client
+
 
 def _make_async_pipeline(*args, client=mock.Mock()):
     from google.cloud.firestore_v1.async_pipeline import AsyncPipeline
@@ -189,11 +191,10 @@ async def test_async_pipeline_stream_populated():
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import ExecutePipelineRequest
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
-    from google.cloud.firestore_v1.document import DocumentReference
+    from google.cloud.firestore_v1.async_document import AsyncDocumentReference
     from google.cloud.firestore_v1.pipeline_result import PipelineResult
 
-    real_client = Client()
+    real_client = make_async_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"
@@ -228,7 +229,7 @@ async def test_async_pipeline_stream_populated():
 
     response = results[0]
     assert isinstance(response, PipelineResult)
-    assert isinstance(response.ref, DocumentReference)
+    assert isinstance(response.ref, AsyncDocumentReference)
     assert response.ref.path == "test/my_doc"
     assert response.id == "my_doc"
     assert response.create_time.seconds == 1
@@ -246,10 +247,9 @@ async def test_async_pipeline_stream_multiple():
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import ExecutePipelineRequest
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
     from google.cloud.firestore_v1.pipeline_result import PipelineResult
 
-    real_client = Client()
+    real_client = make_async_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"
@@ -358,9 +358,8 @@ async def test_async_pipeline_stream_stream_equivalence():
     from google.cloud.firestore_v1.types import Document
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
 
-    real_client = Client()
+    real_client = make_async_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"

tests/unit/v1/test_pipeline.py

@@ -18,6 +18,8 @@
 from google.cloud.firestore_v1 import pipeline_stages as stages
 from google.cloud.firestore_v1.pipeline_expressions import Field
 
+from tests.unit.v1._test_helpers import make_client
+
 
 def _make_pipeline(*args, client=mock.Mock()):
     from google.cloud.firestore_v1.pipeline import Pipeline
@@ -190,11 +192,10 @@ def test_pipeline_stream_populated():
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import ExecutePipelineRequest
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
     from google.cloud.firestore_v1.document import DocumentReference
     from google.cloud.firestore_v1.pipeline_result import PipelineResult
 
-    real_client = Client()
+    real_client = make_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"
@@ -244,10 +245,9 @@ def test_pipeline_stream_multiple():
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import ExecutePipelineRequest
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
     from google.cloud.firestore_v1.pipeline_result import PipelineResult
 
-    real_client = Client()
+    real_client = make_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"
@@ -348,9 +348,8 @@ def test_pipeline_execute_stream_equivalence():
     from google.cloud.firestore_v1.types import Document
     from google.cloud.firestore_v1.types import ExecutePipelineResponse
     from google.cloud.firestore_v1.types import Value
-    from google.cloud.firestore_v1.client import Client
 
-    real_client = Client()
+    real_client = make_client()
     client = mock.Mock()
     client.project = "A"
     client._database = "B"

tests/unit/v1/test_pipeline_source.py

@@ -23,12 +23,14 @@
 from google.cloud.firestore_v1.query import Query
 from google.cloud.firestore_v1.async_query import AsyncQuery
 
+from tests.unit.v1._test_helpers import make_async_client
+from tests.unit.v1._test_helpers import make_client
 
 class TestPipelineSource:
     _expected_pipeline_type = Pipeline
 
     def _make_client(self):
-        return Client()
+        return make_client()
 
     def _make_query(self):
         return Query(mock.Mock())
@@ -120,7 +122,7 @@ class TestPipelineSourceWithAsyncClient(TestPipelineSource):
     _expected_pipeline_type = AsyncPipeline
 
     def _make_client(self):
-        return AsyncClient()
+        return make_async_client()
 
     def _make_query(self):
         return AsyncQuery(mock.Mock())