Remove incorrect use of MUT, test multiple alternatives.

Author: daspecster

speech/unit_tests/test_client.py

@@ -22,19 +22,21 @@ class TestClient(unittest.TestCase):
     AUDIO_CONTENT = '/9j/4QNURXhpZgAASUkq'
 
     @staticmethod
-    def _make_result(transcript, confidence):
+    def _make_result(alternatives):
         from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+
         return cloud_speech_pb2.SpeechRecognitionResult(
             alternatives=[
                 cloud_speech_pb2.SpeechRecognitionAlternative(
-                    transcript=transcript,
-                    confidence=confidence,
-                ),
+                    transcript=alternative['transcript'],
+                    confidence=alternative['confidence'],
+                ) for alternative in alternatives
             ],
         )
 
     def _make_sync_response(self, *results):
         from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+
         response = cloud_speech_pb2.SyncRecognizeResponse(
             results=results,
         )
@@ -216,18 +218,19 @@ def test_sync_recognize_with_empty_results_gax(self):
         from google.cloud._testing import _Monkey
 
         from google.cloud import speech
-        from google.cloud.speech import _gax as MUT
+        from google.cloud.speech import _gax
         from google.cloud.speech.sample import Sample
 
         credentials = _Credentials()
         client = self._makeOne(credentials=credentials, use_gax=True)
         client.connection = _Connection()
         client.connection.credentials = credentials
 
-        _MockGAPICSpeechAPI._response = self._make_sync_response()
+        def speech_api():
+            return _MockGAPICSpeechAPI(response=self._make_sync_response())
 
         with self.assertRaises(ValueError):
-            with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
+            with _Monkey(_gax, SpeechApi=speech_api):
                 sample = Sample(source_uri=self.AUDIO_SOURCE_URI,
                                 encoding=speech.Encoding.FLAC,
                                 sample_rate=self.SAMPLE_RATE)
@@ -237,25 +240,39 @@ def test_sync_recognize_with_gax(self):
         from google.cloud._testing import _Monkey
 
         from google.cloud import speech
-        from google.cloud.speech import _gax as MUT
+        from google.cloud.speech import _gax
 
         creds = _Credentials()
         client = self._makeOne(credentials=creds, use_gax=True)
         client.connection = _Connection()
         client.connection.credentials = creds
         client._speech_api = None
-        transcript = 'testing 1 2 3'
-        confidence = 0.9224355
-        result = self._make_result(transcript, confidence)
-        _MockGAPICSpeechAPI._response = self._make_sync_response(result)
-
-        with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
+        alternatives = [{
+            "transcript": 'testing 1 2 3',
+            "confidence": 0.9224355
+        }, {
+            "transcript": 'testing 4 5 6',
+            "confidence": 0.0123456
+        }]
+        result = self._make_result(alternatives)
+
+        def speech_api():
+            return _MockGAPICSpeechAPI(
+                response=self._make_sync_response(result))
+
+        with _Monkey(_gax, SpeechApi=speech_api):
             sample = client.sample(source_uri=self.AUDIO_SOURCE_URI,
                                    encoding=speech.Encoding.FLAC,
                                    sample_rate=self.SAMPLE_RATE)
             results = client.sync_recognize(sample)
-            self.assertEqual(results[0].transcript, transcript)
-            self.assertEqual(results[0].confidence, confidence)
+            self.assertEqual(results[0].transcript,
+                             alternatives[0]['transcript'])
+            self.assertEqual(results[0].confidence,
+                             alternatives[0]['confidence'])
+            self.assertEqual(results[1].transcript,
+                             alternatives[1]['transcript'])
+            self.assertEqual(results[1].confidence,
+                             alternatives[1]['confidence'])
 
     def test_async_supported_encodings(self):
         from google.cloud import speech
@@ -298,7 +315,7 @@ def test_async_recognize_with_gax(self):
         from google.cloud._testing import _Monkey
 
         from google.cloud import speech
-        from google.cloud.speech import _gax as MUT
+        from google.cloud.speech import _gax
         from google.cloud.speech.operation import Operation
 
         credentials = _Credentials()
@@ -309,7 +326,7 @@ def test_async_recognize_with_gax(self):
         sample = client.sample(source_uri=self.AUDIO_SOURCE_URI,
                                encoding=speech.Encoding.LINEAR16,
                                sample_rate=self.SAMPLE_RATE)
-        with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
+        with _Monkey(_gax, SpeechApi=_MockGAPICSpeechAPI):
             operation = client.async_recognize(sample)
 
         self.assertIsInstance(operation, Operation)
@@ -319,13 +336,13 @@ def test_async_recognize_with_gax(self):
     def test_speech_api_with_gax(self):
         from google.cloud._testing import _Monkey
 
-        from google.cloud.speech import _gax as MUT
+        from google.cloud.speech import _gax
         from google.cloud.speech.client import GAPICSpeechAPI
 
         creds = _Credentials()
         client = self._makeOne(credentials=creds, use_gax=True)
 
-        with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
+        with _Monkey(_gax, SpeechApi=_MockGAPICSpeechAPI):
             self.assertIsNone(client._speech_api)
             self.assertIsInstance(client.speech_api, GAPICSpeechAPI)
 
@@ -353,8 +370,12 @@ class _MockGAPICSpeechAPI(object):
     _response = None
     _results = None
 
+    def __init__(self, response=None):
+        self._response = response
+
     def async_recognize(self, config, audio):
         from google.longrunning.operations_pb2 import Operation
+
         self.config = config
         self.audio = audio
         operation = Operation()
@@ -363,7 +384,6 @@ def async_recognize(self, config, audio):
     def sync_recognize(self, config, audio):
         self.config = config
         self.audio = audio
-        # self._response.results = self._results
         return self._response