Commit 5fe1235
committed
Add missing request assertions for operation.poll.
1 parent 659010a commit 5fe1235
1 file changed
Lines changed: 25 additions & 14 deletions
Lines changed: 25 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,40 +29,39 @@ def _makeOne(self, *args, **kwargs): | |||
| 29 | 29 | def test_ctor_defaults(self): | |
| 30 | 30 | client = _Client() | |
| 31 | 31 | operation = self._makeOne(client, self.OPERATION_NAME) | |
| 32 | - self.assertEqual('123456789', operation.name) | ||
| 32 | + self.assertEqual(operation.name, '123456789') | ||
| 33 | 33 | self.assertFalse(operation.complete) | |
| 34 | 34 | self.assertIsNone(operation.metadata) | |
| 35 | 35 | self.assertIsNone(operation.results) | |
| 36 | 36 | ||
| 37 | 37 | def test_from_api_repr(self): | |
| 38 | 38 | from unit_tests._fixtures import OPERATION_COMPLETE_RESPONSE | |
| 39 | 39 | from google.cloud.speech.operation import Transcript | |
| 40 | + from google.cloud.speech.metadata import Metadata | ||
| 40 | 41 | RESPONSE = OPERATION_COMPLETE_RESPONSE | |
| 41 | 42 | ||
| 42 | 43 | client = _Client() | |
| 43 | - connection = _Connection(OPERATION_COMPLETE_RESPONSE) | ||
| 44 | - client.connection = connection | ||
| 45 | 44 | operation = self._getTargetClass().from_api_repr(client, RESPONSE) | |
| 46 | 45 | ||
| 47 | 46 | self.assertEqual('123456789', operation.name) | |
| 48 | 47 | self.assertTrue(operation.complete) | |
| 49 | 48 | ||
| 50 | 49 | self.assertIsInstance(operation.results[0], Transcript) | |
| 51 | - self.assertEqual('how old is the Brooklyn Bridge', | ||
| 52 | - operation.results[0].transcript) | ||
| 53 | - self.assertEqual(0.98267895, operation.results[0].confidence) | ||
| 50 | + self.assertEqual(operation.results[0].transcript, | ||
| 51 | + 'how old is the Brooklyn Bridge') | ||
| 52 | + self.assertEqual(operation.results[0].confidence, 0.98267895) | ||
| 54 | 53 | self.assertTrue(operation.complete) | |
| 54 | + self.assertIsInstance(operation.metadata, Metadata) | ||
| 55 | + self.assertEqual(operation.metadata.progress_percent, 100) | ||
| 55 | 56 | ||
| 56 | 57 | def test_update_response(self): | |
| 57 | 58 | from unit_tests._fixtures import ASYNC_RECOGNIZE_RESPONSE | |
| 58 | 59 | from unit_tests._fixtures import OPERATION_COMPLETE_RESPONSE | |
| 59 | 60 | RESPONSE = ASYNC_RECOGNIZE_RESPONSE | |
| 60 | 61 | ||
| 61 | 62 | client = _Client() | |
| 62 | - connection = _Connection(OPERATION_COMPLETE_RESPONSE) | ||
| 63 | - client.connection = connection | ||
| 64 | 63 | operation = self._getTargetClass().from_api_repr(client, RESPONSE) | |
| 65 | - self.assertEqual('123456789', operation.name) | ||
| 64 | + self.assertEqual(operation.name, '123456789') | ||
| 66 | 65 | operation._update(OPERATION_COMPLETE_RESPONSE) | |
| 67 | 66 | self.assertTrue(operation.complete) | |
| 68 | 67 | ||
@@ -80,23 +79,35 @@ def test_poll(self): | |||
| 80 | 79 | operation.poll() | |
| 81 | 80 | self.assertTrue(operation.complete) | |
| 82 | 81 | self.assertIsInstance(operation.metadata, Metadata) | |
| 83 | - self.assertEqual(100, operation.metadata.progress_percent) | ||
| 82 | + self.assertEqual(operation.metadata.progress_percent, 100) | ||
| 83 | + requested = client.connection._requested | ||
| 84 | + self.assertEqual(requested[0]['method'], 'GET') | ||
| 85 | + self.assertEqual(requested[0]['path'], | ||
| 86 | + 'operations/%s' % (operation.name,)) | ||
| 84 | 87 | ||
| 85 | 88 | def test_poll_complete(self): | |
| 86 | 89 | from unit_tests._fixtures import OPERATION_COMPLETE_RESPONSE | |
| 87 | - RESPONSE = OPERATION_COMPLETE_RESPONSE | ||
| 90 | + from unit_tests._fixtures import OPERATION_INCOMPLETE_RESPONSE | ||
| 91 | + RESPONSE = OPERATION_INCOMPLETE_RESPONSE | ||
| 92 | + | ||
| 88 | 93 | client = _Client() | |
| 89 | 94 | connection = _Connection(OPERATION_COMPLETE_RESPONSE) | |
| 90 | 95 | client.connection = connection | |
| 91 | - | ||
| 92 | 96 | operation = self._getTargetClass().from_api_repr(client, RESPONSE) | |
| 93 | - self.assertTrue(operation.complete) | ||
| 97 | + | ||
| 98 | + self.assertFalse(operation.complete) | ||
| 99 | + operation.poll() # Update the operation with complete data. | ||
| 100 | + | ||
| 94 | 101 | with self.assertRaises(ValueError): | |
| 95 | 102 | operation.poll() | |
| 103 | + requested = client.connection._requested | ||
| 104 | + self.assertEqual(requested[0]['method'], 'GET') | ||
| 105 | + self.assertEqual(requested[0]['path'], | ||
| 106 | + 'operations/%s' % (operation.name,)) | ||
| 96 | 107 | ||
| 97 | 108 | ||
| 98 | 109 | class _Connection(object): | |
| 99 | - def __init__(self, response): | ||
| 110 | + def __init__(self, response=None): | ||
| 100 | 111 | self.response = response | |
| 101 | 112 | self._requested = [] | |
| 102 | 113 | ||
0 commit comments