Merge branch 'master' into jz-azure

spokestack · Jan 23, 2020 · 2452b73 · 2452b73
2 parents 0b43137 + 9a0bc88
commit 2452b73
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/io/spokestack/spokestack/android/AndroidSpeechRecognizer.java b/src/main/java/io/spokestack/spokestack/android/AndroidSpeechRecognizer.java
@@ -57,7 +57,7 @@
  * place.
  * </p>
  */
-public final class AndroidSpeechRecognizer implements SpeechProcessor {
+public class AndroidSpeechRecognizer implements SpeechProcessor {
     private boolean streaming;
     private SpeechRecognizer speechRecognizer;
     private TaskHandler taskHandler;
@@ -120,7 +120,7 @@ private void begin() {
         });
     }
 
-    private Intent createRecognitionIntent() {
+    Intent createRecognitionIntent() {
         Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
         intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
               RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);

diff --git a/src/test/java/io/spokestack/spokestack/android/AndroidSpeechRecognizerTest.java b/src/test/java/io/spokestack/spokestack/android/AndroidSpeechRecognizerTest.java
@@ -23,7 +23,7 @@
 import static org.powermock.api.mockito.PowerMockito.*;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({SpeechRecognizer.class, AndroidSpeechRecognizer.class, Bundle.class})
+@PrepareForTest({SpeechRecognizer.class, Bundle.class})
 public class AndroidSpeechRecognizerTest {
 
     private ContextWrapper emptyAppContext = mock(ContextWrapper.class);
@@ -70,7 +70,8 @@ private void configureRecognizer(SpeechRecognizer target,
     public void testProcess() {
         SpeechConfig config = new SpeechConfig();
         AndroidSpeechRecognizer speechRecognizer =
-              new AndroidSpeechRecognizer(config, new TaskHandler(false));
+              spy(new AndroidSpeechRecognizer(config, new TaskHandler(false)));
+        doReturn(null).when(speechRecognizer).createRecognitionIntent();
         SpeechContext context = new SpeechContext(config);
         context.setAndroidContext(mockContext);
         EventListener listener = new EventListener();
@@ -93,7 +94,8 @@ public void testProcess() {
         listener.clear();
         context.setActive(true);
         speechRecognizer =
-              new AndroidSpeechRecognizer(config, new TaskHandler(false));
+              spy(new AndroidSpeechRecognizer(config, new TaskHandler(false)));
+        doReturn(null).when(speechRecognizer).createRecognitionIntent();
         speechRecognizer.process(context, frame);
         assertNull(listener.transcript);
         assertEquals(SpeechRecognizerError.class, listener.error.getClass());

diff --git a/src/test/java/io/spokestack/spokestack/tts/SpokestackTTSOutputTest.java b/src/test/java/io/spokestack/spokestack/tts/SpokestackTTSOutputTest.java
@@ -15,6 +15,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -29,8 +30,12 @@
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(ExoPlaybackException.class)
 public class SpokestackTTSOutputTest {
-    private LifecycleRegistry lifecycleRegistry =
-          new LifecycleRegistry(mock(LifecycleOwner.class));
+    @Mock
+    @SuppressWarnings("unused")
+    LifecycleOwner owner;
+
+    @InjectMocks
+    private LifecycleRegistry lifecycleRegistry;
 
     @Mock
     private Context mockContext;