test(stt,tts): reinsert hand edits and update voice models

Author: apaparazzi0329

speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java

@@ -212,7 +212,7 @@ public void testGetModelNoOptions() throws Throwable {
   public void testRecognizeWOptions() throws Throwable {
     // Register a mock response
     String mockResponseBody =
-        "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}";
+        "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"timestamps\"]], \"word_confidence\": [[\"wordConfidence\"]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}";
     String recognizePath = "/v1/recognize";
     server.enqueue(
         new MockResponse()
@@ -424,7 +424,7 @@ public void testUnregisterCallbackNoOptions() throws Throwable {
   public void testCreateJobWOptions() throws Throwable {
     // Register a mock response
     String mockResponseBody =
-        "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}";
+        "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"timestamps\"]], \"word_confidence\": [[\"wordConfidence\"]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}";
     String createJobPath = "/v1/recognitions";
     server.enqueue(
         new MockResponse()
@@ -542,7 +542,7 @@ public void testCreateJobNoOptions() throws Throwable {
   public void testCheckJobsWOptions() throws Throwable {
     // Register a mock response
     String mockResponseBody =
-        "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}";
+        "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"timestamps\"]], \"word_confidence\": [[\"wordConfidence\"]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}";
     String checkJobsPath = "/v1/recognitions";
     server.enqueue(
         new MockResponse()
@@ -587,8 +587,7 @@ public void testCheckJobsWRetries() throws Throwable {
   public void testCheckJobWOptions() throws Throwable {
     // Register a mock response
     String mockResponseBody =
-        "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}";
-    String checkJobPath = "/v1/recognitions/testString";
+        "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"timestamps\"]], \"word_confidence\": [[\"wordConfidence\"]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}";    String checkJobPath = "/v1/recognitions/testString";
     server.enqueue(
         new MockResponse()
             .setHeader("Content-type", "application/json")

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsIT.java

@@ -205,7 +205,7 @@ public void testGetVoiceCustomization() {
     GetVoiceOptions getVoiceOptions =
         new GetVoiceOptions.Builder()
             .customizationId(model.getCustomizationId())
-            .voice(GetVoiceOptions.Voice.EN_US_ALLISONVOICE)
+            .voice(GetVoiceOptions.Voice.EN_US_ALLISONV3VOICE)
             .build();
     final Voice voice = service.getVoice(getVoiceOptions).execute().getResult();
 
@@ -477,14 +477,14 @@ public void testSynthesize() throws IOException {
     SynthesizeOptions synthesizeOptions1 =
         new SynthesizeOptions.Builder()
             .text(expected.word())
-            .voice(SynthesizeOptions.Voice.EN_US_MICHAELVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_MICHAELV3VOICE)
             .accept(HttpMediaType.AUDIO_WAV)
             .build();
     final InputStream stream1 = service.synthesize(synthesizeOptions1).execute().getResult();
     SynthesizeOptions synthesizeOptions2 =
         new SynthesizeOptions.Builder()
             .text(expected.word())
-            .voice(SynthesizeOptions.Voice.EN_US_MICHAELVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_MICHAELV3VOICE)
             .accept(HttpMediaType.AUDIO_WAV)
             .customizationId(model.getCustomizationId())
             .build();

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechIT.java

@@ -155,7 +155,7 @@ public void testSynthesize() throws IOException {
     SynthesizeOptions synthesizeOptions =
         new SynthesizeOptions.Builder()
             .text(text)
-            .voice(SynthesizeOptions.Voice.EN_US_LISAVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_LISAV3VOICE)
             .accept(HttpMediaType.AUDIO_WAV)
             .build();
     InputStream result = service.synthesize(synthesizeOptions).execute().getResult();
@@ -169,7 +169,7 @@ public void testGetWordPronunciation() {
     GetPronunciationOptions getOptions1 =
         new GetPronunciationOptions.Builder()
             .text(word)
-            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELVOICE)
+            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELV3VOICE)
             .format(GetPronunciationOptions.Format.IBM)
             .build();
     Pronunciation pronunciation = service.getPronunciation(getOptions1).execute().getResult();
@@ -188,7 +188,7 @@ public void testGetWordPronunciation() {
     GetPronunciationOptions getOptions3 =
         new GetPronunciationOptions.Builder()
             .text(word)
-            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELVOICE)
+            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELV3VOICE)
             .build();
     pronunciation = service.getPronunciation(getOptions3).execute().getResult();
     assertNotNull(pronunciation);
@@ -197,7 +197,7 @@ public void testGetWordPronunciation() {
     GetPronunciationOptions getOptions4 =
         new GetPronunciationOptions.Builder()
             .text(word)
-            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELVOICE)
+            .voice(GetPronunciationOptions.Voice.EN_US_MICHAELV3VOICE)
             .format(GetPronunciationOptions.Format.IPA)
             .build();
     pronunciation = service.getPronunciation(getOptions4).execute().getResult();
@@ -217,7 +217,7 @@ public void testSynthesizeAndFixHeader() throws IOException, UnsupportedAudioFil
     SynthesizeOptions synthesizeOptions =
         new SynthesizeOptions.Builder()
             .text(text)
-            .voice(SynthesizeOptions.Voice.EN_US_LISAVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_LISAV3VOICE)
             .accept(HttpMediaType.AUDIO_WAV)
             .build();
     InputStream result = service.synthesize(synthesizeOptions).execute().getResult();
@@ -258,7 +258,7 @@ public void testSynthesizeUsingWebSocket() throws InterruptedException, IOExcept
     SynthesizeOptions synthesizeOptions =
         new SynthesizeOptions.Builder()
             .text(basicText)
-            .voice(SynthesizeOptions.Voice.EN_US_ALLISONVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_ALLISONV3VOICE)
             .accept(HttpMediaType.AUDIO_OGG)
             .timings(Collections.singletonList("words"))
             .build();
@@ -335,7 +335,7 @@ public void testSynthesizeUsingWebSocketWithSsml() throws InterruptedException {
     SynthesizeOptions synthesizeOptions =
         new SynthesizeOptions.Builder()
             .text(ssmlText)
-            .voice(SynthesizeOptions.Voice.EN_US_ALLISONVOICE)
+            .voice(SynthesizeOptions.Voice.EN_US_ALLISONV3VOICE)
             .accept(HttpMediaType.AUDIO_OGG)
             .build();