Skip to content

Commit b17c58a

Browse files
daspecsterdaspecster
committed
Update tests for gRPC/HTTP support.
1 parent b518c5f commit b17c58a

File tree

1 file changed

+38
-21
lines changed

1 file changed

+38
-21
lines changed

‎vision/unit_tests/test_client.py‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def test_face_annotation(self):
9797
]
9898
}
9999
credentials = _make_credentials()
100-
client = self._make_one(project=PROJECT, credentials=credentials)
100+
client = self._make_one(project=PROJECT, credentials=credentials,
101+
use_gax=False)
101102
client._connection = _Connection(RETURNED)
102103

103104
features = [Feature(feature_type=FeatureTypes.FACE_DETECTION,
@@ -123,8 +124,8 @@ def test_image_with_client_raw_content(self):
123124
from google.cloud.vision.image import Image
124125

125126
credentials = _make_credentials()
126-
client = self._make_one(project=PROJECT,
127-
credentials=credentials)
127+
client = self._make_one(project=PROJECT, credentials=credentials,
128+
use_gax=False)
128129
raw_image = client.image(content=IMAGE_CONTENT)
129130
self.assertIsInstance(raw_image, Image)
130131
self.assertEqual(raw_image.content, IMAGE_CONTENT)
@@ -135,8 +136,8 @@ def test_image_with_client_filename(self):
135136
from google.cloud.vision.image import Image
136137

137138
credentials = _make_credentials()
138-
client = self._make_one(project=PROJECT,
139-
credentials=credentials)
139+
client = self._make_one(project=PROJECT, credentials=credentials,
140+
use_gax=False)
140141
with patch('google.cloud.vision.image.open',
141142
mock_open(read_data=IMAGE_CONTENT)) as m:
142143
file_image = client.image(filename='my_image.jpg')
@@ -156,7 +157,8 @@ def test_multiple_detection_from_content(self):
156157
returned['responses'][0]['logoAnnotations'] = logos['logoAnnotations']
157158

158159
credentials = _make_credentials()
159-
client = self._make_one(project=PROJECT, credentials=credentials)
160+
client = self._make_one(project=PROJECT, credentials=credentials,
161+
use_gax=False)
160162
client._connection = _Connection(returned)
161163

162164
limit = 2
@@ -203,7 +205,8 @@ def test_face_detection_from_source(self):
203205
from unit_tests._fixtures import FACE_DETECTION_RESPONSE
204206
RETURNED = FACE_DETECTION_RESPONSE
205207
credentials = _make_credentials()
206-
client = self._make_one(project=PROJECT, credentials=credentials)
208+
client = self._make_one(project=PROJECT, credentials=credentials,
209+
use_gax=False)
207210
client._connection = _Connection(RETURNED)
208211

209212
image = client.image(source_uri=IMAGE_SOURCE)
@@ -220,7 +223,8 @@ def test_face_detection_from_content(self):
220223
from unit_tests._fixtures import FACE_DETECTION_RESPONSE
221224
RETURNED = FACE_DETECTION_RESPONSE
222225
credentials = _make_credentials()
223-
client = self._make_one(project=PROJECT, credentials=credentials)
226+
client = self._make_one(project=PROJECT, credentials=credentials,
227+
use_gax=False)
224228
client._connection = _Connection(RETURNED)
225229

226230
image = client.image(content=IMAGE_CONTENT)
@@ -238,7 +242,8 @@ def test_face_detection_from_content_no_results(self):
238242
'responses': [{}]
239243
}
240244
credentials = _make_credentials()
241-
client = self._make_one(project=PROJECT, credentials=credentials)
245+
client = self._make_one(project=PROJECT, credentials=credentials,
246+
use_gax=False)
242247
client._connection = _Connection(RETURNED)
243248

244249
image = client.image(content=IMAGE_CONTENT)
@@ -257,7 +262,8 @@ def test_label_detection_from_source(self):
257262
LABEL_DETECTION_RESPONSE as RETURNED)
258263

259264
credentials = _make_credentials()
260-
client = self._make_one(project=PROJECT, credentials=credentials)
265+
client = self._make_one(project=PROJECT, credentials=credentials,
266+
use_gax=False)
261267
client._connection = _Connection(RETURNED)
262268

263269
image = client.image(source_uri=IMAGE_SOURCE)
@@ -278,7 +284,8 @@ def test_label_detection_no_results(self):
278284
'responses': [{}]
279285
}
280286
credentials = _make_credentials()
281-
client = self._make_one(project=PROJECT, credentials=credentials)
287+
client = self._make_one(project=PROJECT, credentials=credentials,
288+
use_gax=False)
282289
client._connection = _Connection(RETURNED)
283290

284291
image = client.image(content=IMAGE_CONTENT)
@@ -292,7 +299,8 @@ def test_landmark_detection_from_source(self):
292299
LANDMARK_DETECTION_RESPONSE as RETURNED)
293300

294301
credentials = _make_credentials()
295-
client = self._make_one(project=PROJECT, credentials=credentials)
302+
client = self._make_one(project=PROJECT, credentials=credentials,
303+
use_gax=False)
296304
client._connection = _Connection(RETURNED)
297305

298306
image = client.image(source_uri=IMAGE_SOURCE)
@@ -314,7 +322,8 @@ def test_landmark_detection_from_content(self):
314322
LANDMARK_DETECTION_RESPONSE as RETURNED)
315323

316324
credentials = _make_credentials()
317-
client = self._make_one(project=PROJECT, credentials=credentials)
325+
client = self._make_one(project=PROJECT, credentials=credentials,
326+
use_gax=False)
318327
client._connection = _Connection(RETURNED)
319328

320329
image = client.image(content=IMAGE_CONTENT)
@@ -331,7 +340,8 @@ def test_landmark_detection_no_results(self):
331340
'responses': [{}]
332341
}
333342
credentials = _make_credentials()
334-
client = self._make_one(project=PROJECT, credentials=credentials)
343+
client = self._make_one(project=PROJECT, credentials=credentials,
344+
use_gax=False)
335345
client._connection = _Connection(RETURNED)
336346

337347
image = client.image(content=IMAGE_CONTENT)
@@ -344,7 +354,8 @@ def test_logo_detection_from_source(self):
344354
from unit_tests._fixtures import LOGO_DETECTION_RESPONSE
345355
RETURNED = LOGO_DETECTION_RESPONSE
346356
credentials = _make_credentials()
347-
client = self._make_one(project=PROJECT, credentials=credentials)
357+
client = self._make_one(project=PROJECT, credentials=credentials,
358+
use_gax=False)
348359
client._connection = _Connection(RETURNED)
349360

350361
image = client.image(source_uri=IMAGE_SOURCE)
@@ -361,7 +372,8 @@ def test_logo_detection_from_content(self):
361372
from unit_tests._fixtures import LOGO_DETECTION_RESPONSE
362373
RETURNED = LOGO_DETECTION_RESPONSE
363374
credentials = _make_credentials()
364-
client = self._make_one(project=PROJECT, credentials=credentials)
375+
client = self._make_one(project=PROJECT, credentials=credentials,
376+
use_gax=False)
365377
client._connection = _Connection(RETURNED)
366378

367379
image = client.image(content=IMAGE_CONTENT)
@@ -379,7 +391,8 @@ def test_text_detection_from_source(self):
379391
TEXT_DETECTION_RESPONSE as RETURNED)
380392

381393
credentials = _make_credentials()
382-
client = self._make_one(project=PROJECT, credentials=credentials)
394+
client = self._make_one(project=PROJECT, credentials=credentials,
395+
use_gax=False)
383396
client._connection = _Connection(RETURNED)
384397

385398
image = client.image(source_uri=IMAGE_SOURCE)
@@ -402,7 +415,8 @@ def test_safe_search_detection_from_source(self):
402415

403416
RETURNED = SAFE_SEARCH_DETECTION_RESPONSE
404417
credentials = _make_credentials()
405-
client = self._make_one(project=PROJECT, credentials=credentials)
418+
client = self._make_one(project=PROJECT, credentials=credentials,
419+
use_gax=False)
406420
client._connection = _Connection(RETURNED)
407421

408422
image = client.image(source_uri=IMAGE_SOURCE)
@@ -421,7 +435,8 @@ def test_safe_search_no_results(self):
421435
'responses': [{}]
422436
}
423437
credentials = _make_credentials()
424-
client = self._make_one(project=PROJECT, credentials=credentials)
438+
client = self._make_one(project=PROJECT, credentials=credentials,
439+
use_gax=False)
425440
client._connection = _Connection(RETURNED)
426441

427442
image = client.image(content=IMAGE_CONTENT)
@@ -435,7 +450,8 @@ def test_image_properties_detection_from_source(self):
435450

436451
RETURNED = IMAGE_PROPERTIES_RESPONSE
437452
credentials = _make_credentials()
438-
client = self._make_one(project=PROJECT, credentials=credentials)
453+
client = self._make_one(project=PROJECT, credentials=credentials,
454+
use_gax=False)
439455
client._connection = _Connection(RETURNED)
440456

441457
image = client.image(source_uri=IMAGE_SOURCE)
@@ -457,7 +473,8 @@ def test_image_properties_no_results(self):
457473
'responses': [{}]
458474
}
459475
credentials = _make_credentials()
460-
client = self._make_one(project=PROJECT, credentials=credentials)
476+
client = self._make_one(project=PROJECT, credentials=credentials,
477+
use_gax=False)
461478
client._connection = _Connection(RETURNED)
462479

463480
image = client.image(content=IMAGE_CONTENT)

0 commit comments

Comments
 (0)